AC verified change

Resolves brave/brave-browser#6228
brave · Oct 3, 2019 · 006b76e · 006b76e
1 parent 16b7cba
commit 006b76e
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 177 deletions.
diff --git a/.storybook/locale.ts b/.storybook/locale.ts
@@ -91,7 +91,7 @@ const locale: Record<string, string> = {
   enableRewards: 'Enable Brave Rewards',
   enableTips: 'Enable Tips',
   excludeSite: 'Exclude this site',
-  excludedSites: 'Excluded Sites',
+  excludedSites: 'Sites Excluded',
   excludedSitesText: 'Sites excluded from Auto-Contributions:',
   expiresOn: 'expires on',
   firstTipDateText: 'Your first monthly tip will be sent on:',
@@ -185,7 +185,6 @@ const locale: Record<string, string> = {
   rewardsContribute: 'Auto-Contribute',
   rewardsContributeAttention: 'Attention',
   rewardsContributeAttentionScore: 'Attention',
-  rewardsContributeText1: 'You’re currently supporting',
   rewardsExcludedText1: 'You\'ve excluded',
   rewardsExcludedText2: 'sites from Auto-Contribute.',
   rewardsOffText1: 'Do you know that you’ve been paying for the web content with your data for the digital ads? You didn’t have a voice in it and worse, you’re exposed to privacy and security risks.',
@@ -233,7 +232,7 @@ const locale: Record<string, string> = {
   siteBannerConnectedText: 'This creator has not yet signed up to receive contributions from Brave users. Your browser will keep trying to contribute until they verify, or until 90 days have passed.',
   sites: 'sites',
   tellOthers: 'Tell others about your tip.',
-  supportedSites: 'Supported Sites',
+  supportedSites: 'Sites viewed',
   thankYou: 'Thank You!',
   termsOfService: 'Terms of Service',
   optOutTooltip: 'You will no longer receive\nads from this category',

diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -254,14 +254,15 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "contributionMinTime",  IDS_BRAVE_REWARDS_LOCAL_CONTR_MIN_TIME },
         { "contributionMinVisits",  IDS_BRAVE_REWARDS_LOCAL_CONTR_MIN_VISITS },
         { "contributionAllowed",  IDS_BRAVE_REWARDS_LOCAL_CONTR_ALLOWED },
-        { "contributionNonVerified",  IDS_BRAVE_REWARDS_LOCAL_CONTR_ALLOW_NON_VERIFIED },        // NOLINT
+        { "contributionShowNonVerified",  IDS_BRAVE_REWARDS_LOCAL_CONTR_SHOW_NON_VERIFIED },        // NOLINT
         { "contributionVideos",  IDS_BRAVE_REWARDS_LOCAL_CONTR_ALLOW_VIDEOS },
         { "contributionVisit1",  IDS_BRAVE_REWARDS_LOCAL_CONTR_VISIT_1 },
         { "contributionVisit5",  IDS_BRAVE_REWARDS_LOCAL_CONTR_VISIT_5 },
         { "contributionVisit10",  IDS_BRAVE_REWARDS_LOCAL_CONTR_VISIT_10 },
         { "contributionTime5",  IDS_BRAVE_REWARDS_LOCAL_CONTR_TIME_5 },
         { "contributionTime8",  IDS_BRAVE_REWARDS_LOCAL_CONTR_TIME_8 },
         { "contributionTime60",  IDS_BRAVE_REWARDS_LOCAL_CONTR_TIME_60 },
+        { "contributionUpTo",  IDS_BRAVE_REWARDS_LOCAL_CONTR_UP_TO },
 
         { "deviceOffline", IDS_BRAVE_REWARDS_LOCAL_DEVICE_OFFLINE },
         { "donationTitle",  IDS_BRAVE_REWARDS_LOCAL_DONAT_TITLE },
@@ -465,7 +466,6 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "rewardsContribute", IDS_BRAVE_UI_REWARDS_CONTRIBUTE },
         { "rewardsContributeAttention", IDS_BRAVE_UI_REWARDS_CONTRIBUTE_ATTENTION },             // NOLINT
         { "rewardsContributeAttentionScore", IDS_BRAVE_UI_REWARDS_CONTRIBUTE_ATTENTION_SCORE },  // NOLINT
-        { "rewardsContributeText1", IDS_BRAVE_UI_REWARDS_CONTRIBUTE_TEXT1 },
         { "rewardsOffText2", IDS_BRAVE_UI_REWARDS_OFF_TEXT2 },
         { "rewardsOffText3", IDS_BRAVE_UI_REWARDS_OFF_TEXT3 },
         { "rewardsOffText4", IDS_BRAVE_UI_REWARDS_OFF_TEXT4 },

diff --git a/components/brave_rewards/resources/page/components/contributeBox.tsx b/components/brave_rewards/resources/page/components/contributeBox.tsx
@@ -205,7 +205,7 @@ class ContributeBox extends React.Component<Props, State> {
               multiple={true}
               onChange={this.onCheckSettingChange}
             >
-              <div data-key='contributionNonVerified'>{getLocale('contributionNonVerified')}</div>
+              <div data-key='contributionNonVerified'>{getLocale('contributionShowNonVerified')}</div>
               <div data-key='contributionVideos'>{getLocale('contributionVideos')}</div>
             </Checkbox>
           </ControlWrapper>
@@ -270,15 +270,15 @@ class ContributeBox extends React.Component<Props, State> {
             floating={true}
             onChange={this.onSelectSettingChange.bind(this, 'contributionMonthly')}
             value={parseFloat((contributionMonthly.toString() || '0')).toFixed(1)}
+            showAllContents={true}
           >
             {
               monthlyList.map((choice: MonthlyChoice) => {
-                return <div key={`choice-${choice.tokens}`} data-value={choice.tokens.toString()}>
-                  <Tokens
-                    value={choice.tokens}
-                    converted={choice.converted}
-                  />
-                </div>
+                return (
+                  <div key={`choice-${choice.tokens}`} data-value={choice.tokens.toString()}>
+                    {getLocale('contributionUpTo')} <Tokens value={choice.tokens} converted={choice.converted} />
+                  </div>
+                )
               })
             }
           </Select>
@@ -289,10 +289,7 @@ class ContributeBox extends React.Component<Props, State> {
           </NextContribution>
         </List>
         <List title={getLocale('contributionSites')}>
-          {getLocale('total')} &nbsp;<Tokens
-            value={numRows.toString()}
-            hideText={true}
-          />
+          <Tokens value={numRows.toString()} hideText={true} />
         </List>
         <TableContribute
           header={[

diff --git a/components/brave_rewards/resources/ui/components/modalContribute/index.tsx b/components/brave_rewards/resources/ui/components/modalContribute/index.tsx
@@ -51,9 +51,6 @@ export default class ModalContribute extends React.PureComponent<Props, {}> {
 
     return (
       <>
-        <StyledContent>
-          {getLocale('rewardsContributeText1')} <StyledNum>{numSites}</StyledNum> {getLocale('sites')}.
-        </StyledContent>
         <TableContribute
           header={this.headers}
           rows={rows}

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -211,7 +211,7 @@
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_TITLE" desc="">Ads</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_DESC" desc="">Earn tokens by viewing ads in Brave. Ads presented are based on your interests, as inferred from your browsing behavior. No personal data or browsing history ever leaves your browser.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_TITLE" desc="">Auto-Contribute</message>
-      <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_DESC" desc="">An automatic way to support publishers and content creators. Set a monthly payment and browse normally. The sites you visit receive your contributions automatically, based on your attention as measured by Brave.</message>
+      <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_DESC" desc="">An automatic way to support publishers and content creators. Set a monthly payment and browse normally. The Brave Verified sites you visit will receive your contributions automatically, based on your attention as measured by Brave.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_CURRENT_EARNINGS" desc="">Estimated pending rewards</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_PAYMENT_DATE" desc="">Next payment date</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_NOTIFICATIONS_RECEIVED" desc="">Ad notifications received this month</message>
@@ -248,14 +248,15 @@
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_MIN_TIME" desc="">Minimum page time before logging a visit</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_MIN_VISITS" desc="">Minimum visits for publisher relevancy</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_ALLOWED" desc="">What should be allowed?</message>
-      <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_ALLOW_NON_VERIFIED" desc="">Allow contribution to non-verified sites</message>
+      <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_SHOW_NON_VERIFIED" desc="">Only show verified sites in Auto-Contribute list</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_ALLOW_VIDEOS" desc="">Allow contribution to videos</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_VISIT_1" desc="">1 visit</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_VISIT_5" desc="">5 visits</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_VISIT_10" desc="">10 visits</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_TIME_5" desc="">5 seconds</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_TIME_8" desc="">8 seconds</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_TIME_60" desc="">1 minute</message>
+      <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_UP_TO" desc="">Up to</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_ABILITY" desc="">Enable content-level tips on these sites</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_ABILITY_YT" desc="">YouTube</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_ABILITY_REDT" desc="">Reddit</message>
@@ -480,7 +481,6 @@
       <message name="IDS_BRAVE_UI_REWARDS_CONTRIBUTE" desc="">Auto-Contribute</message>
       <message name="IDS_BRAVE_UI_REWARDS_CONTRIBUTE_ATTENTION" desc="">Attention</message>
       <message name="IDS_BRAVE_UI_REWARDS_CONTRIBUTE_ATTENTION_SCORE" desc="">Attention</message>
-      <message name="IDS_BRAVE_UI_REWARDS_CONTRIBUTE_TEXT1" desc="">You’re currently supporting</message>
       <message name="IDS_BRAVE_UI_REWARDS_OFF_TEXT2" desc="">without your consent.</message>
       <message name="IDS_BRAVE_UI_REWARDS_OFF_TEXT3" desc="">Today, Brave welcomes you to the new internet.</message>
       <message name="IDS_BRAVE_UI_REWARDS_OFF_TEXT4" desc="">One where your time is valued, your personal data is kept private, and you actually get paid for your attention.</message>
@@ -567,12 +567,12 @@
       <message name="IDS_BRAVE_UI_PENDING_CONTRIBUTION_EMPTY" desc="Text for empty pending table">No pending contributions…</message>
       <message name="IDS_BRAVE_UI_PENDING_CONTRIBUTION_REMOVE_ALL" desc="Text for remove all button">Remove All</message>
 
-      <message name="IDS_BRAVE_UI_EXCLUDED_SITES_TEXT" desc="">Excluded Sites</message>
+      <message name="IDS_BRAVE_UI_EXCLUDED_SITES_TEXT" desc="">Sites Excluded</message>
       <message name="IDS_BRAVE_UI_RESTORE_SITE" desc="">Restore this site</message>
       <message name="IDS_BRAVE_UI_REWARDS_EXCLUDED_TEXT_1" desc="">You've excluded</message>
       <message name="IDS_BRAVE_UI_REWARDS_EXCLUDED_TEXT_2" desc="">sites from Auto-Contribute.</message>
       <message name="IDS_BRAVE_UI_SHOW_ALL" desc="">Show All</message>
-      <message name="IDS_BRAVE_UI_SUPPORTED_SITES" desc="">Supported Sites</message>
+      <message name="IDS_BRAVE_UI_SUPPORTED_SITES" desc="">Sites viewed</message>
 
       <message name="IDS_BRAVE_UI_GRANT_FINISH_TITLE_ADS" desc="Title on final grant screen for Ads">Brave Ads Rewards!</message>
       <message name="IDS_BRAVE_UI_GRANT_FINISH_TEXT_ADS" desc="Text on final grant screen for UGP">Your rewards grant from Brave Ads is on its way.</message>