Merge pull request #3971 from brave/bp2

BAT Points round 2.1
brave · Nov 14, 2019 · 7a4077f · 7a4077f
1 parent 1831af6
commit 7a4077f
Show file tree

Hide file tree

Showing 36 changed files with 248 additions and 50 deletions.
diff --git a/browser/ui/webui/brave_tip_ui.cc b/browser/ui/webui/brave_tip_ui.cc
@@ -62,6 +62,7 @@ class RewardsTipDOMHandler : public WebUIMessageHandler,
   void OnGetRecurringTips(
       std::unique_ptr<brave_rewards::ContentSiteList> list);
   void TweetTip(const base::ListValue *args);
+  void OnlyAnonWallet(const base::ListValue* args);
   void GetExternalWallet(const base::ListValue* args);
   void OnExternalWallet(
       const int32_t result,
@@ -145,6 +146,11 @@ void RewardsTipDOMHandler::RegisterMessages() {
       base::BindRepeating(
           &RewardsTipDOMHandler::GetExternalWallet,
           base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "brave_rewards_tip.onlyAnonWallet",
+      base::BindRepeating(
+          &RewardsTipDOMHandler::OnlyAnonWallet,
+          base::Unretained(this)));
 }
 
 void RewardsTipDOMHandler::GetPublisherTipData(
@@ -469,3 +475,15 @@ void RewardsTipDOMHandler::OnExternalWallet(
   web_ui()->CallJavascriptFunctionUnsafe(
       "brave_rewards_tip.externalWallet", data);
 }
+
+void RewardsTipDOMHandler::OnlyAnonWallet(const base::ListValue* args) {
+  if (!rewards_service_ || !web_ui()->CanCallJavascript()) {
+    return;
+  }
+
+  const bool allow = rewards_service_->OnlyAnonWallet();
+
+  web_ui()->CallJavascriptFunctionUnsafe(
+      "brave_rewards_tip.onlyAnonWallet",
+      base::Value(allow));
+}
diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -194,8 +194,8 @@ void CustomizeWebUIHTMLSource(const std::string &name,
 
         // Rewards widget
         { "rewardsWidgetAnd", IDS_BRAVE_UI_AND },
+        { "rewardsWidgetBap", IDS_BRAVE_UI_BAP_REWARDS_TEXT },
         { "rewardsWidgetBat", IDS_BRAVE_UI_BAT_REWARDS_TEXT },
-        { "rewardsWidgetBatPoints", IDS_BRAVE_UI_BAT_POINTS_TEXT },
         { "rewardsWidgetBraveRewards", IDS_BRAVE_UI_BRAVE_REWARDS },
         { "rewardsWidgetPrivacyPolicy", IDS_BRAVE_UI_PRIVACY_POLICY },
         { "rewardsWidgetTermsOfService", IDS_BRAVE_UI_TERMS_OF_SERVICE },
@@ -270,6 +270,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "adsTitle",  IDS_BRAVE_REWARDS_LOCAL_ADS_TITLE },
 
         { "bat", IDS_BRAVE_UI_BAT_REWARDS_TEXT },
+        { "bap", IDS_BRAVE_UI_BAP_REWARDS_TEXT },
         { "batPoints", IDS_BRAVE_UI_BAT_POINTS_TEXT },
         { "batPointsMessage", IDS_BRAVE_UI_POINTS_MESSAGE },
         { "contributionTitle",  IDS_BRAVE_REWARDS_LOCAL_CONTR_TITLE },
@@ -425,6 +426,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "grantFinishTitleUGP", IDS_BRAVE_UI_GRANT_FINISH_TITLE_UGP },
         { "grantFinishTokenAds", IDS_BRAVE_UI_GRANT_FINISH_TOKEN_ADS },
         { "grantFinishTokenUGP", IDS_BRAVE_UI_GRANT_FINISH_TOKEN_UGP },
+        { "grantFinishPointUGP", IDS_BRAVE_UI_GRANT_FINISH_POINT_UGP },
         { "grants", IDS_BRAVE_UI_GRANTS },
         { "import", IDS_BRAVE_UI_IMPORT },
         { "includeInAuto", IDS_BRAVE_UI_INCLUDE_IN_AUTO },
@@ -479,6 +481,9 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "pinnedSitesThree", IDS_BRAVE_UI_PAYMENT_PINNED_SITES_THREE },
         { "pinnedSitesFour", IDS_BRAVE_UI_PAYMENT_PINNED_SITES_FOUR },
         { "pleaseNote", IDS_BRAVE_UI_PLEASE_NOTE },
