Merge pull request #499 from brave/grant-text

Adds token text to grant final screen
brave · Jun 12, 2019 · 624be47 · 624be47
2 parents b126af5 + 8879e50
commit 624be47
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 16 deletions.
diff --git a/src/features/rewards/grantComplete/__snapshots__/spec.tsx.snap b/src/features/rewards/grantComplete/__snapshots__/spec.tsx.snap
@@ -115,9 +115,7 @@ exports[`Grant complete tests basic tests matches the snapshot 1`] = `
   >
     <div
       className="c2"
-    >
-      MISSING: newTokenGrant
-    </div>
+    />
     <div
       className="c3"
     >

diff --git a/src/features/rewards/grantComplete/index.tsx b/src/features/rewards/grantComplete/index.tsx
@@ -19,18 +19,19 @@ export interface Props {
   testId?: string
   onClose: () => void
   amount: string
-  date: string,
+  date: string
   isMobile?: boolean
+  tokenTitle?: string
 }
 
 export default class GrantComplete extends React.PureComponent<Props, {}> {
   render () {
-    const { id, testId, onClose, amount, date, isMobile } = this.props
+    const { id, testId, onClose, amount, date, isMobile, tokenTitle } = this.props
 
     return (
       <StyledWrapper id={id} data-test-id={testId}>
         <StyledBox>
-          <StyledTitle>{getLocale('newTokenGrant')}</StyledTitle>
+          <StyledTitle>{tokenTitle}</StyledTitle>
           <StyledValue>{amount} BAT</StyledValue>
           {
             date && date.length > 0

diff --git a/src/features/rewards/walletWrapper/index.tsx b/src/features/rewards/walletWrapper/index.tsx
@@ -68,6 +68,9 @@ type GrantClaim = {
   captcha?: string
   hint?: string
   status?: 'wrongPosition' | 'grantGone' | 'generalError' | 'grantAlreadyClaimed' | number | null
+  finishTokenTitle?: string
+  finishTitle?: string
+  finishText?: string
 }
 
 export interface AlertWallet {
@@ -458,10 +461,10 @@ export default class WalletWrapper extends React.PureComponent<Props, State> {
               ? <GrantWrapper
                 isPanel={true}
                 onClose={this.onFinish}
-                title={getLocale('captchaLuckyDay')}
-                text={getLocale('captchaOnTheWay')}
+                title={grant.finishTitle || ''}
+                text={grant.finishText}
               >
-                <GrantComplete isMobile={true} onClose={this.onFinish} amount={tokens} date={date} />
+                <GrantComplete isMobile={true} onClose={this.onFinish} amount={tokens} date={date} tokenTitle={grant.finishTokenTitle} />
               </GrantWrapper>
               : null
           }

diff --git a/stories/assets/locale.ts b/stories/assets/locale.ts
@@ -37,7 +37,6 @@ const locale: Record<string, string> = {
   braveVerified: 'Verified Creators',
   cancel: 'Cancel',
   captchaDrag: 'Drag the BAT Icon on to the',
-  captchaLuckyDay: 'It’s your lucky day!',
   captchaOnTheWay: 'Your token grant is on its way.',
   captchaProveHuman: 'Prove that you are human!',
   captchaTarget: 'target.',
@@ -109,7 +108,6 @@ const locale: Record<string, string> = {
   monthlyText: 'Monthly',
   monthlyTips: 'Monthly Tips!',
   newGrant: 'A free token grant is available.',
-  newTokenGrant: 'New Token Grant',
   noActivity: 'No activities yet…',
   noGrants: 'Currently no token grant is available.',
   notEnoughTokens: 'Not enough tokens. Please',

diff --git a/stories/features/rewards/concepts.tsx b/stories/features/rewards/concepts.tsx
@@ -51,7 +51,10 @@ const defaultGrant = {
   probi: '',
   expiryTime: 0,
   captcha: '',
-  hint: ''
+  hint: '',
+  finishTitle: 'It\'s your lucky day!',
+  finishText: 'Your token grant is on its way.',
+  finishTokenTitle: 'Free Token Grant'
 }
 
 const grantNotification = {
@@ -264,17 +267,20 @@ storiesOf('Feature Components/Rewards/Concepts/Desktop', module)
             {
               tokens: '8.0',
               expireDate: '7/15/2018',
-              type: 'ugp'
+              type: 'ugp',
+              tokenText: 'Free Token Grant'
             },
             {
               tokens: '10.0',
               expireDate: '9/10/2018',
-              type: 'ugp'
+              type: 'ugp',
+              tokenText: 'Free Token Grant'
             },
             {
               tokens: '10.0',
               expireDate: '10/10/2018',
-              type: 'ads'
+              type: 'ads',
+              tokenText: 'Your Brave Ads Token Grant'
             }
           ])}
         >

diff --git a/stories/features/rewards/grant.tsx b/stories/features/rewards/grant.tsx
@@ -62,6 +62,7 @@ storiesOf('Feature Components/Rewards/Grant', module)
           onClose={dummyClick}
           amount={'30.0'}
           date={text('Date', '8/15/2018')}
+          tokenTitle={'Free token grant'}
         />
       </div>
     )

diff --git a/stories/features/rewards/settings/grant.tsx b/stories/features/rewards/settings/grant.tsx
@@ -81,7 +81,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.onComplete} amount={'30.0'} date={'8/15/2018'} />
+            <GrantComplete onClose={this.onComplete} amount={'30.0'} date={'8/15/2018'} tokenTitle={'Free token grant'} />
           </GrantWrapper>
           : null
         }

diff --git a/stories/features/rewards/settingsMobile/grantMobile.tsx b/stories/features/rewards/settingsMobile/grantMobile.tsx
@@ -83,6 +83,7 @@ class GrantMobile extends React.Component<Props, State > {
               onClose={this.onComplete}
               amount={'30.0'}
               date={'8/15/2018'}
+              tokenTitle={'Free token grant'}
             />
           </GrantWrapper>
           : null
-Original file line number
+Diff line change
@@ Expand Up @@
       >
         <div
           className="c2"
-        >
-          MISSING: newTokenGrant
-        </div>
+        />
         <div
           className="c3"
         >
@@ Expand Down @@