Fixes brave/brave-browser#3637, adds notification for tip reconcile

brave · Mar 22, 2019 · 77a2b2f · 77a2b2f
1 parent 9b9da18
commit 77a2b2f
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 6 deletions.
diff --git a/components/brave_rewards/browser/rewards_notification_service.h b/components/brave_rewards/browser/rewards_notification_service.h
@@ -36,6 +36,7 @@ class RewardsNotificationService {
     REWARDS_NOTIFICATION_IMPENDING_CONTRIBUTION,
     REWARDS_NOTIFICATION_INSUFFICIENT_FUNDS,
     REWARDS_NOTIFICATION_BACKUP_WALLET,
+    REWARDS_NOTIFICATION_TIPS_PROCESSED
   };
 
   struct RewardsNotification {

diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h
@@ -63,7 +63,7 @@ using GetPublisherMinVisitTimeCallback = base::Callback<void(uint64_t)>;
 using GetPublisherMinVisitsCallback = base::Callback<void(uint32_t)>;
 using GetPublisherAllowNonVerifiedCallback = base::Callback<void(bool)>;
 using GetPublisherAllowVideosCallback = base::Callback<void(bool)>;
-using GetAutoContributeCallback = base::Callback<void(bool)>;
+using GetAutoContributeCallback = base::OnceCallback<void(bool)>;
 using GetReconcileStampCallback = base::Callback<void(uint64_t)>;
 using IsWalletCreatedCallback = base::Callback<void(bool)>;
 using GetPendingContributionsTotalCallback = base::Callback<void(double)>;
@@ -138,7 +138,7 @@ class RewardsService : public KeyedService {
   virtual void SetContributionAmount(double amount) const = 0;
   virtual void SetUserChangedContribution() const = 0;
   virtual void GetAutoContribute(
-      const GetAutoContributeCallback& callback) = 0;
+      GetAutoContributeCallback callback) = 0;
   virtual void SetAutoContribute(bool enabled) const = 0;
   virtual void SetTimer(uint64_t time_offset, uint32_t* timer_id) = 0;
   virtual void GetAllBalanceReports(

diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -872,6 +872,11 @@ void RewardsServiceImpl::OnReconcileComplete(ledger::Result result,
       return;
 
     FetchWalletProperties();
+
+    if (category == ledger::REWARDS_CATEGORY::RECURRING_DONATION) {
+      MaybeShowNotificationTipsPaid();
+    }
+
     bat_ledger_->OnReconcileCompleteSuccess(viewing_id,
         category,
         probi,
@@ -1704,12 +1709,12 @@ void RewardsServiceImpl::SetUserChangedContribution() const {
 }
 
 void RewardsServiceImpl::GetAutoContribute(
-    const GetAutoContributeCallback& callback) {
+    GetAutoContributeCallback callback) {
   if (!Connected()) {
     return;
   }
 
-  bat_ledger_->GetAutoContribute(callback);
+  bat_ledger_->GetAutoContribute(std::move(callback));
 }
 
 void RewardsServiceImpl::SetAutoContribute(bool enabled) const {
@@ -2398,6 +2403,21 @@ void RewardsServiceImpl::ShowNotificationAddFunds(bool sufficient) {
       "rewards_notification_insufficient_funds");
 }
 
+void RewardsServiceImpl::MaybeShowNotificationTipsPaid() {
+  GetAutoContribute(base::BindOnce(&RewardsServiceImpl::ShowNotificationTipsPaid,
+      AsWeakPtr()));
+}
+
+void RewardsServiceImpl::ShowNotificationTipsPaid(bool ac_enabled) {
+  if (ac_enabled)
+    return;
+
+  RewardsNotificationService::RewardsNotificationArgs args;
+  notification_service_->AddNotification(
+      RewardsNotificationService::REWARDS_NOTIFICATION_TIPS_PROCESSED, args,
+      "rewards_notification_tips_processed");
+}
+
 std::unique_ptr<ledger::LogStream> RewardsServiceImpl::Log(
     const char* file,
     int line,

diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h
@@ -129,7 +129,7 @@ class RewardsServiceImpl : public RewardsService,
   void GetReconcileStamp(const GetReconcileStampCallback& callback) override;
   void GetAddresses(const GetAddressesCallback& callback) override;
   void GetAutoContribute(
-      const GetAutoContributeCallback& callback) override;
+      GetAutoContributeCallback callback) override;
   void GetPublisherMinVisitTime(
       const GetPublisherMinVisitTimeCallback& callback) override;
   void GetPublisherMinVisits(
@@ -421,6 +421,9 @@ class RewardsServiceImpl : public RewardsService,
   bool ShouldShowNotificationAddFunds() const;
   void ShowNotificationAddFunds(bool sufficient);
 
+  void MaybeShowNotificationTipsPaid();
+  void ShowNotificationTipsPaid(bool ac_enabled);
+
   // Mojo Proxy methods
   void OnPublisherBannerMojoProxy(const std::string& banner);
   void OnGetConfirmationsHistory(

diff --git a/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json b/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json
@@ -376,5 +376,13 @@
   "welcomeBack": {
     "message": "Welcome Back!",
     "description": "Title message for wallet disabled panel"
+  },
+  "tipsProcessedNotification": {
+    "message": "Your monthly tips have been processed!",
+    "description": "Message for monthly tips processed notification"
+  },
+  "contributionTips": {
+    "message": "Contributions & Tips",
+    "description": "Title for monthly tips processed notification"
   }
 }
diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts b/components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts
@@ -38,6 +38,7 @@ export const getUIMessages = (): Record<string, string> => {
     'captchaTarget',
     'captchaMissedTarget',
     'claim',
+    'contributionTips',
     'disabledPanelTextTwo',
     'donateMonthly',
     'donateNow',
@@ -84,6 +85,7 @@ export const getUIMessages = (): Record<string, string> => {
     'rewardsSummary',
     'serviceText',
     'termsOfService',
+    'tipsProcessedNotification',
     'tokenGrant',
     'tokenGrantClaimed',
     'unVerifiedPublisher',

diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx
@@ -305,6 +305,10 @@ export class Panel extends React.Component<Props, State> {
         type = 'insufficientFunds'
         text = getMessage('insufficientFundsNotification')
         break
+      case RewardsNotificationType.REWARDS_NOTIFICATION_TIPS_PROCESSED:
+        type = 'tipsProcessed'
+        text = getMessage('tipsProcessedNotification')
+        break
       default:
         type = ''
         break

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
@@ -42,5 +42,6 @@ export const enum RewardsNotificationType {
   REWARDS_NOTIFICATION_FAILED_CONTRIBUTION,
   REWARDS_NOTIFICATION_IMPENDING_CONTRIBUTION,
   REWARDS_NOTIFICATION_INSUFFICIENT_FUNDS,
-  REWARDS_NOTIFICATION_BACKUP_WALLET
+  REWARDS_NOTIFICATION_BACKUP_WALLET,
+  REWARDS_NOTIFICATION_TIPS_PROCESSED
 }