+        { "point", IDS_BRAVE_UI_POINT },
+        { "pointGrantClaimed", IDS_BRAVE_UI_POINT_GRANT_CLAIMED },
+        { "points", IDS_BRAVE_UI_POINTS },
         { "print", IDS_BRAVE_UI_PRINT },
         { "processingRequest", IDS_BRAVE_UI_PROCESSING_REQUEST },
         { "processingRequestButton", IDS_BRAVE_UI_PROCESSING_REQUEST_BUTTON },
@@ -544,7 +549,10 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "titleETH", IDS_BRAVE_UI_TITLE_ETH},
         { "titleLTC", IDS_BRAVE_UI_TITLE_LTC},
         { "tokenGrantClaimed", IDS_BRAVE_UI_TOKEN_GRANT_CLAIMED },
+        { "token", IDS_BRAVE_UI_TOKEN },
         { "tokens", IDS_BRAVE_UI_TOKENS },
+        { "tokenGrants", IDS_BRAVE_UI_TOKEN_GRANTS },
+        { "pointGrants", IDS_BRAVE_UI_POINT_GRANTS },
         { "total", IDS_BRAVE_UI_TOTAL },
         { "transactions", IDS_BRAVE_UI_TRANSACTIONS },
         { "turnOnAds", IDS_BRAVE_UI_TURN_ON_ADS },
@@ -583,6 +591,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "welcomeButtonTextTwo", IDS_BRAVE_UI_WELCOME_BUTTON_TEXT_TWO},
         { "welcomeDescOne", IDS_BRAVE_UI_WELCOME_DESC_ONE},
         { "welcomeDescTwo", IDS_BRAVE_UI_WELCOME_DESC_TWO},
+        { "welcomeDescPoints", IDS_BRAVE_UI_WELCOME_DESC_POINTS },
         { "welcomeFooterTextOne", IDS_BRAVE_UI_WELCOME_FOOTER_TEXT_ONE},
         { "welcomeFooterTextTwo", IDS_BRAVE_UI_WELCOME_FOOTER_TEXT_TWO},
         { "welcomeHeaderOne", IDS_BRAVE_UI_WELCOME_HEADER_ONE},
@@ -696,6 +705,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "addFunds", IDS_BRAVE_UI_ADD_FUNDS },
         { "autoTipText", IDS_BRAVE_UI_AUTO_TIP_TEXT },
         { "bat", IDS_BRAVE_UI_BAT_TEXT },
+        { "bap", IDS_BRAVE_UI_BAP_REWARDS_TEXT },
         { "donationAmount", IDS_BRAVE_UI_DONATION_AMOUNT },
         { "doMonthly", IDS_BRAVE_UI_DO_MONTHLY },
         { "firstTipDateText", IDS_BRAVE_UI_FIRST_TIP_TEXT },
@@ -709,6 +719,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "githubTipTitleEmpty", IDS_BRAVE_UI_GITHUB_TIP_TITLE_EMPTY },
         { "monthlyContribution", IDS_BRAVE_UI_MONTHLY_CONTRIBUTION },
         { "nextContribution", IDS_BRAVE_UI_NEXT_CONTRIBUTION },
+        { "points", IDS_BRAVE_UI_POINTS },
         { "rewardsBannerText1", IDS_BRAVE_UI_REWARDS_BANNER_TEXT1 },
         { "rewardsBannerText2", IDS_BRAVE_UI_REWARDS_BANNER_TEXT2 },
         { "rewardsBannerMonthlyText1", IDS_BRAVE_UI_REWARDS_BANNER_TEXT1 },

diff --git a/components/brave_new_tab_ui/components/default/rewards/index.tsx b/components/brave_new_tab_ui/components/default/rewards/index.tsx
@@ -147,7 +147,7 @@ class Rewards extends React.PureComponent<RewardsProps, {}> {
       ? totalContribution
       : adsEstimatedEarnings.toFixed(1)
     const converted = convertBalance(amount, rates)
-    const batFormatString = onlyAnonWallet ? getLocale('rewardsWidgetBatPoints') : getLocale('rewardsWidgetBat')
+    const batFormatString = onlyAnonWallet ? getLocale('rewardsWidgetBap') : getLocale('rewardsWidgetBat')
 
     return (
       <AmountItem isLast={type === AmountItemType.TIPS}>

diff --git a/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json b/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json
@@ -19,6 +19,10 @@
     "message": "You can now earn tokens for watching privacy-respecting ads.",
     "description": "Entry text for welcome screen in the panel, new user"
   },
+  "welcomeDescPoints": {
+    "message": "You can now earn points for watching privacy-respecting ads.",
+    "description": "Entry text for welcome screen in the panel, points"
+  },
   "welcomeFooterTextOne": {
     "message": "Check out what’s improved",
     "description": "Link in the footer (takes you to rewards settings page) for welcome screen in the panel, existing user"
@@ -144,13 +148,23 @@
     "description": "Month"
   },
   "tokenGrant": {
-    "message": "Token Grants",
-    "description": "Title for grant notification"
+    "message": "$currency$ Grants",
+    "description": "Title for grant notification",
+    "placeholders": {
+      "currency": {
+        "content": "$1",
+        "example": "Token"
+      }
+    }
   },
   "tokenGrantClaimed": {
     "message": "Token Grants Claimed",
     "description": "Title for grant section in wallet summary"
   },
+  "pointGrantClaimed": {
+    "message": "Point Grants Claimed",
+    "description": "Title for point grant section in wallet summary"
+  },
   "earningsAds": {
     "message": "Earnings from Ads",
     "description": "Title for ads section in wallet summary"
@@ -196,12 +210,16 @@
     "description": "Notification title when we display info about auto contribution"
   },
   "contributeNotificationSuccess": {
-    "message": "You've contributed $amount$ BAT",
+    "message": "You've contributed $amount$ $currency$",
     "description": "We show this string in the notification when contribution is successful",
     "placeholders": {
       "amount": {
         "content": "$1",
         "example": "10.0"
+      },
+      "currency": {
+        "content": "$2",
+        "example": "BAT"
       }
     }
   },
@@ -413,6 +431,10 @@
     "message": "BAT",
     "description": "BAT text for displaying converted tip amount."
   },
