From 8879e5086387260b748b5596edbd004e035b265e Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Wed, 12 Jun 2019 11:29:22 +0200 Subject: [PATCH] Adds token text to grant final screen --- .../grantComplete/__snapshots__/spec.tsx.snap | 4 +--- src/features/rewards/grantComplete/index.tsx | 7 ++++--- src/features/rewards/walletWrapper/index.tsx | 9 ++++++--- stories/assets/locale.ts | 2 -- stories/features/rewards/concepts.tsx | 14 ++++++++++---- stories/features/rewards/grant.tsx | 1 + stories/features/rewards/settings/grant.tsx | 2 +- .../rewards/settingsMobile/grantMobile.tsx | 1 + 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/features/rewards/grantComplete/__snapshots__/spec.tsx.snap b/src/features/rewards/grantComplete/__snapshots__/spec.tsx.snap index 73dd29c77..553b8b993 100644 --- 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`] = ` >
- MISSING: newTokenGrant -
+ />
diff --git a/src/features/rewards/grantComplete/index.tsx b/src/features/rewards/grantComplete/index.tsx index e20a6223b..89bffa0c2 100644 --- 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 { render () { - const { id, testId, onClose, amount, date, isMobile } = this.props + const { id, testId, onClose, amount, date, isMobile, tokenTitle } = this.props return ( - {getLocale('newTokenGrant')} + {tokenTitle} {amount} BAT { date && date.length > 0 diff --git a/src/features/rewards/walletWrapper/index.tsx b/src/features/rewards/walletWrapper/index.tsx index 7ea67cf52..7b44adedc 100644 --- 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 { ? - + : null } diff --git a/stories/assets/locale.ts b/stories/assets/locale.ts index a4baefddb..a62aafd28 100644 --- a/stories/assets/locale.ts +++ b/stories/assets/locale.ts @@ -37,7 +37,6 @@ const locale: Record = { 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 = { 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 index 0e8db0a92..6c7a350c6 100644 --- 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 index d324baac0..e4fa39774 100644 --- 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'} />
) diff --git a/stories/features/rewards/settings/grant.tsx b/stories/features/rewards/settings/grant.tsx index 3e69dd751..d8dfd3985 100644 --- a/stories/features/rewards/settings/grant.tsx +++ b/stories/features/rewards/settings/grant.tsx @@ -81,7 +81,7 @@ class Grant extends React.Component { title={'It’s your lucky day!'} text={'Your token grant is on its way.'} > - + : null } diff --git a/stories/features/rewards/settingsMobile/grantMobile.tsx b/stories/features/rewards/settingsMobile/grantMobile.tsx index 3c4c933d0..a7bdf3450 100644 --- a/stories/features/rewards/settingsMobile/grantMobile.tsx +++ b/stories/features/rewards/settingsMobile/grantMobile.tsx @@ -83,6 +83,7 @@ class GrantMobile extends React.Component { onClose={this.onComplete} amount={'30.0'} date={'8/15/2018'} + tokenTitle={'Free token grant'} /> : null