From e2410001e8e703f18cf4b36436d7b0c8271dadce Mon Sep 17 00:00:00 2001
From: NejcZdovc <nejc.zdovc@3zsistemi.si>
Date: Tue, 9 Apr 2019 12:02:44 +0200
Subject: [PATCH] Adds option to not display grant expiry date

Partial for https://github.com/brave/brave-browser/issues/4042
---
 .../grantComplete/__snapshots__/spec.tsx.snap  |  8 --------
 src/features/rewards/grantComplete/index.tsx   | 10 ++++++++--
 src/features/rewards/walletWrapper/index.tsx   | 18 ++++++++++++++----
 src/features/rewards/walletWrapper/style.ts    |  1 +
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/features/rewards/grantComplete/__snapshots__/spec.tsx.snap b/src/features/rewards/grantComplete/__snapshots__/spec.tsx.snap
index be96f5931..7db15de65 100644
--- a/src/features/rewards/grantComplete/__snapshots__/spec.tsx.snap
+++ b/src/features/rewards/grantComplete/__snapshots__/spec.tsx.snap
@@ -132,14 +132,6 @@ exports[`Grant complete tests basic tests matches the snapshot 1`] = `
     >
        BAT
     </div>
-    <div
-      className="c2"
-    >
-      MISSING: grantExpire
-    </div>
-    <div
-      className="c3"
-    />
   </div>
   <div
     className="c4"
diff --git a/src/features/rewards/grantComplete/index.tsx b/src/features/rewards/grantComplete/index.tsx
index 7f8447113..a8e7779e5 100644
--- a/src/features/rewards/grantComplete/index.tsx
+++ b/src/features/rewards/grantComplete/index.tsx
@@ -32,8 +32,14 @@ export default class GrantComplete extends React.PureComponent<Props, {}> {
         <StyledBox>
           <StyledTitle>{getLocale('newTokenGrant')}</StyledTitle>
           <StyledValue>{amount} BAT</StyledValue>
-          <StyledTitle>{getLocale('grantExpire')}</StyledTitle>
-          <StyledValue>{date}</StyledValue>
+          {
+            date && date.length > 0
+            ? <>
+              <StyledTitle>{getLocale('grantExpire')}</StyledTitle>
+              <StyledValue>{date}</StyledValue>
+            </>
+            : null
+          }
         </StyledBox>
         {
           !isMobile
diff --git a/src/features/rewards/walletWrapper/index.tsx b/src/features/rewards/walletWrapper/index.tsx
index 8198fa8d2..71790bfe5 100644
--- a/src/features/rewards/walletWrapper/index.tsx
+++ b/src/features/rewards/walletWrapper/index.tsx
@@ -411,10 +411,15 @@ export default class WalletWrapper extends React.PureComponent<Props, State> {
     const hasGrants = this.hasGrants(grants)
 
     let tokens = '0.0'
+    let date = ''
     if (grant && grant.probi && convertProbiToFixed) {
       tokens = convertProbiToFixed(grant.probi, 1)
     }
 
+    if (grant && grant.expiryTime !== 0) {
+      date = new Date(grant.expiryTime).toLocaleDateString()
+    }
+
     return (
       <>
         <StyledWrapper
@@ -424,19 +429,19 @@ export default class WalletWrapper extends React.PureComponent<Props, State> {
           notification={notification}
         >
           {
-            grant && !grant.expiryTime
+            grant && !grant.probi
               ? this.grantCaptcha()
               : null
           }
           {
-            grant && grant.expiryTime
+            grant && grant.probi
               ? <GrantWrapper
                 isPanel={true}
                 onClose={this.onFinish}
                 title={getLocale('captchaLuckyDay')}
                 text={getLocale('captchaOnTheWay')}
               >
-                <GrantComplete isMobile={true} onClose={this.onFinish} amount={tokens} date={new Date(grant.expiryTime).toLocaleDateString()} />
+                <GrantComplete isMobile={true} onClose={this.onFinish} amount={tokens} date={date} />
               </GrantWrapper>
               : null
           }
@@ -498,7 +503,12 @@ export default class WalletWrapper extends React.PureComponent<Props, State> {
                         {
                           grants && grants.map((grant: Grant, i: number) => {
                             return <StyledGrant key={`${id}-grant-${i}`}>
-                              <b>{grant.tokens} BAT</b> <span>{getLocale('expiresOn')} {grant.expireDate}</span>
+                              <b>{grant.tokens} BAT</b>
+                              {
+                                grant.expireDate.length > 0
+                                ? <span>{getLocale('expiresOn')} {grant.expireDate}</span>
+                                : null
+                              }
                             </StyledGrant>
                           })
                         }
diff --git a/src/features/rewards/walletWrapper/style.ts b/src/features/rewards/walletWrapper/style.ts
index 14c34bce5..b6e45cec7 100644
--- a/src/features/rewards/walletWrapper/style.ts
+++ b/src/features/rewards/walletWrapper/style.ts
@@ -164,6 +164,7 @@ export const StyledGrant = styled<{}, 'div'>('div')`
     min-width: 81px;
     text-align: right;
     display: inline-block;
+    padding-right: 5px;
   }
 
   span {