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

Ads Confirmations #1645

Merged
merged 72 commits into from
Feb 21, 2019
Merged

Ads Confirmations #1645

merged 72 commits into from
Feb 21, 2019

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Feb 12, 2019

fixes brave/brave-browser#3117
fixes brave/brave-browser#2830
fixes brave/brave-browser#2912
fixes brave/brave-browser#2910
fixes brave/brave-browser#2909
fixes brave/brave-browser#2908
fixes brave/brave-browser#2907
fixes brave/brave-browser#2906

requires brave/brave-browser#3406
requires brave-intl/bat-native-confirmations#67
requires #1751

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@tmancey tmancey added this to the 0.61.x - Dev milestone Feb 12, 2019
@tmancey tmancey self-assigned this Feb 12, 2019
@@ -17,6 +17,8 @@
#include "bat/ads/ads_client.h"
#include "brave/components/brave_ads/browser/ads_service.h"
#include "brave/components/brave_ads/browser/background_helper.h"
#include "brave/components/brave_rewards/browser/rewards_service.h"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these headers should go in the .cc file - there is already a forward decl below for RewardsService

@@ -297,14 +297,29 @@ void RewardsNotificationServiceImpl::OnGetAllNotifications(
TriggerOnGetAllNotifications(rewards_notifications_list);
}

std::string RewardsNotificationServiceImpl::GetGrantIdPrefix(
const std::string& grant_type) {
std::string prefix = grant_type == "ugp"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grant_type == "ugp" should be a method to remove duplication

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@@ -21,6 +21,11 @@
class PrefRegistrySimple;
class Profile;

namespace ads {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are not needed

@@ -182,6 +182,25 @@ class RewardsServiceImpl : public RewardsService,

void GetAddressesForPaymentId(const GetAddressesCallback& callback) override;

void SetCatalogIssuers(const std::string& json) override;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these should all be listed under // LedgerClient impl

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checked, and it is now listed under so I gather you made this change

@NejcZdovc
Copy link
Contributor

@ryanml when everything is done from UI perspective please let me know so that I can do a review of it. Please do not merge until I do that. Thank you

@tmancey tmancey mentioned this pull request Feb 18, 2019
16 tasks
@tmancey tmancey force-pushed the fix-linking-error-rebase branch 6 times, most recently from a4f3c9c to f5447d7 Compare February 20, 2019 02:00
Copy link
Contributor

@NejcZdovc NejcZdovc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving as @bridiver already approved it as well

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment