Shows only completed tips in tip list

Resolves brave/brave-browser#8945
brave · Apr 1, 2020 · af96870 · af96870
1 parent d12719b
commit af96870
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc
@@ -1179,7 +1179,7 @@ void Contribution::OnExternalWalletServerPublisherInfo(
     double amount,
     const ledger::ExternalWallet& wallet,
     const ledger::RewardsType type) {
-  if (!info || info->status != ledger::PublisherStatus::VERIFIED) {
+  if (!info) {
     BLOG(ledger_, ledger::LogLevel::LOG_ERROR) << "Publisher not found";
     ledger_->ContributionCompleted(
         ledger::Result::LEDGER_ERROR,
@@ -1189,6 +1189,24 @@ void Contribution::OnExternalWalletServerPublisherInfo(
     return;
   }
 
+  if (info->status != ledger::PublisherStatus::VERIFIED) {
+    BLOG(ledger_, ledger::LogLevel::LOG_ERROR) << "Publisher not verified";
+
+    // we don't need callback as there is nothing to report back
+    SavePendingContribution(
+        info->publisher_key,
+        amount,
+        type,
+        [](const ledger::Result){});
+
+    ledger_->ContributionCompleted(
+        ledger::Result::LEDGER_ERROR,
+        amount,
+        contribution_id,
+        type);
+    return;
+  }
+
   auto completed_callback = std::bind(&Contribution::ExternalWalletCompleted,
       this,
       _1,

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_contribution_info.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_contribution_info.cc
@@ -572,7 +572,7 @@ void DatabaseContributionInfo::GetOneTimeTips(
       "ON spi.publisher_key = pi.publisher_id "
       "WHERE strftime('%%m',  datetime(ci.created_at, 'unixepoch')) = ? AND "
       "strftime('%%Y', datetime(ci.created_at, 'unixepoch')) = ? "
-      "AND ci.type = ?",
+      "AND ci.type = ? AND ci.step = ?",
       kTableName,
       kChildTableName);
 
@@ -586,6 +586,8 @@ void DatabaseContributionInfo::GetOneTimeTips(
   BindString(command.get(), 1, std::to_string(year));
   BindInt(command.get(), 2,
       static_cast<int>(ledger::RewardsType::ONE_TIME_TIP));
+  BindInt(command.get(), 3,
+      static_cast<int>(ledger::ContributionStep::STEP_COMPLETED));
 
   command->record_bindings = {
       ledger::DBCommand::RecordBindingType::STRING_TYPE,