Fixes tip format for media publishers

Resolves brave/brave-browser#1976
brave · Nov 4, 2018 · 4808869 · 4808869
1 parent e2acc42
commit 4808869
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/components/brave_rewards/browser/publisher_info_database.cc b/components/brave_rewards/browser/publisher_info_database.cc
@@ -586,7 +586,8 @@ void PublisherInfoDatabase::GetRecurringDonations(ledger::PublisherInfoList* lis
     return;
 
   sql::Statement info_sql(
-      db_.GetUniqueStatement("SELECT pi.publisher_id, pi.name, pi.url, pi.favIcon, rd.amount, rd.added_date, pi.verified "
+      db_.GetUniqueStatement("SELECT pi.publisher_id, pi.name, pi.url, pi.favIcon, "
+                             "rd.amount, rd.added_date, pi.verified, pi.provider "
                              "FROM recurring_donation as rd "
                              "INNER JOIN publisher_info AS pi ON rd.publisher_id = pi.publisher_id "));
 
@@ -601,6 +602,7 @@ void PublisherInfoDatabase::GetRecurringDonations(ledger::PublisherInfoList* lis
     publisher.weight = info_sql.ColumnDouble(4);
     publisher.reconcile_stamp = info_sql.ColumnInt64(5);
     publisher.verified = info_sql.ColumnBool(6);
+    publisher.provider = info_sql.ColumnString(7);
 
     list->push_back(publisher);
   }
@@ -616,7 +618,8 @@ void PublisherInfoDatabase::GetTips(ledger::PublisherInfoList* list, ledger::PUB
     return;
 
   sql::Statement info_sql(
-      db_.GetUniqueStatement("SELECT pi.publisher_id, pi.name, pi.url, pi.favIcon, ci.probi, ci.date, pi.verified "
+      db_.GetUniqueStatement("SELECT pi.publisher_id, pi.name, pi.url, pi.favIcon, "
+                             "ci.probi, ci.date, pi.verified, pi.provider "
                              "FROM contribution_info as ci "
                              "INNER JOIN publisher_info AS pi ON ci.publisher_id = pi.publisher_id "
                              "AND ci.month = ? AND ci.year = ? "
@@ -638,6 +641,7 @@ void PublisherInfoDatabase::GetTips(ledger::PublisherInfoList* list, ledger::PUB
     publisher.weight = info_sql.ColumnDouble(4);
     publisher.reconcile_stamp = info_sql.ColumnInt64(5);
     publisher.verified = info_sql.ColumnBool(6);
+    publisher.provider = info_sql.ColumnString(7);
 
     list->push_back(publisher);
   }

diff --git a/components/brave_rewards/resources/ui/components/donationsBox.tsx b/components/brave_rewards/resources/ui/components/donationsBox.tsx
@@ -108,19 +108,14 @@ class DonationBox extends React.Component<Props, State> {
     let recurring: DetailRow[] = []
     if (recurringList) {
       recurring = recurringList.map((item: Rewards.Publisher) => {
-        let name = item.name
-        if (item.provider) {
-          name = `${name} ${getLocale('on')} ${item.provider}`
-        }
-
         let faviconUrl = `chrome://favicon/size/48@1x/${item.url}`
         if (item.favIcon) {
           faviconUrl = `chrome://favicon/size/48@1x/${item.favIcon}`
         }
 
         return {
           profile: {
-            name,
+            name: item.name,
             verified: item.verified,
             provider: (item.provider ? item.provider : undefined) as Provider,
             src: faviconUrl
@@ -140,11 +135,6 @@ class DonationBox extends React.Component<Props, State> {
     let tips: DetailRow[] = []
     if (tipsList) {
       tips = tipsList.map((item: Rewards.Publisher) => {
-        let name = item.name
-        if (item.provider) {
-          name = `${name} ${getLocale('on')} ${item.provider}`
-        }
-
         let faviconUrl = `chrome://favicon/size/48@1x/${item.url}`
         if (item.favIcon) {
           faviconUrl = `chrome://favicon/size/48@1x/${item.favIcon}`
@@ -154,7 +144,7 @@ class DonationBox extends React.Component<Props, State> {
 
         return {
           profile: {
-            name,
+            name: item.name,
             verified: item.verified,
             provider: (item.provider ? item.provider : undefined) as Provider,
             src: faviconUrl