AC verified change

Resolves brave/brave-browser#6228

.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',

browser/ui/webui/brave_webui_source.cc

@@ -255,14 +255,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 },
@@ -474,7 +475,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 },

components/brave_rewards/browser/rewards_service_browsertest.cc

@@ -2041,7 +2041,7 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
- InsufficientNotificationForVerifiedsZeroAmountZeroPublishers) {
+ InsufficientNotificationForZeroAmountZeroPublishers) {
  rewards_service_->GetNotificationService()->AddObserver(this);
  EnableRewards();
  CheckInsufficientFundsForTesting();
@@ -2051,7 +2051,9 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
 
  if (notifications.empty()) {
  SUCCEED();
+ return;
  }
+
  bool notification_shown = false;
  for (const auto& notification : notifications) {
  if (notification.second.type_ ==
@@ -2068,13 +2070,10 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
- InsufficientNotificationForVerifiedsDefaultAmount) {
+ InsufficientNotificationForACNotEnoughFunds) {
  rewards_service_->AddObserver(this);
  rewards_service_->GetNotificationService()->AddObserver(this);
  EnableRewards();
- // Claim grant using panel
- const bool use_panel = true;
- ClaimGrant(use_panel);
 
  // Visit publishers
  const bool verified = true;
@@ -2091,7 +2090,9 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
 
  if (notifications.empty()) {
  SUCCEED();
+ return;
  }
+
  bool notification_shown = false;
  for (const auto& notification : notifications) {
  if (notification.second.type_ ==
@@ -2108,32 +2109,31 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
- InsufficientNotificationForVerifiedsSufficientAmount) {
+ InsufficientNotificationForInsufficientAmount) {
  rewards_service_->AddObserver(this);
  rewards_service_->GetNotificationService()->AddObserver(this);
-
  EnableRewards();
  // Claim grant using panel
  const bool use_panel = true;
  ClaimGrant(use_panel);
 
- // Visit publishers
  const bool verified = true;
- while (!last_publisher_added_) {
- VisitPublisher("duckduckgo.com", verified);
- VisitPublisher("bumpsmack.com", verified);
- VisitPublisher("brave.com", !verified, true);
- }
+ VisitPublisher("duckduckgo.com", verified);
+ rewards_service_->OnTip("duckduckgo.com", 20, true);
 
- rewards_service_->SetContributionAmount(40.0);
+ VisitPublisher("brave.com", !verified);
+ rewards_service_->OnTip("brave.com", 50, true);
 
  CheckInsufficientFundsForTesting();
  WaitForInsufficientFundsNotification();
  const brave_rewards::RewardsNotificationService::RewardsNotificationsMap&
  notifications = rewards_service_->GetAllNotifications();
+
  if (notifications.empty()) {
  SUCCEED();
+ return;
  }
+
  bool notification_shown = false;
  for (const auto& notification : notifications) {
  if (notification.second.type_ ==
@@ -2150,31 +2150,31 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
- InsufficientNotificationForVerifiedsInsufficientAmount) {
+ InsufficientNotificationForVerifiedInsufficientAmount) {
  rewards_service_->AddObserver(this);
  rewards_service_->GetNotificationService()->AddObserver(this);
  EnableRewards();
  // Claim grant using panel
  const bool use_panel = true;
  ClaimGrant(use_panel);
 
- // Visit publishers
  const bool verified = true;
- while (!last_publisher_added_) {
- VisitPublisher("duckduckgo.com", verified);
- VisitPublisher("bumpsmack.com", verified);
- VisitPublisher("brave.com", !verified, true);
- }
- rewards_service_->SetContributionAmount(100.0);
+ VisitPublisher("duckduckgo.com", verified);
+ rewards_service_->OnTip("duckduckgo.com", 50, true);
+
+ VisitPublisher("brave.com", !verified);
+ rewards_service_->OnTip("brave.com", 50, true);
 
- rewards_service_->CheckInsufficientFundsForTesting();
+ CheckInsufficientFundsForTesting();
  WaitForInsufficientFundsNotification();
  const brave_rewards::RewardsNotificationService::RewardsNotificationsMap&
  notifications = rewards_service_->GetAllNotifications();
 
  if (notifications.empty()) {
  FAIL() << "Should see Insufficient Funds notification";
+ return;
  }
+
  bool notification_shown = false;
  for (const auto& notification : notifications) {
  if (notification.second.type_ ==
@@ -2186,7 +2186,6 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
  }
  EXPECT_TRUE(notification_shown);
 
-
  // Stop observing the Rewards service
  rewards_service_->RemoveObserver(this);
 }
@@ -2540,3 +2539,65 @@ IN_PROC_BROWSER_TEST_F(
  // Stop observing the Rewards service
  rewards_service_->RemoveObserver(this);
 }
+
+IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
+ RecurringAndPartialAutoContribution) {
+ // Observe the Rewards service
+ rewards_service_->AddObserver(this);
+
+ // Enable Rewards
+ EnableRewards();
+
+ // Claim grant using panel (30 BAT)
+ const bool use_panel = true;
+ ClaimGrant(use_panel);
+
+ // Visit verified publisher
+ const bool verified = true;
+ VisitPublisher("duckduckgo.com", verified);
+ VisitPublisher("brave.com", !verified);
+
+ // Tip publisher
+ rewards_service_->OnTip("duckduckgo.com", 25, true);
+
+ // Trigger contribution process
+ rewards_service()->StartMonthlyContributionForTest();
+
+ // Wait for reconciliation to complete
+ WaitForTipReconcileCompleted();
+ ASSERT_EQ(tip_reconcile_status_, ledger::Result::LEDGER_OK);
+
+ // Wait for reconciliation to complete successfully
+ WaitForACReconcileCompleted();
+ ASSERT_EQ(ac_reconcile_status_, ledger::Result::LEDGER_OK);
+
+ // Make sure that balance is updated correctly
+ {
+ content::EvalJsResult js_result = EvalJs(
+ contents(),
+ "const delay = t => new Promise(resolve => setTimeout(resolve, t));"
+ "delay(1000).then(() => "
+ " "
+ "document.querySelector(\"[data-test-id='balance']\").innerText);",
+ content::EXECUTE_SCRIPT_DEFAULT_OPTIONS,
+ content::ISOLATED_WORLD_ID_CONTENT_END);
+ EXPECT_NE(js_result.ExtractString().find(GetBalance() + " BAT"),
+ std::string::npos);
+ }
+
+ // Check that summary table shows the appropriate contribution
+ {
+ content::EvalJsResult js_result = EvalJs(
+ contents(),
+ "const delay = t => new Promise(resolve => setTimeout(resolve, t));"
+ "delay(0).then(() => "
+ " document.querySelector(\"[color='contribute']\").innerText);",
+ content::EXECUTE_SCRIPT_DEFAULT_OPTIONS,
+ content::ISOLATED_WORLD_ID_CONTENT_END);
+ EXPECT_NE(js_result.ExtractString().find("-5.0BAT"),
+ std::string::npos);
+ }
+
+ // Stop observing the Rewards service
+ rewards_service_->RemoveObserver(this);
+}

components/brave_rewards/browser/rewards_service_impl.cc

@@ -2770,7 +2770,18 @@ void RewardsServiceImpl::MaybeShowNotificationAddFunds() {
 
 void RewardsServiceImpl::MaybeShowNotificationAddFundsForTesting(
  base::OnceCallback<void(bool)> callback) {
- bat_ledger_->HasSufficientBalanceToReconcile(std::move(callback));
+ bat_ledger_->HasSufficientBalanceToReconcile(
+ base::BindOnce(
+ &RewardsServiceImpl::OnMaybeShowNotificationAddFundsForTesting,
+ AsWeakPtr(),
+ std::move(callback)));
+}
+
+void RewardsServiceImpl::OnMaybeShowNotificationAddFundsForTesting(
+ base::OnceCallback<void(bool)> callback,
+ const bool sufficient) {
+ ShowNotificationAddFunds(sufficient);
+ std::move(callback).Run(sufficient);
 }
 
 bool RewardsServiceImpl::ShouldShowNotificationAddFunds() const {
@@ -2986,10 +2997,6 @@ void RewardsServiceImpl::StartMonthlyContributionForTest() {
  bat_ledger_->StartMonthlyContribution();
 }
 
-void RewardsServiceImpl::CheckInsufficientFundsForTesting() {
- MaybeShowNotificationAddFunds();
-}
-
 void RewardsServiceImpl::GetProduction(const GetProductionCallback& callback) {
  bat_ledger_service_->GetProduction(callback);
 }

components/brave_rewards/browser/rewards_service_impl.h

@@ -290,7 +290,6 @@ class RewardsServiceImpl : public RewardsService,
  // Testing methods
  void SetLedgerEnvForTesting();
  void StartMonthlyContributionForTest();
- void CheckInsufficientFundsForTesting();
  void MaybeShowNotificationAddFundsForTesting(
  base::OnceCallback<void(bool)> callback);
 
@@ -432,6 +431,10 @@ class RewardsServiceImpl : public RewardsService,
  bool ShouldShowNotificationAddFunds() const;
  void ShowNotificationAddFunds(bool sufficient);
 
+ void OnMaybeShowNotificationAddFundsForTesting(
+ base::OnceCallback<void(bool)> callback,
+ const bool result);
+
  void MaybeShowNotificationTipsPaid();
  void ShowNotificationTipsPaid(bool ac_enabled);
 

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={[

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}