Hides expiry date for ads

Resolves brave/brave-browser#4042
brave · Apr 10, 2019 · c87cd24 · c87cd24
1 parent c7fe1e8
commit c87cd24
Show file tree

Hide file tree

Showing 14 changed files with 104 additions and 53 deletions.
diff --git a/browser/ui/webui/brave_rewards_ui.cc b/browser/ui/webui/brave_rewards_ui.cc
@@ -575,6 +575,7 @@ void RewardsDOMHandler::OnGrantFinish(
     finish.SetInteger("status", result);
     finish.SetInteger("expiryTime", grant.expiryTime);
     finish.SetString("probi", grant.probi);
+    finish.SetString("type", grant.type);
 
     web_ui()->CallJavascriptFunctionUnsafe("brave_rewards.grantFinish", finish);
     GetAllBalanceReports();

diff --git a/common/extensions/api/brave_rewards.json b/common/extensions/api/brave_rewards.json
@@ -45,7 +45,25 @@
         "parameters": [
           {
             "name": "properties",
-            "type": "any"
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "integer",
+                "description": "publisher attention score"
+              },
+              "expiryTime": {
+                "type": "integer",
+                "description": "grant expiry time"
+              },
+              "probi": {
+                "type": "string",
+                "description": "value of the grant"
+              },
+              "type": {
+                "type": "string",
+                "description": "type of the grant (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
@@ -216,13 +216,14 @@ void ExtensionRewardsServiceObserver::OnGrantFinish(
     return;
   }
 
-  base::DictionaryValue finish;
-  finish.SetInteger("status", result);
-  finish.SetInteger("expiryTime", grant.expiryTime);
-  finish.SetString("probi", grant.probi);
+  extensions::api::brave_rewards::OnGrantFinish::Properties properties;
+  properties.status = result;
+  properties.expiry_time = grant.expiryTime;
+  properties.probi = grant.probi;
+  properties.type = grant.type;
 
   std::unique_ptr<base::ListValue> args(
-      extensions::api::brave_rewards::OnGrantFinish::Create(finish)
+      extensions::api::brave_rewards::OnGrantFinish::Create(properties)
           .release());
   std::unique_ptr<extensions::Event> event(new extensions::Event(
       extensions::events::BRAVE_START,

diff --git a/components/brave_rewards/resources/extension/brave_rewards/BUILD.gn b/components/brave_rewards/resources/extension/brave_rewards/BUILD.gn
@@ -15,6 +15,7 @@ transpile_web_ui("brave_rewards_panel") {
     "background/api/tabs_api.ts",
     "background/events/rewardsEvents.ts",
     "background/events/tabEvents.ts",
+    "background/reducers/grant_panel_reducer.ts",
     "background/reducers/index.ts",
     "background/reducers/rewards_panel_reducer.ts",
     "background/storage.ts",

diff --git a/...rave_rewards/resources/extension/brave_rewards/background/reducers/grant_panel_reducer.ts b/...rave_rewards/resources/extension/brave_rewards/background/reducers/grant_panel_reducer.ts
@@ -183,6 +183,7 @@ export const grantPanelReducer = (state: RewardsExtension.State | undefined, act
         case 0:
           currentGrant.expiryTime = properties.expiryTime * 1000
           currentGrant.probi = properties.probi
+          currentGrant.type = properties.type
           currentGrant.status = null
           chrome.braveRewards.getWalletProperties()
           break

diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx
@@ -405,7 +405,7 @@ export class Panel extends React.Component<Props, State> {
     const notificationId = this.getNotificationProp('id', notification)
     const notificationType = this.getNotificationProp('type', notification)
     const notificationClick = this.getNotificationClickEvent(notificationType, notificationId)
-    const { currentGrant } = this.props.rewardsPanelData
+    let { currentGrant } = this.props.rewardsPanelData
     const defaultContribution = this.getContribution(publisher)
     const tipAmounts = defaultContribution !== '0.0'
       ? this.generateAmounts(publisher)
@@ -421,6 +421,9 @@ export class Panel extends React.Component<Props, State> {
         faviconUrl = `chrome://favicon/size/48@2x/${publisher.favicon_url}`
       }
     }
+
+    currentGrant = utils.getGrant(currentGrant)
+
     return (
       <WalletWrapper
         compact={true}

diff --git a/components/brave_rewards/resources/extension/brave_rewards/utils.ts b/components/brave_rewards/resources/extension/brave_rewards/utils.ts
@@ -39,9 +39,22 @@ 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: new Date(grant.expiryTime * 1000).toLocaleDateString()
+      expireDate
     }
   })
 }
+
+export const getGrant = (grant?: RewardsExtension.GrantInfo) => {
+  if (grant && grant.type === 'ads') {
+    grant.expiryTime = 0
+  }
+
+  return grant
+}
diff --git a/components/brave_rewards/resources/ui/components/grant.tsx b/components/brave_rewards/resources/ui/components/grant.tsx
@@ -145,6 +145,7 @@ class Grant extends React.Component<Props, State> {
     let type
     let promoId
     let tokens = '0.0'
+    let date = ''
 
     if (grant.type) {
       type = grant.type
@@ -156,6 +157,10 @@ class Grant extends React.Component<Props, State> {
       tokens = convertProbiToFixed(grant.probi)
     }
 
+    if (grant.type !== 'ads') {
+      date = new Date(grant.expiryTime).toLocaleDateString()
+    }
+
     return (
       <>
         {
@@ -175,7 +180,7 @@ class Grant extends React.Component<Props, State> {
               title={'It’s your lucky day!'}
               text={'Your token grant is on its way.'}
             >
-              <GrantComplete onClose={this.onFinish} amount={tokens} date={new Date(grant.expiryTime).toLocaleDateString()} />
+              <GrantComplete onClose={this.onFinish} amount={tokens} date={date} />
             </GrantWrapper>
             : null
         }

diff --git a/components/brave_rewards/resources/ui/components/pageWallet.tsx b/components/brave_rewards/resources/ui/components/pageWallet.tsx
@@ -156,9 +156,14 @@ 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: new Date(grant.expiryTime * 1000).toLocaleDateString()
+        expireDate
       }
     })
   }

diff --git a/components/brave_rewards/resources/ui/reducers/grant_reducer.ts b/components/brave_rewards/resources/ui/reducers/grant_reducer.ts
@@ -177,6 +177,7 @@ const grantReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
           let ui = state.ui
           newGrant.expiryTime = properties.expiryTime * 1000
           newGrant.probi = properties.probi
+          newGrant.type = properties.type
           newGrant.status = null
           ui.emptyWallet = false
 

diff --git a/components/definitions/rewardsExtensions.d.ts b/components/definitions/rewardsExtensions.d.ts
@@ -42,6 +42,7 @@ declare namespace RewardsExtension {
     altcurrency: string
     probi: string
     expiryTime: number
+    type: string
   }
 
   export type GrantStatus = 'wrongPosition' | 'grantGone' | 'generalError' | 'grantAlreadyClaimed' | number | null

diff --git a/components/test/brave_rewards/ui/reducers/grant_reducer_test.ts b/components/test/brave_rewards/ui/reducers/grant_reducer_test.ts
@@ -420,7 +420,8 @@ describe('Grant Reducer', () => {
           properties: {
             status: 0,
             expiryTime: 11,
-            probi: '30.000000'
+            probi: '30.000000',
+            type: 'ads'
           }
         }
       })