diff --git a/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc b/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc index 8aa4fee40e92..a82254b0dfef 100644 --- a/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc @@ -483,8 +483,8 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, const double amount = 5.0; contribution_->TipViaCode("bumpsmack.com", amount, - ledger::mojom::PublisherStatus::CONNECTED, 1); - contribution_->VerifyTip(amount, true, false, true); + ledger::mojom::PublisherStatus::NOT_VERIFIED, 0); + contribution_->VerifyTip(amount, false, false, true); } IN_PROC_BROWSER_TEST_F( @@ -498,8 +498,8 @@ IN_PROC_BROWSER_TEST_F( const double amount = 5.0; contribution_->TipViaCode("bumpsmack.com", amount, - ledger::mojom::PublisherStatus::CONNECTED, 1); - contribution_->VerifyTip(amount, true, false, true); + ledger::mojom::PublisherStatus::NOT_VERIFIED, 0); + contribution_->VerifyTip(amount, false, false, true); } // Reenable when https://github.com/brave/brave-browser/issues/19982 is fixed. @@ -512,7 +512,7 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, const double amount = 5.0; contribution_->TipViaCode("bumpsmack.com", amount, - ledger::mojom::PublisherStatus::CONNECTED, 0); + ledger::mojom::PublisherStatus::NOT_VERIFIED, 0); contribution_->IsBalanceCorrect(); diff --git a/components/brave_rewards/browser/test/rewards_notification_browsertest.cc b/components/brave_rewards/browser/test/rewards_notification_browsertest.cc index 0e6aebf159d3..5d607dfa5da1 100644 --- a/components/brave_rewards/browser/test/rewards_notification_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_notification_browsertest.cc @@ -342,7 +342,7 @@ IN_PROC_BROWSER_TEST_F( rewards_browsertest_util::GetUrl(https_server_.get(), "duckduckgo.com"), verified); context_helper_->VisitPublisher( - rewards_browsertest_util::GetUrl(https_server_.get(), "bumpsmack.com"), + rewards_browsertest_util::GetUrl(https_server_.get(), "3zsistemi.si"), verified); context_helper_->VisitPublisher( rewards_browsertest_util::GetUrl(https_server_.get(), "brave.com"), diff --git a/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc b/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc index 21fc7f005ff0..bcd028872b12 100644 --- a/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc @@ -150,16 +150,15 @@ IN_PROC_BROWSER_TEST_F(RewardsPublisherBrowserTest, VisitUnverifiedPublisher) { false); } -// Registered publishers without a wallet address are displayed as verified +// Registered publishers without a wallet address are displayed as not verified IN_PROC_BROWSER_TEST_F(RewardsPublisherBrowserTest, VisitRegisteredPublisher) { rewards_browsertest_util::CreateRewardsWallet(rewards_service_); rewards_service_->SetAutoContributeEnabled(true); context_helper_->LoadRewardsPage(); context_helper_->VisitPublisher( - rewards_browsertest_util::GetUrl( - https_server_.get(), - "registeredsite.com"), - true); + rewards_browsertest_util::GetUrl(https_server_.get(), + "registeredsite.com"), + false); } } // namespace rewards_browsertest diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_server_publisher_info.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_server_publisher_info.cc index 2bc1e7f90bbb..bb45c31952f4 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_server_publisher_info.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_server_publisher_info.cc @@ -20,6 +20,7 @@ const char kTableName[] = "server_publisher_info"; } // namespace namespace ledger { + namespace database { DatabaseServerPublisherInfo::DatabaseServerPublisherInfo( @@ -144,6 +145,12 @@ void DatabaseServerPublisherInfo::OnGetRecord( info->updated_at = GetInt64Column(record, 2); info->banner = banner.Clone(); + // The `CONNECTED` status is deprecated. If this value appears in the database + // convert it to a valid status. + if (info->status == mojom::PublisherStatus::CONNECTED) { + info->status = mojom::PublisherStatus::NOT_VERIFIED; + } + callback(std::move(info)); } diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher.cc index 643bd1c3acfe..5dd66f033bff 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher.cc @@ -61,7 +61,7 @@ void GetPublisherStatusFromMessage( const publishers_pb::ChannelResponse& response, ledger::mojom::ServerPublisherInfo* info) { DCHECK(info); - info->status = ledger::mojom::PublisherStatus::CONNECTED; + info->status = ledger::mojom::PublisherStatus::NOT_VERIFIED; for (const auto& wallet : response.wallets()) { if (wallet.has_uphold_wallet()) { auto& uphold = wallet.uphold_wallet(); diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher_unittest.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher_unittest.cc index 23f75575177a..1d841729fe11 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher_unittest.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher_unittest.cc @@ -122,7 +122,7 @@ TEST_F(GetPublisherTest, EmptyWalletAddress) { EXPECT_EQ(result, mojom::Result::LEDGER_OK); ASSERT_TRUE(info); EXPECT_EQ(info->publisher_key, "brave.com"); - EXPECT_EQ(info->status, mojom::PublisherStatus::CONNECTED); + EXPECT_EQ(info->status, mojom::PublisherStatus::NOT_VERIFIED); EXPECT_EQ(info->address, ""); }