Transition WalletProperties to Parameters

brave/brave-browser#7165

android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java

@@ -188,9 +188,9 @@ public void WalletExist() {
         }
     }
 
-    public void GetWalletProperties() {
+    public void GetRewardsParameters() {
         synchronized(lock) {
-            nativeGetWalletProperties(mNativeBraveRewardsNativeWorker);
+            nativeGetRewardsParameters(mNativeBraveRewardsNativeWorker);
         }
     }
 

android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java

@@ -245,7 +245,7 @@ public void run() {
                 mActivity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        thisObject.mBraveRewardsNativeWorker.GetWalletProperties();
+                        thisObject.mBraveRewardsNativeWorker.GetRewardsParameters();
                         mBraveRewardsNativeWorker.FetchGrants();
                     }
                 });
@@ -1448,7 +1448,6 @@ public void OnGetLatestNotification(String id, int type, long timestamp,
     @Override
     public void OnNotificationDeleted(String id) {
         DismissNotification(id);
-        mBraveRewardsNativeWorker.GetWalletProperties();
     }
 
     @Override

browser/brave_rewards/android/brave_rewards_native_worker.cc

@@ -79,11 +79,11 @@ void BraveRewardsNativeWorker::CreateWallet(JNIEnv* env, const
 void BraveRewardsNativeWorker::OnCreateWallet(int32_t result) {
 }
 
-void BraveRewardsNativeWorker::GetWalletProperties(JNIEnv* env, const
+void BraveRewardsNativeWorker::GetRewardsParameters(JNIEnv* env, const
         base::android::JavaParamRef<jobject>& jcaller) {
   if (brave_rewards_service_) {
-    brave_rewards_service_->GetWalletProperties(
-        base::BindOnce(&BraveRewardsNativeWorker::OnGetWalletProperties,
+    brave_rewards_service_->GetRewardsParameters(
+        base::BindOnce(&BraveRewardsNativeWorker::OnGetRewardsParameters,
                        base::Unretained(this), brave_rewards_service_));
   }
 }
@@ -235,23 +235,18 @@ void BraveRewardsNativeWorker::OnWalletInitialized(
         weak_java_brave_rewards_native_worker_.get(env), error_code);
 }
 
-void BraveRewardsNativeWorker::OnGetWalletProperties(
+void BraveRewardsNativeWorker::OnGetRewardsParameters(
     brave_rewards::RewardsService* rewards_service,
-    std::unique_ptr<brave_rewards::WalletProperties> wallet_properties) {
-  if (wallet_properties) {
-    wallet_properties_ = *wallet_properties;
-  }
-  if (result == 0) {
-    if (rewards_service) {
-      rewards_service->FetchBalance(
-        base::Bind(
-          &BraveRewardsNativeWorker::OnBalance,
-          weak_factory_.GetWeakPtr()));
-    }
-  } else {
-    JNIEnv* env = base::android::AttachCurrentThread();
-    Java_BraveRewardsNativeWorker_OnWalletProperties(env,
-          weak_java_brave_rewards_native_worker_.get(env), result);
+    std::unique_ptr<brave_rewards::RewardsParameters> parameters) {
+  if (parameters) {
+    parameters_ = *parameters;
+  }
+
+  if (rewards_service) {
+    rewards_service->FetchBalance(
+      base::Bind(
+        &BraveRewardsNativeWorker::OnBalance,
+        weak_factory_.GetWeakPtr()));
   }
 }
 
@@ -263,7 +258,7 @@ void BraveRewardsNativeWorker::OnBalance(
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_BraveRewardsNativeWorker_OnWalletProperties(env,
+  Java_BraveRewardsNativeWorker_OnRewardsParameters(env,
         weak_java_brave_rewards_native_worker_.get(env), 0);
 }
 

browser/brave_rewards/android/brave_rewards_native_worker.h

@@ -21,7 +21,7 @@
 #include "brave/components/brave_rewards/browser/rewards_service_observer.h"
 #include "brave/components/brave_rewards/browser/rewards_notification_service_observer.h"
 #include "brave/components/brave_rewards/browser/rewards_service_private_observer.h"
-#include "brave/components/brave_rewards/browser/wallet_properties.h"
+#include "brave/components/brave_rewards/browser/rewards_parameters.h"
 #include "brave/components/brave_rewards/browser/auto_contribution_props.h"
 #include "brave/components/brave_rewards/browser/content_site.h"
 
@@ -53,7 +53,7 @@ class BraveRewardsNativeWorker : public brave_rewards::RewardsServiceObserver,
     void WalletExist(JNIEnv* env,
         const base::android::JavaParamRef<jobject>& jcaller);
 
-    void GetWalletProperties(JNIEnv* env,
+    void GetRewardsParameters(JNIEnv* env,
         const base::android::JavaParamRef<jobject>& jcaller);
 
     void GetPublisherInfo(JNIEnv* env,
@@ -212,9 +212,9 @@ class BraveRewardsNativeWorker : public brave_rewards::RewardsServiceObserver,
         const int32_t result,
         const brave_rewards::BalanceReport& balance_report);
 
-    void OnGetWalletProperties(
+    void OnGetRewardsParameters(
         brave_rewards::RewardsService* rewards_service,
-        std::unique_ptr<brave_rewards::WalletProperties> wallet_properties);
+        std::unique_ptr<brave_rewards::RewardsParameters> parameters);
 
     void OnNotificationAdded(
       brave_rewards::RewardsNotificationService* rewards_notification_service,
@@ -274,7 +274,7 @@ class BraveRewardsNativeWorker : public brave_rewards::RewardsServiceObserver,
         std::unique_ptr<brave_rewards::Balance> balance);
     JavaObjectWeakGlobalRef weak_java_brave_rewards_native_worker_;
     brave_rewards::RewardsService* brave_rewards_service_;
-    brave_rewards::WalletProperties wallet_properties_;
+    brave_rewards::RewardsParameters parameters_;
     brave_rewards::Balance balance_;
     brave_rewards::AutoContributeProps auto_contrib_properties_;
     PublishersInfoMap map_publishers_info_;  // <tabId, PublisherInfoPtr>

browser/extensions/api/brave_rewards_api.cc

@@ -405,43 +405,38 @@ ExtensionFunction::ResponseAction BraveRewardsGetPublisherDataFunction::Run() {
   return RespondNow(NoArguments());
 }
 
-BraveRewardsGetWalletPropertiesFunction::
-~BraveRewardsGetWalletPropertiesFunction() = default;
+BraveRewardsGetRewardsParametersFunction::
+~BraveRewardsGetRewardsParametersFunction() = default;
 
 ExtensionFunction::ResponseAction
-BraveRewardsGetWalletPropertiesFunction::Run() {
+BraveRewardsGetRewardsParametersFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   auto* rewards_service = RewardsServiceFactory::GetForProfile(profile);
   if (!rewards_service) {
     auto data = std::make_unique<base::Value>(base::Value::Type::DICTIONARY);
     return RespondNow(OneArgument(std::move(data)));
   }
 
-  rewards_service->GetWalletProperties(base::BindOnce(
-      &BraveRewardsGetWalletPropertiesFunction::OnGet,
+  rewards_service->GetRewardsParameters(base::BindOnce(
+      &BraveRewardsGetRewardsParametersFunction::OnGet,
       this));
   return RespondLater();
 }
 
-void BraveRewardsGetWalletPropertiesFunction::OnGet(
-    std::unique_ptr<::brave_rewards::WalletProperties> wallet_properties) {
+void BraveRewardsGetRewardsParametersFunction::OnGet(
+    std::unique_ptr<::brave_rewards::RewardsParameters> parameters) {
   auto data = std::make_unique<base::DictionaryValue>();
 
-  if (!wallet_properties) {
+  if (!parameters) {
     return Respond(OneArgument(std::move(data)));
   }
 
-  auto tip_choices = std::make_unique<base::ListValue>();
-  for (auto const& item : wallet_properties->default_tip_choices) {
-    tip_choices->Append(base::Value(item));
-  }
-  data->SetList("defaultTipChoices", std::move(tip_choices));
-
+  data->SetDouble("rate", parameters->rate);
   auto monthly_choices = std::make_unique<base::ListValue>();
-  for (auto const& item : wallet_properties->default_monthly_tip_choices) {
+  for (auto const& item : parameters->monthly_tip_choices) {
     monthly_choices->Append(base::Value(item));
   }
-  data->SetList("defaultMonthlyTipChoices", std::move(monthly_choices));
+  data->SetList("monthlyTipChoices", std::move(monthly_choices));
 
   Respond(OneArgument(std::move(data)));
 }

browser/extensions/api/brave_rewards_api.h

@@ -16,7 +16,7 @@
 #include "brave/components/brave_rewards/browser/external_wallet.h"
 #include "brave/components/brave_rewards/browser/publisher_banner.h"
 #include "brave/components/brave_rewards/browser/balance_report.h"
-#include "brave/components/brave_rewards/browser/wallet_properties.h"
+#include "brave/components/brave_rewards/browser/rewards_parameters.h"
 #include "brave/components/brave_rewards/browser/promotion.h"
 #include "extensions/browser/extension_function.h"
 
@@ -115,18 +115,18 @@ class BraveRewardsGetPublisherDataFunction : public ExtensionFunction {
   ResponseAction Run() override;
 };
 
-class BraveRewardsGetWalletPropertiesFunction : public ExtensionFunction {
+class BraveRewardsGetRewardsParametersFunction : public ExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("braveRewards.getWalletProperties", UNKNOWN)
+  DECLARE_EXTENSION_FUNCTION("braveRewards.getRewardsParameters", UNKNOWN)
 
  protected:
-  ~BraveRewardsGetWalletPropertiesFunction() override;
+  ~BraveRewardsGetRewardsParametersFunction() override;
 
   ResponseAction Run() override;
 
  private:
   void OnGet(
-      std::unique_ptr<brave_rewards::WalletProperties> wallet_properties);
+      std::unique_ptr<brave_rewards::RewardsParameters> parameters);
 };
 
 class BraveRewardsGetBalanceReportFunction : public ExtensionFunction {

browser/importer/brave_profile_writer.cc

@@ -18,7 +18,7 @@
 #include "brave/components/brave_rewards/browser/content_site.h"
 #include "brave/components/brave_rewards/browser/rewards_service.h"
 #include "brave/browser/brave_rewards/rewards_service_factory.h"
-#include "brave/components/brave_rewards/browser/wallet_properties.h"
+#include "brave/components/brave_rewards/browser/rewards_parameters.h"
 #include "brave/components/search_engines/brave_prepopulated_engines.h"
 #include "brave/utility/importer/brave_importer.h"
 #include "brave/browser/importer/brave_in_process_importer_bridge.h"
@@ -310,7 +310,7 @@ void BraveProfileWriter::OnIsWalletCreated(bool created) {
   // (after properties are fetched) should be considered for backup.
   LOG(INFO) << "Wallet exists; fetching details...";
   rewards_service_->AddObserver(this);
-  rewards_service_->GetWalletProperties();
+  rewards_service_->GetRewardsParameters();
   rewards_service_->FetchBalance(base::BindOnce(
           &BraveProfileWriter::OnFetchBalance,
           AsWeakPtr()));

browser/ui/webui/brave_rewards_page_ui.cc

@@ -27,7 +27,7 @@
 #include "brave/components/brave_rewards/browser/rewards_service.h"
 #include "brave/browser/brave_rewards/rewards_service_factory.h"
 #include "brave/components/brave_rewards/browser/rewards_service_observer.h"
-#include "brave/components/brave_rewards/browser/wallet_properties.h"
+#include "brave/components/brave_rewards/browser/rewards_parameters.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ -69,7 +69,7 @@ class RewardsDOMHandler : public WebUIMessageHandler,
 
  private:
   void HandleCreateWalletRequested(const base::ListValue* args);
-  void GetWalletProperties(const base::ListValue* args);
+  void GetRewardsParameters(const base::ListValue* args);
   void GetAutoContributeProperties(const base::ListValue* args);
   void FetchPromotions(const base::ListValue* args);
   void ClaimPromotion(const base::ListValue* args);
@@ -199,8 +199,8 @@ class RewardsDOMHandler : public WebUIMessageHandler,
 
   void OnGetAllMonthlyReportIds(const std::vector<std::string>& ids);
 
-  void OnGetWalletProperties(
-      std::unique_ptr<brave_rewards::WalletProperties> wallet_properties);
+  void OnGetRewardsParameters(
+      std::unique_ptr<brave_rewards::RewardsParameters> parameters);
 
   // RewardsServiceObserver implementation
   void OnWalletInitialized(brave_rewards::RewardsService* rewards_service,
@@ -328,8 +328,8 @@ void RewardsDOMHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("brave_rewards.createWalletRequested",
       base::BindRepeating(&RewardsDOMHandler::HandleCreateWalletRequested,
       base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("brave_rewards.getWalletProperties",
-      base::BindRepeating(&RewardsDOMHandler::GetWalletProperties,
+  web_ui()->RegisterMessageCallback("brave_rewards.getRewardsParameters",
+      base::BindRepeating(&RewardsDOMHandler::GetRewardsParameters,
       base::Unretained(this)));
   web_ui()->RegisterMessageCallback("brave_rewards.getAutoContributeProperties",
       base::BindRepeating(&RewardsDOMHandler::GetAutoContributeProperties,
@@ -495,33 +495,34 @@ void RewardsDOMHandler::HandleCreateWalletRequested(
                      rewards_service_));
 }
 
-void RewardsDOMHandler::GetWalletProperties(const base::ListValue* args) {
+void RewardsDOMHandler::GetRewardsParameters(const base::ListValue* args) {
   if (!rewards_service_)
     return;
 
-  rewards_service_->GetWalletProperties(
-      base::BindOnce(&RewardsDOMHandler::OnGetWalletProperties,
+  rewards_service_->GetRewardsParameters(
+      base::BindOnce(&RewardsDOMHandler::OnGetRewardsParameters,
                      weak_factory_.GetWeakPtr()));
 }
 
-void RewardsDOMHandler::OnGetWalletProperties(
-    std::unique_ptr<brave_rewards::WalletProperties> wallet_properties) {
+void RewardsDOMHandler::OnGetRewardsParameters(
+    std::unique_ptr<brave_rewards::RewardsParameters> parameters) {
   if (!web_ui()->CanCallJavascript()) {
     return;
   }
 
   base::DictionaryValue data;
-  if (wallet_properties) {
+  if (parameters) {
     auto choices = std::make_unique<base::ListValue>();
-    for (double const& choice : wallet_properties->parameters_choices) {
+    for (double const& choice : parameters->auto_contribute_choices) {
       choices->AppendDouble(choice);
     }
 
-    data.SetList("choices", std::move(choices));
-    data.SetDouble("monthlyAmount", wallet_properties->monthly_amount);
+    data.SetDouble("rate", parameters->rate);
+    data.SetDouble("autoContributeChoice", parameters->auto_contribute_choice);
+    data.SetList("autoContributeChoices", std::move(choices));
   }
   web_ui()->CallJavascriptFunctionUnsafe(
-        "brave_rewards.walletProperties", data);
+        "brave_rewards.rewardsParameters", data);
 }
 
 void RewardsDOMHandler::OnWalletInitialized(