From 13e54e64159c5044f6ed820b244bc744857c6f2f Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Mon, 3 Dec 2018 23:42:46 -0500 Subject: [PATCH] Revert "Adds functionality to monthly contribution dropdown (Panel)" --- browser/extensions/api/brave_rewards_api.cc | 39 ---------- browser/extensions/api/brave_rewards_api.h | 20 ----- common/extensions/api/brave_rewards.json | 37 --------- .../brave_rewards/browser/content_site.cc | 2 - .../brave_rewards/browser/content_site.h | 1 - .../extension_rewards_service_observer.cc | 34 +-------- .../extension_rewards_service_observer.h | 3 - ...on_rewards_service_observer_browsertest.cc | 60 --------------- .../brave_rewards/browser/rewards_service.h | 1 - .../browser/rewards_service_impl.cc | 18 ----- .../browser/rewards_service_impl.h | 2 - .../browser/rewards_service_impl_unittest.cc | 1 - .../browser/rewards_service_observer.h | 3 - .../actions/rewards_panel_actions.ts | 15 ---- .../background/events/rewardsEvents.ts | 4 - .../reducers/rewards_panel_reducer.ts | 25 ------ .../brave_rewards/background/storage.ts | 3 +- .../brave_rewards/components/panel.tsx | 76 ++++--------------- .../constants/rewards_panel_types.ts | 6 +- components/definitions/chromel.d.ts | 5 -- components/definitions/rewardsExtensions.d.ts | 5 -- test/BUILD.gn | 2 - 22 files changed, 18 insertions(+), 344 deletions(-) delete mode 100644 components/brave_rewards/browser/extension_rewards_service_observer_browsertest.cc diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index d8c459a334db..d8ef09a1093f 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -138,44 +138,5 @@ ExtensionFunction::ResponseAction BraveRewardsGetGrantFunction::Run() { return RespondNow(NoArguments()); } -BraveRewardsSaveRecurringDonationFunction::~BraveRewardsSaveRecurringDonationFunction() { -} - -ExtensionFunction::ResponseAction - BraveRewardsSaveRecurringDonationFunction::Run() { - - std::unique_ptr params( - brave_rewards::SaveRecurringDonation::Params::Create(*args_)); - - Profile* profile = Profile::FromBrowserContext(browser_context()); - RewardsService* rewards_service_ = RewardsServiceFactory::GetForProfile(profile); - - if (rewards_service_) { - rewards_service_->AddRecurringPayment(params->publisher_key, params->new_amount); - } - - return RespondNow(NoArguments()); -} - -BraveRewardsRemoveRecurringDonationFunction::~BraveRewardsRemoveRecurringDonationFunction() { -} - -ExtensionFunction::ResponseAction - BraveRewardsRemoveRecurringDonationFunction::Run() { - - std::unique_ptr params( - brave_rewards::RemoveRecurringDonation::Params::Create(*args_)); - - Profile* profile = Profile::FromBrowserContext(browser_context()); - RewardsService* rewards_service_ = RewardsServiceFactory::GetForProfile(profile); - - if (rewards_service_) { - rewards_service_->RemoveRecurring(params->publisher_key); - } - - return RespondNow(NoArguments()); -} - - } // namespace api } // namespace extensions diff --git a/browser/extensions/api/brave_rewards_api.h b/browser/extensions/api/brave_rewards_api.h index ca357498ebc7..2bb818dff2b4 100644 --- a/browser/extensions/api/brave_rewards_api.h +++ b/browser/extensions/api/brave_rewards_api.h @@ -81,26 +81,6 @@ class BraveRewardsGetGrantFunction : public UIThreadExtensionFunction { ResponseAction Run() override; }; -class BraveRewardsSaveRecurringDonationFunction : public UIThreadExtensionFunction { - public: - DECLARE_EXTENSION_FUNCTION("braveRewards.saveRecurringDonation", UNKNOWN) - - protected: - ~BraveRewardsSaveRecurringDonationFunction() override; - - ResponseAction Run() override; -}; - -class BraveRewardsRemoveRecurringDonationFunction : public UIThreadExtensionFunction { - public: - DECLARE_EXTENSION_FUNCTION("braveRewards.removeRecurringDonation", UNKNOWN) - - protected: - ~BraveRewardsRemoveRecurringDonationFunction() override; - - ResponseAction Run() override; -}; - } // namespace api } // namespace extensions diff --git a/common/extensions/api/brave_rewards.json b/common/extensions/api/brave_rewards.json index e03ac07adb9a..515c007ddbcc 100644 --- a/common/extensions/api/brave_rewards.json +++ b/common/extensions/api/brave_rewards.json @@ -177,17 +177,6 @@ } } ] - }, - { - "name": "onRecurringDonations", - "type": "function", - "description": "", - "parameters": [ - { - "name": "result", - "type": "any" - } - ] } ], "functions": [ @@ -267,32 +256,6 @@ "type": "function", "description": "Retrieves grant when panel is mounted", "parameters": [] - }, - { - "name": "saveRecurringDonation", - "type": "function", - "description": "Updates recurring donation amount for rewards panel", - "parameters": [ - { - "name": "publisher_key", - "type": "string" - }, - { - "name": "new_amount", - "type": "integer" - } - ] - }, - { - "name": "removeRecurringDonation", - "type": "function", - "description": "Removes recurring donation for rewards panel", - "parameters": [ - { - "name": "publisher_key", - "type": "string" - } - ] } ] } diff --git a/components/brave_rewards/browser/content_site.cc b/components/brave_rewards/browser/content_site.cc index 171c39ca6fd3..47e1a78c6ace 100644 --- a/components/brave_rewards/browser/content_site.cc +++ b/components/brave_rewards/browser/content_site.cc @@ -12,7 +12,6 @@ namespace brave_rewards { percentage(0), verified(false), excluded(0), - weight(0), reconcile_stamp(0) { } @@ -27,7 +26,6 @@ namespace brave_rewards { url = properties.url; provider = properties.provider; id = properties.id; - weight = properties.weight; reconcile_stamp = properties.reconcile_stamp; } diff --git a/components/brave_rewards/browser/content_site.h b/components/brave_rewards/browser/content_site.h index dc56d3311488..50fbfe119e03 100644 --- a/components/brave_rewards/browser/content_site.h +++ b/components/brave_rewards/browser/content_site.h @@ -26,7 +26,6 @@ struct ContentSite { std::string favicon_url; std::string url; std::string provider; - double weight; uint64_t reconcile_stamp; }; diff --git a/components/brave_rewards/browser/extension_rewards_service_observer.cc b/components/brave_rewards/browser/extension_rewards_service_observer.cc index bea021801d93..805b17b03d28 100644 --- a/components/brave_rewards/browser/extension_rewards_service_observer.cc +++ b/components/brave_rewards/browser/extension_rewards_service_observer.cc @@ -3,6 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/browser/extension_rewards_service_observer.h" + #include "brave/common/extensions/api/brave_rewards.h" #include "brave/components/brave_rewards/browser/rewards_service.h" #include "chrome/browser/profiles/profile.h" @@ -139,37 +140,4 @@ void ExtensionRewardsServiceObserver::OnGetPublisherActivityFromUrl( event_router->BroadcastEvent(std::move(event)); } -void ExtensionRewardsServiceObserver::OnRecurringDonations( - RewardsService* rewards_service, - brave_rewards::ContentSiteList list) { - extensions::EventRouter* event_router = extensions::EventRouter::Get(profile_); - if (!event_router) { - return; - } - - base::DictionaryValue result; - auto recurringDonations = std::make_unique(); - - if (!list.empty()) { - for (auto const& item: list) { - auto recurringDonation = std::make_unique(); - recurringDonation->SetString("publisherKey", item.id); - recurringDonation->SetInteger("amount", item.weight); - recurringDonations->Append(std::move(recurringDonation)); - } - } - - result.SetList("recurringDonations", std::move(recurringDonations)); - - std::unique_ptr args( - extensions::api::brave_rewards::OnRecurringDonations::Create(result) - .release()); - - std::unique_ptr event(new extensions::Event( - extensions::events::BRAVE_START, - extensions::api::brave_rewards::OnRecurringDonations::kEventName, - std::move(args))); - event_router->BroadcastEvent(std::move(event)); -} - } // namespace brave_rewards diff --git a/components/brave_rewards/browser/extension_rewards_service_observer.h b/components/brave_rewards/browser/extension_rewards_service_observer.h index 46e075654908..e0829bc9062d 100644 --- a/components/brave_rewards/browser/extension_rewards_service_observer.h +++ b/components/brave_rewards/browser/extension_rewards_service_observer.h @@ -9,7 +9,6 @@ #include "base/macros.h" #include "brave/components/brave_rewards/browser/rewards_service_observer.h" -#include "brave/components/brave_rewards/browser/content_site.h" #include "brave/components/brave_rewards/browser/rewards_service_private_observer.h" class Profile; @@ -41,8 +40,6 @@ class ExtensionRewardsServiceObserver : public RewardsServiceObserver, std::unique_ptr info, uint64_t windowId) override; - void OnRecurringDonations(RewardsService* rewards_service, - brave_rewards::ContentSiteList) override; private: Profile* profile_; diff --git a/components/brave_rewards/browser/extension_rewards_service_observer_browsertest.cc b/components/brave_rewards/browser/extension_rewards_service_observer_browsertest.cc deleted file mode 100644 index fdced987f77a..000000000000 --- a/components/brave_rewards/browser/extension_rewards_service_observer_browsertest.cc +++ /dev/null @@ -1,60 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "brave/components/brave_rewards/browser/rewards_service.h" -#include "brave/components/brave_rewards/browser/rewards_service_factory.h" -#include "brave/components/brave_rewards/browser/extension_rewards_service_observer.h" -#include "chrome/browser/ui/browser.h" -#include "chrome/test/base/in_process_browser_test.h" -#include "chrome/test/base/ui_test_utils.h" -#include "content/public/test/browser_test_utils.h" - -using namespace brave_rewards; - -class ExtensionRewardsServiceObserverBrowserTest - : public InProcessBrowserTest, - public RewardsServiceObserver { - public: - - void SetUpOnMainThread() override { - InProcessBrowserTest::SetUpOnMainThread(); - rewards_service_ = RewardsServiceFactory::GetForProfile(browser()->profile()); - } - - void TearDown() override { - InProcessBrowserTest::TearDown(); - } - - void OnRecurringDonations( - RewardsService* rewards_service, - const ledger::PublisherInfoList& list) override { - - ledger::PublisherInfo firstPublisher = list.front(); - EXPECT_STREQ(firstPublisher.id.c_str(), "brave.com"); - EXPECT_STREQ(std::to_string(firstPublisher.weight).c_str(), "10"); - - on_recurring_notifications_callback_was_called_ = true; - } - - void WaitForOnRecurringDonationsCallback() { - if (on_recurring_notifications_callback_was_called_) { - return; - } - - base::RunLoop run_loop; - run_loop.Run(); - } - - RewardsService* rewards_service_; - bool on_recurring_notifications_callback_was_called_ = false; -}; - -IN_PROC_BROWSER_TEST_F(ExtensionRewardsServiceObserverBrowserTest, SaveARecurringDonation) { - rewards_service_->AddObserver(this); - - rewards_service_->AddRecurringPayment("brave.com", 10); - WaitForOnRecurringDonationsCallback(); - - rewards_service_->RemoveObserver(this); -} diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h index 5e10e62f69ff..d269ac1403a8 100644 --- a/components/brave_rewards/browser/rewards_service.h +++ b/components/brave_rewards/browser/rewards_service.h @@ -104,7 +104,6 @@ class RewardsService : public KeyedService { virtual void OnDonate(const std::string& publisher_key, int amount, bool recurring, std::unique_ptr site) = 0; virtual void RemoveRecurring(const std::string& publisher_key) = 0; - virtual void AddRecurringPayment(const std::string& publisher_key, double new_amount) = 0; virtual void UpdateRecurringDonationsList() = 0; virtual void UpdateTipsList() = 0; virtual void SetContributionAutoInclude( diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 4e4a3a4a3288..9505cef524ad 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -147,7 +147,6 @@ ContentSite PublisherInfoToContentSite( content_site.provider = publisher_info.provider; content_site.favicon_url = publisher_info.favicon_url; content_site.id = publisher_info.id; - content_site.weight = publisher_info.weight; content_site.reconcile_stamp = publisher_info.reconcile_stamp; return content_site; } @@ -1521,19 +1520,6 @@ ledger::PublisherInfoList GetRecurringDonationsOnFileTaskRunner(PublisherInfoDat void RewardsServiceImpl::OnRecurringDonationsData(const ledger::PublisherInfoListCallback callback, const ledger::PublisherInfoList list) { callback(list, 0); - - // Incoming ledger::PublisherInfoList needs to be converted to brave_rewards::ContentSiteList - brave_rewards::ContentSiteList site_list; - for (auto& info : list) { - site_list.push_back(PublisherInfoToContentSite(info)); - } - - TriggerOnRecurringDonations(site_list); -} - -void RewardsServiceImpl::TriggerOnRecurringDonations(brave_rewards::ContentSiteList list) { - for (auto& observer : observers_) - observer.OnRecurringDonations(this, list); } void RewardsServiceImpl::GetRecurringDonations(ledger::PublisherInfoListCallback callback) { @@ -1594,10 +1580,6 @@ void RewardsServiceImpl::OnTipsUpdatedData(const ledger::PublisherInfoList list) } } -void RewardsServiceImpl::AddRecurringPayment(const std::string& publisher_key, double new_amount) { - SaveRecurringDonation(publisher_key, new_amount); -} - void RewardsServiceImpl::RemoveRecurring(const std::string& publisher_key) { ledger_->RemoveRecurring(publisher_key); } diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index 6bc3bcc3398e..e68d77085775 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -123,7 +123,6 @@ class RewardsServiceImpl : public RewardsService, void RemoveRecurring(const std::string& publisher_key) override; void UpdateRecurringDonationsList() override; void UpdateTipsList() override; - void AddRecurringPayment(const std::string& publisher_key, double new_amount) override; void SetContributionAutoInclude( std::string publisher_key, bool excluded, uint64_t windowId) override; RewardsNotificationService* GetNotificationService() const override; @@ -198,7 +197,6 @@ class RewardsServiceImpl : public RewardsService, ledger::Result result, std::unique_ptr info, uint64_t windowId); - void TriggerOnRecurringDonations(brave_rewards::ContentSiteList); // ledger::LedgerClient std::string GenerateGUID() const override; diff --git a/components/brave_rewards/browser/rewards_service_impl_unittest.cc b/components/brave_rewards/browser/rewards_service_impl_unittest.cc index 07bc75fd61b2..72f86ce4a0c3 100644 --- a/components/brave_rewards/browser/rewards_service_impl_unittest.cc +++ b/components/brave_rewards/browser/rewards_service_impl_unittest.cc @@ -37,7 +37,6 @@ class MockRewardsServiceObserver : public RewardsServiceObserver { MOCK_METHOD2(OnCurrentTips, void(RewardsService*, brave_rewards::ContentSiteList)); MOCK_METHOD2(OnPublisherBanner, void(RewardsService*, const brave_rewards::PublisherBanner)); MOCK_METHOD4(OnGetPublisherActivityFromUrl, void(RewardsService*, int, ledger::PublisherInfo*, uint64_t)); - MOCK_METHOD2(OnRecurringDonations, void(brave_rewards::RewardsService*, const ledger::PublisherInfoList*)); }; class RewardsServiceTest : public testing::Test { diff --git a/components/brave_rewards/browser/rewards_service_observer.h b/components/brave_rewards/browser/rewards_service_observer.h index 48ef59dbb7bb..571f9a7e45a7 100644 --- a/components/brave_rewards/browser/rewards_service_observer.h +++ b/components/brave_rewards/browser/rewards_service_observer.h @@ -50,9 +50,6 @@ class RewardsServiceObserver : public base::CheckedObserver { brave_rewards::ContentSiteList) {}; virtual void OnPublisherBanner(brave_rewards::RewardsService* rewards_service, const brave_rewards::PublisherBanner banner) {}; - virtual void OnRecurringDonations( - brave_rewards::RewardsService* rewards_service, - brave_rewards::ContentSiteList) {}; }; } // namespace brave_rewards diff --git a/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts b/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts index 4e75539011fd..8f2fe2ec81ba 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts @@ -62,18 +62,3 @@ export const includeInAutoContribution = (publisherKey: string, excluded: boolea }) export const getGrant = () => action(types.GET_GRANT, {}) - -export const saveRecurringDonation = (publisherKey: string, newAmount: number) => action(types.SAVE_RECURRING_DONATION, { - publisherKey, - newAmount -}) - -export const removeRecurringContribution = (publisherKey: string) => action(types.REMOVE_RECURRING_DONATION, { - publisherKey -}) - -export const getRecurringDonations = () => action(types.GET_RECURRING_DONATIONS) - -export const onRecurringDonations = (result: RewardsExtension.RecurringDonation) => action(types.ON_RECURRING_DONATIONS, { - result -}) diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts b/components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts index c292a96d4ac3..bc449d90b57e 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts @@ -27,7 +27,3 @@ chrome.rewardsNotifications.onNotificationAdded.addListener((id: string, type: n chrome.rewardsNotifications.onNotificationDeleted.addListener((id: string, type: number, timestamp: number) => { rewardsPanelActions.onNotificationDeleted(id, type, timestamp) }) - -chrome.braveRewards.onRecurringDonations.addListener((result: RewardsExtension.RecurringDonation) => { - rewardsPanelActions.onRecurringDonations(result) -}) diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts b/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts index dd11d5016bca..9a5ec3ac820b 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts @@ -212,31 +212,6 @@ export const rewardsPanelReducer = (state: RewardsExtension.State | undefined, a chrome.braveRewards.getGrant() break } - case types.SAVE_RECURRING_DONATION: - { - let newAmount = payload.newAmount - let publisherKey = payload.publisherKey - if (publisherKey == null) { - break - } - chrome.braveRewards.saveRecurringDonation(publisherKey, newAmount) - break - } - case types.REMOVE_RECURRING_DONATION: - { - let publisherKey = payload.publisherKey - if (publisherKey == null) { - break - } - chrome.braveRewards.removeRecurringDonation(publisherKey) - break - } - case types.ON_RECURRING_DONATIONS: - { - state = { ...state } - state.recurringDonations = payload.result.recurringDonations - break - } } if (state !== startingState) { diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/storage.ts b/components/brave_rewards/resources/extension/brave_rewards/background/storage.ts index 86076a3c4e3d..9f288d5a23eb 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/storage.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/storage.ts @@ -29,8 +29,7 @@ const defaultState: RewardsExtension.State = { total: '0' }, notifications: {}, - currentNotification: undefined, - recurringDonations: [] + currentNotification: undefined } const cleanData = (state: RewardsExtension.State) => { diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx index fc653874c400..94c642152eaa 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx +++ b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx @@ -79,46 +79,6 @@ export class Panel extends React.Component { console.log('doNothing click') } - onContributionAmountChange = (publisherKey: string, newAmount: string) => { - const newValue = parseInt(newAmount) - - if (newValue === 0) { - this.actions.removeRecurringContribution(publisherKey) - } else { - this.actions.saveRecurringDonation(publisherKey, newValue) - } - } - - generateAmounts = () => { - const { rates } = this.props.rewardsPanelData.walletProperties - - return [0, 1, 5, 10].map((value: number) => { - return { - tokens: value.toFixed(1), - converted: utils.convertBalance(value.toString(), rates), - selected: false - } - }) - } - - getContribution = (publisher?: RewardsExtension.Publisher) => { - let defaultContribution = '0.0' - const { recurringDonations } = this.props.rewardsPanelData - - if (!recurringDonations || - (!publisher || !publisher.publisher_key)) { - return defaultContribution - } - - recurringDonations.map((donation: any) => { - if (donation.publisherKey === publisher.publisher_key) { - defaultContribution = donation.amount.toFixed(1) - } - }) - - return defaultContribution - } - switchAutoContribute = () => { const publisher: RewardsExtension.Publisher | undefined = this.getPublisher() const publisherKey = publisher && publisher.publisher_key @@ -298,7 +258,6 @@ export class Panel extends React.Component { render () { const { balance, rates, grants } = this.props.rewardsPanelData.walletProperties const publisher: RewardsExtension.Publisher | undefined = this.getPublisher() - const defaultContribution = this.getContribution(publisher) const converted = utils.convertBalance(balance.toString(), rates) const notification = this.getNotification() @@ -309,7 +268,6 @@ export class Panel extends React.Component { faviconUrl = `chrome://favicon/size/48@2x/${publisher.favicon_url}` } } - return ( { > { publisher && publisher.publisher_key - ? <> - -
- + ? : null } diff --git a/components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts b/components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts index b93d89fab26c..72fb44451e21 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts @@ -17,9 +17,5 @@ export const enum types { ON_NOTIFICATION_DELETED = '@@rewards_panel/ON_NOTIFICATION_DELETED', DELETE_NOTIFICATION = '@@rewards_panel/DELETE_NOTIFICATION', INCLUDE_IN_AUTO_CONTRIBUTION = '@@rewards_panel/INCLUDE_IN_AUTO_CONTRIBUTION', - GET_GRANT = '@@rewards_panel/GET_GRANT', - SAVE_RECURRING_DONATION = '@@rewards_panel/SAVE_RECURRING_DONATION', - REMOVE_RECURRING_DONATION = '@@rewards_panel/REMOVE_RECURRING_DONATION', - GET_RECURRING_DONATIONS = '@@rewards_panel/GET_RECURRING_DONATIONS', - ON_RECURRING_DONATIONS = '@@rewards_panel/ON_RECURRING_DONATIONS' + GET_GRANT = '@@rewards_panel/GET_GRANT' } diff --git a/components/definitions/chromel.d.ts b/components/definitions/chromel.d.ts index 90595965157b..52e2da221b27 100644 --- a/components/definitions/chromel.d.ts +++ b/components/definitions/chromel.d.ts @@ -30,13 +30,8 @@ declare namespace chrome.braveRewards { const onCurrentReport: { addListener: (callback: (properties: RewardsExtension.Report) => void) => void } - const onRecurringDonations: { - addListener: (callback: (result: RewardsExtension.RecurringDonation) => void) => void - } const includeInAutoContribution: (publisherKey: string, excluded: boolean, windowId: number) => {} const getGrant: () => {} - const saveRecurringDonation: (publisherKey: string, newAmount: string) => {} - const removeRecurringDonation: (publisherKey: string) => {} } declare namespace chrome.rewardsNotifications { diff --git a/components/definitions/rewardsExtensions.d.ts b/components/definitions/rewardsExtensions.d.ts index 1327ab603cf8..e4a69d481a5d 100644 --- a/components/definitions/rewardsExtensions.d.ts +++ b/components/definitions/rewardsExtensions.d.ts @@ -7,7 +7,6 @@ declare namespace RewardsExtension { walletCreated: boolean walletCreateFailed: boolean walletProperties: WalletProperties - recurringDonations: Record[] } interface ApplicationState { @@ -61,8 +60,4 @@ declare namespace RewardsExtension { timestamp: number args: string[] } - - interface RecurringDonation { - recurringDonations: Record[] - } } diff --git a/test/BUILD.gn b/test/BUILD.gn index 92bd82000636..788ada7d90f3 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -274,7 +274,6 @@ test("brave_browser_tests") { if (brave_rewards_enabled) { sources += [ - "//brave/components/brave_rewards/browser/extension_rewards_service_observer_browsertest.cc", "//brave/components/brave_rewards/browser/rewards_notification_service_browsertest.cc", "//brave/components/brave_rewards/browser/rewards_service_browsertest.cc", ] @@ -310,7 +309,6 @@ test("brave_browser_tests") { ":brave_browser_tests_deps", ":browser_tests_runner", "//testing/gmock", - "//brave/vendor/bat-native-ledger", ] data_deps = [ "//ppapi:ppapi_tests",