Merge pull request #2337 from brave/claimed-grant-date

Removes date from ads grants in the wallet
brave · May 3, 2019 · ca913fc · ca913fc
1 parent bb6cc3d
commit ca913fc
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 48 deletions.
diff --git a/browser/ui/webui/brave_donate_ui.cc b/browser/ui/webui/brave_donate_ui.cc
@@ -165,6 +165,7 @@ void RewardsDonateDOMHandler::OnWalletProperties(
       auto grant = std::make_unique<base::DictionaryValue>();
       grant->SetString("probi", item.probi);
       grant->SetInteger("expiryTime", item.expiryTime);
+      grant->SetString("type", item.type);
       grants->Append(std::move(grant));
     }
     walletInfo->SetList("grants", std::move(grants));

diff --git a/browser/ui/webui/brave_rewards_ui.cc b/browser/ui/webui/brave_rewards_ui.cc
@@ -410,6 +410,7 @@ void RewardsDOMHandler::OnGetAutoContributeProps(
         auto grant = std::make_unique<base::DictionaryValue>();
         grant->SetString("probi", item.probi);
         grant->SetInteger("expiryTime", item.expiryTime);
+        grant->SetString("type", item.type);
         grants->Append(std::move(grant));
       }
       walletInfo->SetList("grants", std::move(grants));
@@ -530,6 +531,7 @@ void RewardsDOMHandler::OnRecoverWallet(
       auto grant = std::make_unique<base::DictionaryValue>();
       grant->SetString("probi", item.probi);
       grant->SetInteger("expiryTime", item.expiryTime);
+      grant->SetString("type", item.type);
       newGrants->Append(std::move(grant));
     }
     recover.SetList("grants", std::move(newGrants));

diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -268,6 +268,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "addFundsQR", IDS_BRAVE_UI_ADD_FUNDS_QR},
         { "addFundsText", IDS_BRAVE_UI_ADD_FUNDS_TEXT},
         { "addFundsTitle", IDS_BRAVE_UI_ADD_FUNDS_TITLE},
+        { "adsEarnings", IDS_BRAVE_UI_ADS_EARNINGS },
         { "allowTip", IDS_BRAVE_UI_ALLOW_TIP },
         { "amount", IDS_BRAVE_UI_AMOUNT },
         { "backup", IDS_BRAVE_UI_BACKUP },

diff --git a/common/extensions/api/brave_rewards.json b/common/extensions/api/brave_rewards.json
@@ -172,6 +172,10 @@
                     "expiryTime": {
                       "type": "integer",
                       "description": "when grant expires, timestamp in seconds"
+                    },
+                    "type": {
+                      "type": "string",
+                      "description": "grant type, ugp or ads"
                     }
                   }
                 }

diff --git a/components/brave_rewards/browser/extension_rewards_service_observer.cc b/components/brave_rewards/browser/extension_rewards_service_observer.cc
@@ -79,6 +79,7 @@ void ExtensionRewardsServiceObserver::OnWalletProperties(
       grant.altcurrency = wallet_properties->grants[i].altcurrency;
       grant.probi = wallet_properties->grants[i].probi;
       grant.expiry_time = wallet_properties->grants[i].expiryTime;
+      grant.type = wallet_properties->grants[i].type;
     }
 
     std::unique_ptr<base::ListValue> args(

diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -796,6 +796,7 @@ void RewardsServiceImpl::OnWalletProperties(
         grant.altcurrency = wallet_info->grants_[i].altcurrency;
         grant.probi = wallet_info->grants_[i].probi;
         grant.expiryTime = wallet_info->grants_[i].expiryTime;
+        grant.type = wallet_info->grants_[i].type;
 
         wallet_properties->grants.push_back(grant);
       }
@@ -1395,6 +1396,7 @@ void RewardsServiceImpl::TriggerOnRecoverWallet(ledger::Result result,
     grant.altcurrency = grants[i].altcurrency;
     grant.probi = grants[i].probi;
     grant.expiryTime = grants[i].expiryTime;
+    grant.type = grants[i].type;
 
     newGrants.push_back(grant);
   }

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
@@ -356,5 +356,9 @@
   "turnOnAds": {
     "message": "Turn on Ads",
     "description": "Prompt to turn on Ads via notification"
+  },
+  "adsEarnings": {
+    "message": "earned from ads",
+    "description": "Description text for ad grants in grant details"
   }
 }
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
@@ -86,6 +86,7 @@ export const getUIMessages = (): Record<string, string> => {
     'unVerifiedText',
     'unVerifiedTextMore',
     'verifiedPublisher',
+    'adsEarnings',
     'welcomeButtonTextOne',
     'welcomeButtonTextTwo',
     'welcomeDescOne',

diff --git a/components/brave_rewards/resources/extension/brave_rewards/utils.ts b/components/brave_rewards/resources/extension/brave_rewards/utils.ts
@@ -39,14 +39,10 @@ export const getGrants = (grants?: RewardsExtension.Grant[]) => {
   }
 
   return grants.map((grant: RewardsExtension.Grant) => {
-    let expireDate = ''
-    if (grant.type !== 'ads') {
-      expireDate = new Date(grant.expiryTime * 1000).toLocaleDateString()
-    }
-
     return {
       tokens: convertProbiToFixed(grant.probi),
-      expireDate
+      expireDate: new Date(grant.expiryTime * 1000).toLocaleDateString(),
+      type: grant.type || 'ugp'
     }
   })
 }