+  "bap": {
+    "message": "BAP",
+    "description": "BAT Points abbreviation text"
+  },
   "turnOnAds": {
     "message": "Turn on Ads",
     "description": "Prompt to turn on Ads via notification"
@@ -468,13 +490,23 @@
     "description": "Cosmetic text upon captcha success"
   },
   "grantFinishTextUGP": {
-    "message": "Your token grant is on its way.",
-    "description": "Cosmetic text indicating grant funds are on the way"
+    "message": "Your $currency$ grant is on its way.",
+    "description": "Cosmetic text indicating grant funds are on the way",
+    "placeholders": {
+      "currency": {
+        "content": "$1",
+        "example": "token"
+      }
+    }
   },
   "grantFinishTokenTitleUGP": {
     "message": "Free Token Grant",
     "description": "Token title on success screen"
   },
+  "grantFinishPointTitleUGP": {
+    "message": "Free Point Grant",
+    "description": "Point title on success screen"
+  },
   "grantFinishTitleAds": {
     "message": "You've earned an Ads Reward!",
     "description": "Cosmetic text upon captcha success for ads"
@@ -548,5 +580,29 @@
   "set": {
     "message": "Set...",
     "description": "Button text for setting monthly contribution"
+  },
+  "tokens":  {
+    "message": "tokens",
+    "description": "Standard tokens text"
+  },
+  "point":  {
+    "message": "Point",
+    "description": "BAT Point text"
+  },
+  "token":  {
+    "message": "Token",
+    "description": "BAT Token text"
+  },
+  "points":  {
+    "message": "points",
+    "description": "BAT Points text"
+  },
+  "tokenGrants":  {
+    "message": "Token Grants",
+    "description": "BAT Tokens Grant Text"
+  },
+  "pointGrants":  {
+    "message": "Point Grants",
+    "description": "BAT Points Grant Text"
   }
 }
diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts b/components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts
@@ -28,6 +28,7 @@ export const getUIMessages = (): Record<string, string> => {
     'backupWalletNotification',
     'backupWalletTitle',
     'bat',
+    'bap',
     'batPoints',
     'batPointsMessage',
     'braveAdsLaunchTitle',
@@ -83,6 +84,9 @@ export const getUIMessages = (): Record<string, string> => {
     'on',
     'oneTimeDonation',
     'pendingContributionTitle',
+    'point',
+    'pointGrantClaimed',
+    'points',
     'privacyPolicy',
     'recurringDonations',
     'reservedAmountText',
@@ -97,6 +101,10 @@ export const getUIMessages = (): Record<string, string> => {
     'tipsProcessedNotification',
     'tokenGrant',
     'tokenGrantClaimed',
+    'token',
+    'tokens',
+    'tokenGrants',
+    'pointGrants',
     'unVerifiedCheck',
     'turnOnAds',
     'unVerifiedPublisher',
@@ -108,6 +116,7 @@ export const getUIMessages = (): Record<string, string> => {
     'welcomeButtonTextTwo',
     'welcomeDescOne',
     'welcomeDescTwo',
+    'welcomeDescPoints',
     'walletFailedButton',
     'walletFailedTitle',
     'welcomeBack',

diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/app.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/app.tsx
@@ -286,6 +286,7 @@ export class RewardsPanel extends React.Component<Props, State> {
           optInErrorAction={this.onCreate}
           moreLink={this.openRewards}
           onTOSClick={this.openTOS}
+          onlyAnonWallet={this.state.onlyAnonWallet}
           onPrivacyClick={this.openPrivacyPolicy}
         />
       )

diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx
@@ -303,6 +303,7 @@ export class Panel extends React.Component<Props, State> {
 
   getNotification = () => {
     const { notifications, currentNotification } = this.props.rewardsPanelData
+    const { onlyAnonWallet } = this.props
 
     if (
       currentNotification === undefined ||
@@ -335,8 +336,9 @@ export class Panel extends React.Component<Props, State> {
         // 16 - error while tipping
 
         if (result === '0') {
+          const currency = onlyAnonWallet ? getMessage('bap') : getMessage('bat')
           const fixed = utils.convertProbiToFixed(notification.args[3])
-          text = getMessage('contributeNotificationSuccess', [fixed])
+          text = getMessage('contributeNotificationSuccess', [fixed, currency])
         } else if (result === '15') {
           text = getMessage('contributeNotificationNotEnoughFunds')
           isAlert = 'warning'
@@ -624,6 +626,7 @@ export class Panel extends React.Component<Props, State> {
     const tipAmounts = defaultContribution !== '0.0'
       ? this.generateAmounts(publisher)
       : undefined
+    const { onlyAnonWallet } = this.props
 
     if (notification &&
         notification.notification &&
@@ -642,7 +645,7 @@ export class Panel extends React.Component<Props, State> {
       }
     }
 
-    currentGrant = utils.getGrant(currentGrant)
+    currentGrant = utils.getGrant(currentGrant, this.props.onlyAnonWallet)
 
     let walletStatus: WalletState | undefined = undefined
     let onVerifyClick = undefined
@@ -704,6 +707,7 @@ export class Panel extends React.Component<Props, State> {
               refreshingPublisher={this.state.refreshingPublisher}
               publisherRefreshed={this.state.publisherRefreshed}
               setMonthlyAction={this.showTipSiteDetail.bind(this, true)}
+              onlyAnonWallet={onlyAnonWallet}
             />
             : null
           }

diff --git a/components/brave_rewards/resources/extension/brave_rewards/utils.ts b/components/brave_rewards/resources/extension/brave_rewards/utils.ts
@@ -49,14 +49,17 @@ export const getGrants = (grants?: RewardsExtension.Grant[]) => {
   })
 }
 
-export const getGrant = (grant?: RewardsExtension.GrantInfo) => {
+export const getGrant = (grant?: RewardsExtension.GrantInfo, onlyAnonWallet?: boolean) => {
   if (!grant) {
     return grant
   }
 
+  const tokenString = onlyAnonWallet ? getMessage('point') : getMessage('token')
   grant.finishTitle = getMessage('grantFinishTitleUGP')
-  grant.finishText = getMessage('grantFinishTextUGP')
-  grant.finishTokenTitle = getMessage('grantFinishTokenTitleUGP')
+  grant.finishText = getMessage('grantFinishTextUGP', [tokenString])
+  grant.finishTokenTitle = onlyAnonWallet
+    ? getMessage('grantFinishPointTitleUGP')
+    : getMessage('grantFinishTokenTitleUGP')
 
   if (grant.type === 'ads') {
     grant.expiryTime = 0

diff --git a/components/brave_rewards/resources/page/components/adsBox.tsx b/components/brave_rewards/resources/page/components/adsBox.tsx
@@ -263,8 +263,10 @@ class AdsBox extends React.Component<Props, State> {
       adsHistory,
       enabledMain,
       firstLoad,
-      balance
+      balance,
+      ui
     } = this.props.rewardsData
+    const { onlyAnonWallet } = ui
 
     if (adsData) {
       adsEnabled = adsData.adsEnabled
@@ -283,13 +285,14 @@ class AdsBox extends React.Component<Props, State> {
     const historyEntries = adsHistory || []
     const rows = this.getAdHistoryData(historyEntries, savedOnly)
     const notEmpty = rows && rows.length !== 0
+    const tokenString = getLocale(onlyAnonWallet ? 'points' : 'tokens')
 
     return (
       <>
         <Box
           title={getLocale('adsTitle')}
           type={'ads'}
-          description={getLocale('adsDesc')}
+          description={getLocale('adsDesc', { currency: tokenString })}
           toggle={toggle}
           checked={enabled}
           settingsChild={this.adsSettings(enabled && enabledMain)}
@@ -302,6 +305,7 @@ class AdsBox extends React.Component<Props, State> {
         >
           <List title={getLocale('adsCurrentEarnings')}>
             <Tokens
+              onlyAnonWallet={onlyAnonWallet}
               value={estimatedPendingRewards}
               converted={utils.convertBalance(estimatedPendingRewards, balance.rates)}
             />