Merge pull request #15029 from brave/maxk-update-ac-exclude-text

Rewards AC exclusions text changes.
brave · Sep 8, 2022 · 890e984 · 890e984
2 parents 45951ab + 262a903
commit 890e984
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.storybook/locale.ts b/.storybook/locale.ts
@@ -177,8 +177,8 @@ let locale: Record<string, string> = {
   reservedAmountText: 'You’ve designated {{reservedAmount}} BAT for creators who haven’t yet signed up to receive contributions. We’ll keep trying to contribute until they verify, or until 90 days have passed.',
   reservedMoreLink: 'Learn more.',
   restore: 'Restore',
-  restoreAll: 'Restore All',
-  restoreSite: 'Restore this site',
+  clearExcludeList: 'Clear exclude list',
+  removeFromExcluded: 'Remove from excluded',
   reviewSitesMsg: 'Your pinned sites have been moved to',
   rewardsBackupNoticeText1: 'The funds in your Brave wallet are virtual and not required to backup. It\'s available for you to spend exclusively on this browser.',
   rewardsBackupNoticeText2: 'If you\'d like to secure all of your funds in the case of clean installing the browser or switching to a new device, and have other benefits such as adding, withdrawing and transferring funds, we recommend',

diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -687,7 +687,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "reservedAllLink", IDS_BRAVE_UI_RESERVED_ALL_LINK },
         { "reset", IDS_BRAVE_UI_RESET },
         { "restore", IDS_BRAVE_UI_RESTORE },
-        { "restoreAll", IDS_BRAVE_UI_RESTORE_ALL },
+        { "clearExcludeList", IDS_BRAVE_UI_CLEAR_EXCLUDE_LIST },
         { "reviewSitesMsg", IDS_BRAVE_UI_REVIEW_SITE_MSG },
         { "rewardsAdGrantAmount", IDS_REWARDS_WIDGET_AD_GRANT_AMOUNT },
         { "rewardsAdGrantTitle", IDS_REWARDS_WIDGET_AD_GRANT_TITLE },
@@ -736,7 +736,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "yourWallet", IDS_BRAVE_UI_YOUR_WALLET },
 
         { "excludedSites", IDS_BRAVE_UI_EXCLUDED_SITES_TEXT },
-        { "restoreSite", IDS_BRAVE_UI_RESTORE_SITE },
+        { "removeFromExcluded", IDS_BRAVE_UI_REMOVE_FROM_EXCLUDED },
         { "rewardsExcludedText1", IDS_BRAVE_UI_REWARDS_EXCLUDED_TEXT_1 },
         { "rewardsExcludedText2", IDS_BRAVE_UI_REWARDS_EXCLUDED_TEXT_2 },
         { "showAll", IDS_BRAVE_UI_SHOW_ALL },

diff --git a/components/brave_rewards/resources/ui/components/restoreSites/index.tsx b/components/brave_rewards/resources/ui/components/restoreSites/index.tsx
@@ -18,7 +18,7 @@ export interface Props {
 
 export default class RestoreSites extends React.PureComponent<Props, {}> {
   getRestoreText () {
-    return `(${getLocale('restoreAll')})`
+    return `(${getLocale('clearExcludeList')})`
   }
 
   getExclusionText (numSites: number) {

diff --git a/components/brave_rewards/resources/ui/components/tableContribute/index.tsx b/components/brave_rewards/resources/ui/components/tableContribute/index.tsx
@@ -137,12 +137,12 @@ export default class TableContribute extends React.PureComponent<Props, {}> {
 
       if (this.props.showRemove) {
         const actionTooltip = isExcluded
-          ? getLocale('restoreSite')
+          ? getLocale('removeFromExcluded')
           : getLocale('excludeSite')
 
         cell.content.push({
           content: (
-            <Tooltip content={actionTooltip}>
+            <Tooltip rightEdge={true} content={actionTooltip}>
               <StyledRemove onClick={row.onRemove}>
                 {
                   isExcluded

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -805,7 +805,7 @@
       <message name="IDS_BRAVE_UI_RESERVED_MORE_LINK" desc="Text for the link that explains more about reserved amount">Learn more.</message>
       <message name="IDS_BRAVE_UI_RESET" desc="">Reset</message>
       <message name="IDS_BRAVE_UI_RESTORE" desc="">Restore</message>
-      <message name="IDS_BRAVE_UI_RESTORE_ALL" desc="">Restore All</message>
+      <message name="IDS_BRAVE_UI_CLEAR_EXCLUDE_LIST" desc="">Clear exclude list</message>
       <message name="IDS_BRAVE_UI_REVIEW_SITE_MSG" desc="">Your pinned sites have been moved to</message>
       <message name="IDS_BRAVE_UI_REWARDS_BACKUP_NOTICE_TEXT1" desc="">If your Brave Rewards is not verified, your BAT balance is stored in local files on your device.</message>
       <message name="IDS_BRAVE_UI_REWARDS_BACKUP_NOTICE_TEXT2" desc="">If you'd like to secure your BAT in case you need to do a clean reinstall of the browser or reformat your device, and would like to enjoy other benefits such as adding or withdrawing your BAT, we recommend <ph name="LINK_BEGIN">$1</ph>verifying<ph name="LINK_END">$2</ph>.</message>
@@ -859,7 +859,7 @@
       <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="">Sites Excluded</message>
-      <message name="IDS_BRAVE_UI_RESTORE_SITE" desc="">Restore this site</message>
+      <message name="IDS_BRAVE_UI_REMOVE_FROM_EXCLUDED" desc="">Remove from excluded</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>