diff --git a/components/brave_rewards/resources/ui/components/pageWallet.tsx b/components/brave_rewards/resources/ui/components/pageWallet.tsx
@@ -156,14 +156,10 @@ class PageWallet extends React.Component<Props, State> {
     }
 
     return grants.map((grant: Rewards.Grant) => {
-      let expireDate = ''
-      if (grant.type !== 'ads') {
-        expireDate = new Date(grant.expiryTime * 1000).toLocaleDateString()
-      }
-
       return {
         tokens: utils.convertProbiToFixed(grant.probi),
-        expireDate
+        expireDate: new Date(grant.expiryTime * 1000).toLocaleDateString(),
+        type: grant.type || 'ugp'
       }
     })
   }

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -487,6 +487,7 @@
       <message name="IDS_BRAVE_UI_SITE_BANNER_NOTICE_NOTE" desc="">NOTE:</message>
       <message name="IDS_BRAVE_UI_SITE_BANNER_NOTICE_TEXT" desc="">This creator has not yet signed up to receive contributions from Brave users. Your browser will keep trying to contribute until they verify, or until 90 days have passed.</message>
       <message name="IDS_BRAVE_UI_SITE_UNVERIFIED_TEXT_MORE" desc="">Learn more.</message>
+      <message name="IDS_BRAVE_UI_ADS_EARNINGS" desc="Description text for ad grants in grant details">earned from ads</message>
 
       <!-- WebUI brave sync resources -->
       <!-- WebUI brave sync resources: Shared Content -->

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -276,7 +276,7 @@
     "@types/react-redux": "6.0.4",
     "@types/redux-logger": "^3.0.7",
     "awesome-typescript-loader": "^5.2.1",
-    "brave-ui": "github:brave/brave-ui#b94af34d0e556795b912499ab80ba2e08d689b8a",
+    "brave-ui": "github:brave/brave-ui#45a826dab14438b564fdf37e3b2d81b0e7027c56",
     "css-loader": "^2.1.1",
     "csstype": "^2.5.5",
     "deep-freeze-node": "^1.1.3",

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/bat_client.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/bat_client.cc
@@ -276,6 +276,7 @@ ledger::WalletInfo BatClient::WalletPropertiesToWalletInfo(
     grant.altcurrency = properties.grants_[i].altcurrency;
     grant.probi = properties.grants_[i].probi;
     grant.expiryTime = properties.grants_[i].expiryTime;
+    grant.type = properties.grants_[i].type;
 
     info.grants_.push_back(grant);
   }

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/bat_helper.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/bat_helper.cc
@@ -896,6 +896,10 @@ bool WALLET_PROPERTIES_ST::loadFromJson(const std::string & json) {
           grant.expiryTime = obj["expiryTime"].GetUint64();
         }
 
+        if (obj.HasMember("type")) {
+          grant.type = obj["type"].GetString();
+        }
+
         grants_.push_back(grant);
       }
     } else {
@@ -1140,6 +1144,9 @@ void saveToJson(JsonWriter* writer, const GRANT& data) {
   writer->String("promotionId");
   writer->String(data.promotionId.c_str());
 
+  writer->String("type");
+  writer->String(data.type.c_str());
+
   writer->EndObject();
 }
 
@@ -2050,6 +2057,10 @@ bool getJSONRecoverWallet(const std::string& json,
           grant.expiryTime = obj["expiryTime"].GetUint64();
         }
 
+        if (obj.HasMember("type")) {
+          grant.type = obj["type"].GetString();
+        }
+
         grants->push_back(grant);
       }
     } else {

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc
@@ -650,6 +650,7 @@ void LedgerImpl::OnRecoverWallet(
     tempGrant.altcurrency = grants[i].altcurrency;
     tempGrant.probi = grants[i].probi;
     tempGrant.expiryTime = grants[i].expiryTime;
+    tempGrant.type = grants[i].type;
 
     ledgerGrants.push_back(tempGrant);
   }