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

Expends contribution info table #4048

Merged
merged 4 commits into from
Nov 27, 2019
Merged

Expends contribution info table #4048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce8e72c
Adds recurring tip struct
NejcZdovc Nov 21, 2019
dcd165b
Expends contribution info table
NejcZdovc Nov 20, 2019
edfc5c1
Fixes v7 table that was not created correctly in https://github.com/b…
NejcZdovc Nov 25, 2019
8589c5e
Fix iOS build
kylehickinson Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 7 additions & 27 deletions browser/ui/webui/brave_rewards_page_ui.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,12 @@ class RewardsDOMHandler : public WebUIMessageHandler,
void OnExcludedSitesChanged(brave_rewards::RewardsService* rewards_service,
std::string publisher_id,
bool excluded) override;
void OnReconcileComplete(brave_rewards::RewardsService* rewards_service,
unsigned int result,
const std::string& viewing_id,
const std::string& probi,
const int32_t type) override;
void OnReconcileComplete(
brave_rewards::RewardsService* rewards_service,
unsigned int result,
const std::string& viewing_id,
const double amount,
const int32_t type) override;
void OnPendingContributionSaved(
brave_rewards::RewardsService* rewards_service,
int result) override;
Expand All @@ -222,11 +223,6 @@ class RewardsDOMHandler : public WebUIMessageHandler,
void OnRecurringTipRemoved(brave_rewards::RewardsService* rewards_service,
bool success) override;

void OnContributionSaved(
brave_rewards::RewardsService* rewards_service,
bool success,
int type) override;

void OnPendingContributionRemoved(
brave_rewards::RewardsService* rewards_service,
int32_t result) override;
Expand Down Expand Up @@ -992,7 +988,7 @@ void RewardsDOMHandler::OnReconcileComplete(
brave_rewards::RewardsService* rewards_service,
unsigned int result,
const std::string& viewing_id,
const std::string& probi,
const double amount,
const int32_t type) {
if (web_ui()->CanCallJavascript()) {
base::DictionaryValue complete;
Expand Down Expand Up @@ -1447,22 +1443,6 @@ void RewardsDOMHandler::OnRecurringTipRemoved(
"brave_rewards.recurringTipRemoved", base::Value(success));
}

void RewardsDOMHandler::OnContributionSaved(
brave_rewards::RewardsService* rewards_service,
bool success,
int type) {
if (!web_ui()->CanCallJavascript()) {
return;
}

base::DictionaryValue result;
result.SetBoolean("success", success);
result.SetInteger("type", type);

web_ui()->CallJavascriptFunctionUnsafe(
"brave_rewards.onContributionSaved", result);
}

void RewardsDOMHandler::SetInlineTipSetting(const base::ListValue* args) {
std::string key;
args->GetString(0, &key);
Expand Down
4 changes: 2 additions & 2 deletions browser/ui/webui/brave_tip_ui.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class RewardsTipDOMHandler : public WebUIMessageHandler,
brave_rewards::RewardsService* rewards_service,
unsigned int result,
const std::string& viewing_id,
const std::string& probi,
const double amount,
const int32_t type) override;

brave_rewards::RewardsService* rewards_service_; // NOT OWNED
Expand Down Expand Up @@ -489,7 +489,7 @@ void RewardsTipDOMHandler::OnReconcileComplete(
brave_rewards::RewardsService* rewards_service,
unsigned int result,
const std::string& viewing_id,
const std::string& probi,
const double amount,
const int32_t type) {
if (!web_ui()->CanCallJavascript()) {
return;
Expand Down
6 changes: 2 additions & 4 deletions components/brave_rewards/browser/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,8 @@ source_set("browser") {
"pending_contribution.h",
"publisher_banner.cc",
"publisher_banner.h",
"contribution_info.cc",
"contribution_info.h",
"reconcile_info.cc",
"reconcile_info.h",
"recurring_donation.cc",
"recurring_donation.h",
"rewards_internals_info.cc",
"rewards_internals_info.h",
"balance.cc",
Expand Down Expand Up @@ -78,6 +74,8 @@ source_set("browser") {
sources += [
"database/database_contribution_info.cc",
"database/database_contribution_info.h",
"database/database_contribution_info_publishers.cc",
"database/database_contribution_info_publishers.h",
"database/database_contribution_queue.cc",
"database/database_contribution_queue.h",
"database/database_contribution_queue_publishers.cc",
Expand Down
25 changes: 0 additions & 25 deletions components/brave_rewards/browser/contribution_info.cc
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions components/brave_rewards/browser/contribution_info.h
View file
Open in desktop

This file was deleted.

Loading