Pass tweet metadata to SiteBanner

brave · Apr 26, 2019 · 70dae55 · 70dae55
1 parent 076936a
commit 70dae55
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/components/brave_rewards/resources/donate/components/app.tsx b/components/brave_rewards/resources/donate/components/app.tsx
@@ -12,6 +12,7 @@ import DonateToTwitterUser from './donateToTwitterUser'
 
 // Utils
 import * as rewardsActions from '../actions/donate_actions'
+import { isTwitterAccount } from '../utils'
 
 interface DonationDialogArgs {
  publisherKey: string
@@ -28,10 +29,6 @@ export class App extends React.Component<Props, {}> {
  return this.props.actions
  }
 
- isTwitterAccount = (publisherKey: string) => {
- return /^twitter#channel:[0-9]+$/.test(publisherKey)
- }
-
  render () {
  const { publishers } = this.props.rewardsDonateData
 
@@ -47,7 +44,7 @@ export class App extends React.Component<Props, {}> {
  }
 
  let donation
- if (this.isTwitterAccount(publisherKey)) {
+ if (isTwitterAccount(publisherKey)) {
  const tweetMetaData = this.props.dialogArgs.tweetMetaData
  if (tweetMetaData) {
  donation = (

diff --git a/components/brave_rewards/resources/donate/components/donateToTwitterUser.tsx b/components/brave_rewards/resources/donate/components/donateToTwitterUser.tsx
@@ -34,6 +34,9 @@ class DonateToTwitterUser extends React.Component<Props, {}> {
  const { finished, error } = this.props.rewardsDonateData
 
  const publisher = this.props.publisher
+ const tweetMetaData = this.props.tweetMetaData
+ publisher.title = getLocale('tweetTipTitle', { user: tweetMetaData.screenName })
+ publisher.description = tweetMetaData.tweetText
 
  return (
  <>

diff --git a/components/brave_rewards/resources/donate/components/siteBanner.tsx b/components/brave_rewards/resources/donate/components/siteBanner.tsx
@@ -160,7 +160,13 @@ class Banner extends React.Component<Props, State> {
  learnMoreNotice={'https://brave.com/faq-rewards/#unclaimed-funds'}
  addFundsLink={this.addFundsLink}
  >
- {publisher.description}
+ {
+ utils.isTwitterAccount(publisher.publisherKey)
+ ? <div style={{ border: '1px solid #d3d3d3', borderRadius: '5px', margin: '20px 0 0 0', padding: '20px' }}>
+ {publisher.description}
+ </div>
+ : publisher.description
+ }
  </SiteBanner>
  )
  }

diff --git a/components/brave_rewards/resources/donate/utils.ts b/components/brave_rewards/resources/donate/utils.ts
@@ -32,3 +32,7 @@ export const convertProbiToFixed = (probi: string, places: number = 1) => {
 
  return result
 }
+
+export const isTwitterAccount = (publisherKey: string) => {
+ return /^twitter#channel:[0-9]+$/.test(publisherKey)
+}