From 8094c3930ce859898079c5c555ff808d270149c8 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 1 Nov 2022 11:01:31 -0400 Subject: [PATCH] Remove Restore tab from Manage Brave Rewards dialog --- .storybook/locale.ts | 7 - .../browser/BraveRewardsNativeWorker.java | 15 -- .../chrome/browser/BraveRewardsObserver.java | 1 - .../developer/BraveQAPreferences.java | 53 ------ android/java/res/xml/qa_preferences.xml | 4 - .../android/brave_rewards_native_worker.cc | 18 -- .../android/brave_rewards_native_worker.h | 6 - browser/ui/webui/brave_rewards_page_ui.cc | 59 ------- browser/ui/webui/brave_webui_source.cc | 9 - chromium_presubmit_config.json5 | 2 - .../brave_adaptive_captcha_service.cc | 6 - .../brave_adaptive_captcha_service.h | 2 - .../brave_rewards/browser/rewards_service.h | 14 +- .../browser/rewards_service_impl.cc | 29 ---- .../browser/rewards_service_impl.h | 13 +- .../browser/rewards_service_impl_unittest.cc | 2 - .../browser/rewards_service_observer.h | 3 - .../browser/test/rewards_browsertest.cc | 6 +- .../resources/page/actions/rewards_actions.ts | 14 -- .../resources/page/actions/rewards_types.ts | 4 - .../resources/page/brave_rewards_page.tsx | 10 -- .../resources/page/components/pageWallet.tsx | 90 +--------- .../resources/page/reducers/default_state.ts | 2 - .../page/reducers/rewards_reducer.ts | 12 -- .../resources/page/reducers/wallet_reducer.ts | 41 ----- .../resources/page/stories/redux_state.ts | 2 - .../resources/ui/components/index.ts | 6 +- .../__snapshots__/spec.tsx.snap | 2 +- .../index.tsx | 125 +------------- .../spec.tsx | 6 +- .../style.ts | 16 -- .../ui/components/modalQRCode/index.tsx | 86 ---------- .../ui/components/modalQRCode/style.ts | 13 -- components/definitions/rewards.d.ts | 7 - .../resources/brave_components_strings.grd | 9 - .../services/bat_ledger/bat_ledger_impl.cc | 26 --- .../services/bat_ledger/bat_ledger_impl.h | 16 +- .../public/interfaces/bat_ledger.mojom | 3 - .../page/reducers/rewards_reducer_test.ts | 2 - .../page/reducers/wallet_reducer_test.ts | 83 --------- ios/browser/api/ledger/brave_ledger.h | 14 -- ios/browser/api/ledger/brave_ledger.mm | 53 ------ vendor/bat-native-ledger/BUILD.gn | 6 - .../include/bat/ledger/ledger.h | 8 - .../get_recover_wallet/get_recover_wallet.cc | 118 ------------- .../get_recover_wallet/get_recover_wallet.h | 68 -------- .../get_recover_wallet_unittest.cc | 149 ---------------- .../post_claim_brave/post_claim_brave.cc | 127 -------------- .../post_claim_brave/post_claim_brave.h | 66 -------- .../post_claim_brave_unittest.cc | 159 ------------------ .../endpoint/promotion/promotion_server.cc | 11 -- .../endpoint/promotion/promotion_server.h | 8 - .../src/bat/ledger/internal/ledger_impl.cc | 27 --- .../src/bat/ledger/internal/ledger_impl.h | 8 - .../ledger/internal/logging/event_log_keys.h | 1 - .../src/bat/ledger/internal/wallet/wallet.cc | 61 ------- .../src/bat/ledger/internal/wallet/wallet.h | 13 -- .../ledger/internal/wallet/wallet_recover.cc | 107 ------------ .../ledger/internal/wallet/wallet_recover.h | 43 ----- vendor/bat-native-ledger/test/BUILD.gn | 2 - 60 files changed, 24 insertions(+), 1849 deletions(-) rename components/brave_rewards/resources/ui/components/{modalBackupRestore => modalBackupReset}/__snapshots__/spec.tsx.snap (98%) rename components/brave_rewards/resources/ui/components/{modalBackupRestore => modalBackupReset}/index.tsx (56%) rename components/brave_rewards/resources/ui/components/{modalBackupRestore => modalBackupReset}/spec.tsx (89%) rename components/brave_rewards/resources/ui/components/{modalBackupRestore => modalBackupReset}/style.ts (85%) delete mode 100644 components/brave_rewards/resources/ui/components/modalQRCode/index.tsx delete mode 100644 components/brave_rewards/resources/ui/components/modalQRCode/style.ts delete mode 100644 components/test/brave_rewards/page/reducers/wallet_reducer_test.ts delete mode 100644 vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_recover_wallet/get_recover_wallet.cc delete mode 100644 vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_recover_wallet/get_recover_wallet.h delete mode 100644 vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_recover_wallet/get_recover_wallet_unittest.cc delete mode 100644 vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_claim_brave/post_claim_brave.cc delete mode 100644 vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_claim_brave/post_claim_brave.h delete mode 100644 vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_claim_brave/post_claim_brave_unittest.cc delete mode 100644 vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_recover.cc delete mode 100644 vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_recover.h diff --git a/.storybook/locale.ts b/.storybook/locale.ts index 08fc4f6cc23..82902d6d09c 100644 --- a/.storybook/locale.ts +++ b/.storybook/locale.ts @@ -176,7 +176,6 @@ let locale: Record = { removeAdFromSaved: 'Remove From Saved', 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', clearExcludeList: 'Clear exclude list', removeFromExcluded: 'Remove from excluded', reviewSitesMsg: 'Your pinned sites have been moved to', @@ -209,13 +208,7 @@ let locale: Record = { rewardsPanelText1: 'Add, withdraw and manage funds at Uphold', rewardsPanelText3: 'Brave Rewards is built on the Basic Attention Token. Learn more about BAT', rewardsPanelText4: 'here', - rewardsRestoreText1: 'Restore your Wallet', - rewardsRestoreText2: 'Use your recovery key to restore your wallet.', - rewardsRestoreText3: 'Restoring with a recovery key will replace your current wallet. So make sure you empty or back up your current wallet before restoring.', - rewardsRestoreText4: 'Enter your recovery key or', rewardsSummary: 'Rewards Summary', - rewardsViewQRCodeText1: 'View QR Code', - rewardsViewQRCodeText2: 'for iOS Rewards users transferring BAT.', rewardsWhy: 'Why Brave Rewards…', rewardsWidgetBraveRewards: 'Brave Rewards', saveAd: 'Save', diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index b7e6abedf79..d4554235730 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -468,13 +468,6 @@ public class BraveRewardsNativeWorker { } } - public void RecoverWallet(String passPhrase) { - synchronized (lock) { - BraveRewardsNativeWorkerJni.get().recoverWallet( - mNativeBraveRewardsNativeWorker, passPhrase); - } - } - public void getAdsAccountStatement() { synchronized (lock) { BraveRewardsNativeWorkerJni.get().getAdsAccountStatement( @@ -489,13 +482,6 @@ public class BraveRewardsNativeWorker { } } - @CalledByNative - public void OnRecoverWallet(int errorCode) { - for (BraveRewardsObserver observer : mObservers) { - observer.OnRecoverWallet(errorCode); - } - } - public void RefreshPublisher(String publisherKey) { synchronized (lock) { BraveRewardsNativeWorkerJni.get().refreshPublisher( @@ -770,7 +756,6 @@ public class BraveRewardsNativeWorker { String getCountryCode(long nativeBraveRewardsNativeWorker); void getAvailableCountries(long nativeBraveRewardsNativeWorker); void disconnectWallet(long nativeBraveRewardsNativeWorker); - void recoverWallet(long nativeBraveRewardsNativeWorker, String passPhrase); void refreshPublisher(long nativeBraveRewardsNativeWorker, String publisherKey); void createRewardsWallet(long nativeBraveRewardsNativeWorker, String countryCode); void getRewardsParameters(long nativeBraveRewardsNativeWorker); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsObserver.java b/android/java/org/chromium/chrome/browser/BraveRewardsObserver.java index 35ced6aac00..decd03bb199 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsObserver.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsObserver.java @@ -27,7 +27,6 @@ public interface BraveRewardsObserver { default public void OnClaimPromotion(int error_code){}; default public void onUnblindedTokensReady() {} default public void onReconcileComplete(int resultCode, int rewardsType, double amount) {} - default public void OnRecoverWallet(int errorCode){}; default public void OnRefreshPublisher(int status, String publisherKey){}; default public void OnOneTimeTip(int result){}; default public void OnPendingContributionSaved(int result){}; diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java index c1c0c4382a5..a52f14daf7b 100644 --- a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java @@ -64,7 +64,6 @@ public class BraveQAPreferences extends BravePreferenceFragment private static final String QA_ADS_PER_HOUR = "qa_ads_per_hour"; private static final String QA_IMPORT_REWARDS_DB = "qa_import_rewards_db"; private static final String QA_EXPORT_REWARDS_DB = "qa_export_rewards_db"; - private static final String QA_RESTORE_WALLET = "qa_restore_wallet"; private static final int CHOOSE_FILE_FOR_IMPORT_REQUEST_CODE = STORAGE_PERMISSION_IMPORT_REQUEST_CODE + 1; @@ -79,7 +78,6 @@ public class BraveQAPreferences extends BravePreferenceFragment private ChromeSwitchPreference mDebugNTP; private ChromeSwitchPreference mVlogRewards; private Preference mCommandLine; - private Preference mRestoreWallet; private Preference mImportRewardsDb; private Preference mExportRewardsDb; @@ -140,55 +138,12 @@ public class BraveQAPreferences extends BravePreferenceFragment mExportRewardsDb = findPreference(QA_EXPORT_REWARDS_DB); setRewardsDbClickListeners(); - mRestoreWallet = findPreference(QA_RESTORE_WALLET); - setRestoreClickListener(); - mCommandLine = findPreference(PREF_QA_COMMAND_LINE); setCommandLineClickListener(); checkQACode(); } - private void setRestoreClickListener() { - if (mRestoreWallet != null) { - mRestoreWallet.setOnPreferenceClickListener(preference -> { - LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService( - Context.LAYOUT_INFLATER_SERVICE); - View view = inflater.inflate(R.layout.qa_code_check, null); - EditText input = (EditText) view.findViewById(R.id.qa_code); - input.setInputType(InputType.TYPE_CLASS_TEXT); - - DialogInterface.OnClickListener onClickListener = - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int button) { - if (button == AlertDialog.BUTTON_POSITIVE) { - String restorePhrase = input.getText().toString(); - if (!restorePhrase.isEmpty()) { - BraveRewardsNativeWorker.getInstance().RecoverWallet( - restorePhrase); - } - } - } - }; - - AlertDialog.Builder alert = new AlertDialog.Builder( - getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog); - AlertDialog.Builder alertDialog = - alert.setTitle("Enter Wallet restore phrase") - .setView(view) - .setPositiveButton(R.string.ok, onClickListener) - .setNegativeButton(R.string.cancel, onClickListener) - .setCancelable(false); - Dialog dialog = alertDialog.create(); - dialog.setCanceledOnTouchOutside(false); - dialog.show(); - - return true; - }); - } - } - private void setRewardsDbClickListeners() { if (mImportRewardsDb != null) { mImportRewardsDb.setOnPreferenceClickListener( preference -> { @@ -428,14 +383,6 @@ public class BraveQAPreferences extends BravePreferenceFragment @Override public void onCreatePreferences(Bundle bundle, String s) {} - @Override - public void OnRecoverWallet(int errorCode) { - Context context = ContextUtils.getApplicationContext(); - String msg = - (0 == errorCode) ? "Wallet is successfully restored" : "Wallet recovery failed"; - Toast.makeText(context, msg, Toast.LENGTH_SHORT).show(); - } - @Override public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); diff --git a/android/java/res/xml/qa_preferences.xml b/android/java/res/xml/qa_preferences.xml index b4832bc4673..393cb601048 100644 --- a/android/java/res/xml/qa_preferences.xml +++ b/android/java/res/xml/qa_preferences.xml @@ -64,8 +64,4 @@ android:key="qa_export_rewards_db" android:title="Export Rewards Database" /> - - diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.cc b/browser/brave_rewards/android/brave_rewards_native_worker.cc index cef0e9888c3..8c495c68012 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.cc +++ b/browser/brave_rewards/android/brave_rewards_native_worker.cc @@ -884,24 +884,6 @@ std::string BraveRewardsNativeWorker::StdStrStrMapToJsonString( return json_args; } -void BraveRewardsNativeWorker::RecoverWallet( - JNIEnv* env, - const base::android::JavaParamRef& pass_phrase) { - if (brave_rewards_service_) { - brave_rewards_service_->RecoverWallet( - base::android::ConvertJavaStringToUTF8(env, pass_phrase)); - } -} - -void BraveRewardsNativeWorker::OnRecoverWallet( - brave_rewards::RewardsService* rewards_service, - const ledger::mojom::Result result) { - JNIEnv* env = base::android::AttachCurrentThread(); - Java_BraveRewardsNativeWorker_OnRecoverWallet( - env, weak_java_brave_rewards_native_worker_.get(env), - static_cast(result)); -} - void BraveRewardsNativeWorker::RefreshPublisher( JNIEnv* env, const base::android::JavaParamRef& publisher_key) { diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.h b/browser/brave_rewards/android/brave_rewards_native_worker.h index 7431a2b88d0..91e9f1ad3a1 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.h +++ b/browser/brave_rewards/android/brave_rewards_native_worker.h @@ -156,9 +156,6 @@ class BraveRewardsNativeWorker void DisconnectWallet(JNIEnv* env); - void RecoverWallet(JNIEnv* env, - const base::android::JavaParamRef& pass_phrase); - void RefreshPublisher( JNIEnv* env, const base::android::JavaParamRef& publisher_key); @@ -240,9 +237,6 @@ class BraveRewardsNativeWorker const ledger::mojom::Result result, const std::string& wallet_type) override; - void OnRecoverWallet(brave_rewards::RewardsService* rewards_service, - const ledger::mojom::Result result) override; - void OnRefreshPublisher(const ledger::mojom::PublisherStatus status, const std::string& publisher_key); void SetAutoContributeEnabled(JNIEnv* env, bool isAutoContributeEnabled); diff --git a/browser/ui/webui/brave_rewards_page_ui.cc b/browser/ui/webui/brave_rewards_page_ui.cc index a361a19e335..98720a15eea 100644 --- a/browser/ui/webui/brave_rewards_page_ui.cc +++ b/browser/ui/webui/brave_rewards_page_ui.cc @@ -99,7 +99,6 @@ class RewardsDOMHandler void GetAutoContributeProperties(const base::Value::List& args); void FetchPromotions(const base::Value::List& args); void ClaimPromotion(const base::Value::List& args); - void RecoverWallet(const base::Value::List& args); void GetReconcileStamp(const base::Value::List& args); void SaveSetting(const base::Value::List& args); void OnPublisherList(std::vector list); @@ -192,10 +191,6 @@ class RewardsDOMHandler void CompleteReset(const base::Value::List& args); - void GetPaymentId(const base::Value::List& args); - - void OnGetPaymentId(ledger::mojom::RewardsWalletPtr wallet); - void GetOnboardingStatus(const base::Value::List& args); void EnableRewards(const base::Value::List& args); void GetExternalWalletProviders(const base::Value::List& args); @@ -215,8 +210,6 @@ class RewardsDOMHandler void OnPromotionFinished(brave_rewards::RewardsService* rewards_service, const ledger::mojom::Result result, ledger::mojom::PromotionPtr promotion) override; - void OnRecoverWallet(brave_rewards::RewardsService* rewards_service, - const ledger::mojom::Result result) override; void OnExcludedSitesChanged(brave_rewards::RewardsService* rewards_service, std::string publisher_id, bool excluded) override; @@ -351,10 +344,6 @@ void RewardsDOMHandler::RegisterMessages() { "brave_rewards.claimPromotion", base::BindRepeating(&RewardsDOMHandler::ClaimPromotion, base::Unretained(this))); - web_ui()->RegisterMessageCallback( - "brave_rewards.recoverWallet", - base::BindRepeating(&RewardsDOMHandler::RecoverWallet, - base::Unretained(this))); web_ui()->RegisterMessageCallback( "brave_rewards.getReconcileStamp", base::BindRepeating(&RewardsDOMHandler::GetReconcileStamp, @@ -499,10 +488,6 @@ void RewardsDOMHandler::RegisterMessages() { "brave_rewards.completeReset", base::BindRepeating(&RewardsDOMHandler::CompleteReset, base::Unretained(this))); - web_ui()->RegisterMessageCallback( - "brave_rewards.getPaymentId", - base::BindRepeating(&RewardsDOMHandler::GetPaymentId, - base::Unretained(this))); web_ui()->RegisterMessageCallback( "brave_rewards.getOnboardingStatus", base::BindRepeating(&RewardsDOMHandler::GetOnboardingStatus, @@ -843,26 +828,6 @@ void RewardsDOMHandler::OnPromotionFinished( base::Value(std::move(finish))); } -void RewardsDOMHandler::RecoverWallet(const base::Value::List& args) { - CHECK_EQ(1U, args.size()); - if (rewards_service_) { - AllowJavascript(); - const std::string pass_phrase = args[0].GetString(); - rewards_service_->RecoverWallet(pass_phrase); - } -} - -void RewardsDOMHandler::OnRecoverWallet( - brave_rewards::RewardsService* rewards_service, - const ledger::mojom::Result result) { - if (!IsJavascriptAllowed()) { - return; - } - - CallJavascriptFunction("brave_rewards.recoverWalletData", - base::Value(static_cast(result))); -} - void RewardsDOMHandler::OnGetReconcileStamp(uint64_t reconcile_stamp) { if (IsJavascriptAllowed()) { std::string stamp = std::to_string(reconcile_stamp); @@ -2028,30 +1993,6 @@ void RewardsDOMHandler::OnCompleteReset(const bool success) { CallJavascriptFunction("brave_rewards.completeReset", base::Value(success)); } -void RewardsDOMHandler::GetPaymentId(const base::Value::List& args) { - if (!rewards_service_) { - return; - } - - AllowJavascript(); - - rewards_service_->GetRewardsWallet(base::BindOnce( - &RewardsDOMHandler::OnGetPaymentId, weak_factory_.GetWeakPtr())); -} - -void RewardsDOMHandler::OnGetPaymentId(ledger::mojom::RewardsWalletPtr wallet) { - if (!IsJavascriptAllowed()) { - return; - } - - std::string payment_id; - if (wallet) { - payment_id = wallet->payment_id; - } - - CallJavascriptFunction("brave_rewards.paymentId", base::Value(payment_id)); -} - void RewardsDOMHandler::GetOnboardingStatus(const base::Value::List& args) { AllowJavascript(); Profile* profile = Profile::FromWebUI(web_ui()); diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc index e10120ce28d..3b02e8c7761 100644 --- a/browser/ui/webui/brave_webui_source.cc +++ b/browser/ui/webui/brave_webui_source.cc @@ -578,8 +578,6 @@ void CustomizeWebUIHTMLSource(content::WebUI* web_ui, { "monthlyTipsTitle", IDS_BRAVE_REWARDS_LOCAL_MONTHLY_TIPS_TITLE }, { "monthlyTipsDesc", IDS_BRAVE_REWARDS_LOCAL_MONTHLY_TIPS_DESC }, { "monthlyTipsEmpty", IDS_BRAVE_REWARDS_LOCAL_MONTHLY_TIPS_EMPTY }, - { "walletRecoveryFail", IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_FAIL }, // NOLINT - { "walletRecoveryOutdated", IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_OUTDATED }, // NOLINT { "redirectModalError", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_ERROR }, { "redirectModalClose", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_CLOSE }, { "redirectModalDeviceLimitReachedText", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_DEVICE_LIMIT_REACHED_TEXT}, // NOLINT @@ -745,7 +743,6 @@ void CustomizeWebUIHTMLSource(content::WebUI* web_ui, { "reservedMoreLink", IDS_BRAVE_UI_RESERVED_MORE_LINK }, { "reservedAllLink", IDS_BRAVE_UI_RESERVED_ALL_LINK }, { "reset", IDS_BRAVE_UI_RESET }, - { "restore", IDS_BRAVE_UI_RESTORE }, { "clearExcludeList", IDS_BRAVE_UI_CLEAR_EXCLUDE_LIST }, { "reviewSitesMsg", IDS_BRAVE_UI_REVIEW_SITE_MSG }, { "rewardsAdGrantAmount", IDS_REWARDS_WIDGET_AD_GRANT_AMOUNT }, @@ -762,11 +759,6 @@ void CustomizeWebUIHTMLSource(content::WebUI* web_ui, { "rewardsPaymentCompleted", IDS_REWARDS_PAYMENT_COMPLETED }, { "rewardsPaymentPending", IDS_REWARDS_PAYMENT_PENDING }, { "rewardsPaymentProcessing", IDS_REWARDS_PAYMENT_PROCESSING }, - { "rewardsViewQRCodeText1", IDS_BRAVE_UI_REWARDS_VIEW_QR_CODE_TEXT1 }, - { "rewardsViewQRCodeText2", IDS_BRAVE_UI_REWARDS_VIEW_QR_CODE_TEXT2 }, - { "rewardsRestoreText3", IDS_BRAVE_UI_REWARDS_RESTORE_TEXT3 }, - { "rewardsRestoreText4", IDS_BRAVE_UI_REWARDS_RESTORE_TEXT4 }, - { "rewardsRestoreWarning", IDS_BRAVE_UI_REWARDS_RESTORE_WARNING }, { "rewardsResetConfirmation", IDS_BRAVE_UI_REWARDS_RESET_CONFIRMATION }, { "rewardsResetTextFunds", IDS_BRAVE_UI_REWARDS_RESET_TEXT_FUNDS }, { "rewardsResetTextNoFunds", IDS_BRAVE_UI_REWARDS_RESET_TEXT_NO_FUNDS }, @@ -783,7 +775,6 @@ void CustomizeWebUIHTMLSource(content::WebUI* web_ui, { "tokenGrantReceived", IDS_BRAVE_UI_TOKEN_GRANT_RECEIVED }, { "token", IDS_BRAVE_UI_TOKEN }, { "tokens", IDS_BRAVE_UI_TOKENS }, - { "qrCodeLoading", IDS_BRAVE_UI_QR_CODE_LOADING }, { "total", IDS_BRAVE_UI_TOTAL }, { "transactions", IDS_BRAVE_UI_TRANSACTIONS }, { "type", IDS_BRAVE_UI_TYPE }, diff --git a/chromium_presubmit_config.json5 b/chromium_presubmit_config.json5 index 604ce3c184f..534546bb5c1 100644 --- a/chromium_presubmit_config.json5 +++ b/chromium_presubmit_config.json5 @@ -182,7 +182,6 @@ "vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/private_cdn/get_publisher/get_publisher\\.cc", "vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/delete_claim/delete_claim\\.cc", "vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_drain/get_drain\\.cc", - "vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_recover_wallet/get_recover_wallet\\.cc", "vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_wallet/get_wallet\\.cc", "vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_bat_loss/post_bat_loss\\.cc", "vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_clobbered_claims/post_clobbered_claims\\.cc", @@ -225,7 +224,6 @@ "vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold\\.cc", "vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_authorization\\.cc", "vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_transfer\\.cc", - "vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_recover\\.cc", ], "CheckSpamLogging": [ "browser/brave_ads/notification_helper/notification_helper_impl_mac\\.mm", diff --git a/components/brave_adaptive_captcha/brave_adaptive_captcha_service.cc b/components/brave_adaptive_captcha/brave_adaptive_captcha_service.cc index 1293ae061e7..9aad84dc359 100644 --- a/components/brave_adaptive_captcha/brave_adaptive_captcha_service.cc +++ b/components/brave_adaptive_captcha/brave_adaptive_captcha_service.cc @@ -155,12 +155,6 @@ void BraveAdaptiveCaptchaService::ClearScheduledCaptcha() { prefs_->SetBoolean(prefs::kScheduledCaptchaPaused, false); } -void BraveAdaptiveCaptchaService::OnRecoverWallet( - brave_rewards::RewardsService* rewards_service, - const ledger::mojom::Result result) { - ClearScheduledCaptcha(); -} - void BraveAdaptiveCaptchaService::OnCompleteReset(const bool success) { ClearScheduledCaptcha(); } diff --git a/components/brave_adaptive_captcha/brave_adaptive_captcha_service.h b/components/brave_adaptive_captcha/brave_adaptive_captcha_service.h index 21f1df9f67c..a8548d16a35 100644 --- a/components/brave_adaptive_captcha/brave_adaptive_captcha_service.h +++ b/components/brave_adaptive_captcha/brave_adaptive_captcha_service.h @@ -71,8 +71,6 @@ class BraveAdaptiveCaptchaService private: // brave_rewards::RewardsServiceObserver: - void OnRecoverWallet(brave_rewards::RewardsService* rewards_service, - const ledger::mojom::Result result) override; void OnCompleteReset(const bool success) override; raw_ptr prefs_ = nullptr; diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h index a16dc20144c..8f23d73cf98 100644 --- a/components/brave_rewards/browser/rewards_service.h +++ b/components/brave_rewards/browser/rewards_service.h @@ -120,9 +120,6 @@ using GetEventLogsCallback = using GetRewardsWalletCallback = base::OnceCallback; -using GetRewardsWalletPassphraseCallback = - base::OnceCallback; - using OnTipCallback = base::OnceCallback; class RewardsService : public KeyedService { @@ -175,11 +172,9 @@ class RewardsService : public KeyedService { virtual void ClaimPromotion( const std::string& promotion_id, AttestPromotionCallback callback) = 0; - virtual void AttestPromotion( - const std::string& promotion_id, - const std::string& solution, - AttestPromotionCallback callback) = 0; - virtual void RecoverWallet(const std::string& passPhrase) = 0; + virtual void AttestPromotion(const std::string& promotion_id, + const std::string& solution, + AttestPromotionCallback callback) = 0; virtual void RestorePublishers() = 0; virtual void OnLoad(SessionID tab_id, const GURL& gurl) = 0; virtual void OnUnload(SessionID tab_id) = 0; @@ -358,9 +353,6 @@ class RewardsService : public KeyedService { virtual void GetRewardsWallet(GetRewardsWalletCallback callback) = 0; - virtual void GetRewardsWalletPassphrase( - GetRewardsWalletPassphraseCallback callback) = 0; - virtual void SetExternalWalletType(const std::string& wallet_type) = 0; protected: diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 84fcfcb87d8..2a0dde96ab8 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -1336,26 +1336,6 @@ void RewardsServiceImpl::ClaimPromotion( bat_ledger_->ClaimPromotion(promotion_id, "", std::move(claim_callback)); } -void RewardsServiceImpl::RecoverWallet(const std::string& passPhrase) { - if (!Connected()) { - return; - } - - bat_ledger_->RecoverWallet(passPhrase, base::BindOnce( - &RewardsServiceImpl::OnRecoverWallet, - AsWeakPtr())); -} - -void RewardsServiceImpl::OnRecoverWallet(const ledger::mojom::Result result) { - // Fetch balance after recovering wallet in order to initiate P3A - // stats collection - FetchBalance(base::DoNothing()); - - for (auto& observer : observers_) { - observer.OnRecoverWallet(this, result); - } -} - std::vector RewardsServiceImpl::GetExternalWalletProviders() const { std::vector providers; @@ -3033,15 +3013,6 @@ void RewardsServiceImpl::GetRewardsWallet(GetRewardsWalletCallback callback) { bat_ledger_->GetRewardsWallet(std::move(callback)); } -void RewardsServiceImpl::GetRewardsWalletPassphrase( - GetRewardsWalletPassphraseCallback callback) { - if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), ""); - } - - bat_ledger_->GetRewardsWalletPassphrase(std::move(callback)); -} - bool RewardsServiceImpl::IsBitFlyerRegion() const { return base::Contains(kBitflyerCountries, GetCountryCode()); } diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index 2573812598f..607ce16c063 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -140,11 +140,9 @@ class RewardsServiceImpl : public RewardsService, void ClaimPromotion( const std::string& promotion_id, AttestPromotionCallback callback) override; - void AttestPromotion( - const std::string& promotion_id, - const std::string& solution, - AttestPromotionCallback callback) override; - void RecoverWallet(const std::string& passPhrase) override; + void AttestPromotion(const std::string& promotion_id, + const std::string& solution, + AttestPromotionCallback callback) override; void GetActivityInfoList(const uint32_t start, const uint32_t limit, ledger::mojom::ActivityInfoFilterPtr filter, @@ -337,9 +335,6 @@ class RewardsServiceImpl : public RewardsService, void GetRewardsWallet(GetRewardsWalletCallback callback) override; - void GetRewardsWalletPassphrase( - GetRewardsWalletPassphraseCallback callback) override; - // Testing methods void SetLedgerEnvForTesting(); void PrepareLedgerEnvForTesting(); @@ -454,8 +449,6 @@ class RewardsServiceImpl : public RewardsService, const std::string& token, const bool attestation_passed); - void OnRecoverWallet(const ledger::mojom::Result result); - // ledger::LedgerClient void OnReconcileComplete( const ledger::mojom::Result result, diff --git a/components/brave_rewards/browser/rewards_service_impl_unittest.cc b/components/brave_rewards/browser/rewards_service_impl_unittest.cc index f45d3a0e3fa..f5ee09a5ee7 100644 --- a/components/brave_rewards/browser/rewards_service_impl_unittest.cc +++ b/components/brave_rewards/browser/rewards_service_impl_unittest.cc @@ -39,8 +39,6 @@ class MockRewardsServiceObserver : public RewardsServiceObserver { void(RewardsService*, const ledger::mojom::Result result, const std::vector& list)); - MOCK_METHOD2(OnRecoverWallet, - void(RewardsService*, const ledger::mojom::Result)); MOCK_METHOD3(OnPromotionFinished, void(RewardsService*, const ledger::mojom::Result, diff --git a/components/brave_rewards/browser/rewards_service_observer.h b/components/brave_rewards/browser/rewards_service_observer.h index 83ede48dccb..765383077be 100644 --- a/components/brave_rewards/browser/rewards_service_observer.h +++ b/components/brave_rewards/browser/rewards_service_observer.h @@ -33,9 +33,6 @@ class RewardsServiceObserver : public base::CheckedObserver { const ledger::mojom::Result result, const std::vector& list) {} - virtual void OnRecoverWallet(RewardsService* rewards_service, - const ledger::mojom::Result result) {} - virtual void OnPromotionFinished(RewardsService* rewards_service, const ledger::mojom::Result result, ledger::mojom::PromotionPtr promotion) {} diff --git a/components/brave_rewards/browser/test/rewards_browsertest.cc b/components/brave_rewards/browser/test/rewards_browsertest.cc index c582cc53a10..819ffbefb7a 100644 --- a/components/brave_rewards/browser/test/rewards_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_browsertest.cc @@ -356,8 +356,7 @@ IN_PROC_BROWSER_TEST_F(RewardsBrowserTest, ResetRewards) { rewards_browsertest_util::WaitForElementToAppear(contents(), "#modal"); rewards_browsertest_util::WaitForElementThenClick( - contents(), - "[data-test-id='settings-modal-tabs-2']"); + contents(), "[data-test-id='settings-modal-tabs-1']"); rewards_browsertest_util::WaitForElementToContain( contents(), @@ -378,8 +377,7 @@ IN_PROC_BROWSER_TEST_F(RewardsBrowserTest, ResetRewardsWithBAT) { "#modal"); rewards_browsertest_util::WaitForElementThenClick( - contents(), - "[data-test-id='settings-modal-tabs-2']"); + contents(), "[data-test-id='settings-modal-tabs-1']"); rewards_browsertest_util::WaitForElementToContain( contents(), "[data-test-id='reset-text']", diff --git a/components/brave_rewards/resources/page/actions/rewards_actions.ts b/components/brave_rewards/resources/page/actions/rewards_actions.ts index 250ac199bd5..2f5c99c00cf 100644 --- a/components/brave_rewards/resources/page/actions/rewards_actions.ts +++ b/components/brave_rewards/resources/page/actions/rewards_actions.ts @@ -48,14 +48,6 @@ export const deletePromotion = (promotionId: string) => action(types.DELETE_PROM promotionId }) -export const recoverWallet = (key: string) => action(types.RECOVER_WALLET, { - key -}) - -export const onRecoverWalletData = (result: number) => action(types.ON_RECOVER_WALLET_DATA, { - result -}) - export const onModalBackupClose = () => action(types.ON_MODAL_BACKUP_CLOSE) export const onModalBackupOpen = () => action(types.ON_MODAL_BACKUP_OPEN) @@ -296,14 +288,8 @@ export const onCompleteReset = (success: boolean) => action(types.ON_COMPLETE_RE success }) -export const getPaymentId = () => action(types.GET_PAYMENT_ID) - export const disconnectWalletError = () => action(types.DISCONNECT_WALLET_ERROR) -export const onPaymentId = (paymentId: string) => action(types.ON_PAYMENT_ID, { - paymentId -}) - export const getOnboardingStatus = () => action(types.GET_ONBOARDING_STATUS) export const onOnboardingStatus = (showOnboarding: boolean) => action(types.ON_ONBOARDING_STATUS, { diff --git a/components/brave_rewards/resources/page/actions/rewards_types.ts b/components/brave_rewards/resources/page/actions/rewards_types.ts index 6dbca4f6e44..23c0b8326fc 100644 --- a/components/brave_rewards/resources/page/actions/rewards_types.ts +++ b/components/brave_rewards/resources/page/actions/rewards_types.ts @@ -15,8 +15,6 @@ export const enum types { DELETE_PROMOTION = '@@rewards/DELETE_PROMOTION', ON_PROMOTION_CLAIM_STARTED = '@@rewards/ON_PROMOTION_CLAIM_STARTED', ON_PROMOTION_FINISH = '@@rewards/ON_PROMOTION_FINISH', - RECOVER_WALLET = '@@rewards/RECOVER_WALLET', - ON_RECOVER_WALLET_DATA = '@@rewards/ON_RECOVER_WALLET_DATA', ON_MODAL_BACKUP_CLOSE = '@@rewards/ON_MODAL_BACKUP_CLOSE', ON_MODAL_BACKUP_OPEN = '@@rewards/ON_MODAL_BACKUP_OPEN', ON_CLEAR_ALERT = '@@rewards/ON_CLEAR_ALERT', @@ -86,8 +84,6 @@ export const enum types { ON_INITIALIZED = '@@rewards/ON_INITIALIZED', COMPLETE_RESET = '@@rewards/COMPLETE_RESET', ON_COMPLETE_RESET = '@@rewards/ON_COMPLETE_RESET', - GET_PAYMENT_ID = '@@rewards/GET_PAYMENT_ID', - ON_PAYMENT_ID = '@@rewards/ON_PAYMENT_ID', GET_ONBOARDING_STATUS = '@@rewards/GET_ONBOARDING_STATUS', ON_ONBOARDING_STATUS = '@@rewards/ON_ONBOARDING_STATUS', ENABLE_REWARDS = '@@rewards/ENABLE_REWARDS', diff --git a/components/brave_rewards/resources/page/brave_rewards_page.tsx b/components/brave_rewards/resources/page/brave_rewards_page.tsx index c4df1f4c753..0a2d91094c3 100644 --- a/components/brave_rewards/resources/page/brave_rewards_page.tsx +++ b/components/brave_rewards/resources/page/brave_rewards_page.tsx @@ -60,10 +60,6 @@ function promotions (properties: Rewards.PromotionResponse) { actions.onPromotions(properties) } -function recoverWalletData (result: number) { - actions.onRecoverWalletData(result) -} - function promotionClaimStarted (promotionId: string) { actions.onPromotionClaimStarted(promotionId) } @@ -244,10 +240,6 @@ function completeReset (success: boolean) { actions.onCompleteReset(success) } -function paymentId (paymentId: string) { - actions.onPaymentId(paymentId) -} - function onboardingStatus (result: { showOnboarding: boolean }) { actions.onOnboardingStatus(result.showOnboarding) } @@ -274,7 +266,6 @@ Object.defineProperty(window, 'brave_rewards', { value: { rewardsParameters, promotions, - recoverWalletData, promotionClaimStarted, promotionFinish, reconcileStamp, @@ -314,7 +305,6 @@ Object.defineProperty(window, 'brave_rewards', { countryCode, initialized, completeReset, - paymentId, onboardingStatus, enabledInlineTippingPlatforms, externalWalletLogin, diff --git a/components/brave_rewards/resources/page/components/pageWallet.tsx b/components/brave_rewards/resources/page/components/pageWallet.tsx index 04edec3f969..ddcf2f701fd 100644 --- a/components/brave_rewards/resources/page/components/pageWallet.tsx +++ b/components/brave_rewards/resources/page/components/pageWallet.tsx @@ -8,8 +8,7 @@ import { connect } from 'react-redux' // Components import { ModalActivity, - ModalBackupRestore, - ModalQRCode + ModalBackupReset } from '../../ui/components' import { WalletCard, ExternalWalletAction } from '../../shared/components/wallet_card' import { LayoutKind } from '../lib/layout_context' @@ -23,7 +22,7 @@ import { import { Provider } from '../../ui/components/profile' // Utils -import { getLocale, getLocaleWithTag } from '../../../../common/locale' +import { getLocale } from '../../../../common/locale' import * as rewardsActions from '../actions/rewards_actions' import { convertBalance, isPublisherConnectedOrVerified } from './utils' import { ExtendedActivityRow, SummaryItem, SummaryType } from '../../ui/components/modalActivity' @@ -37,7 +36,6 @@ interface State { modalActivity: boolean modalPendingContribution: boolean modalVerify: boolean - modalQRCode: boolean } interface Props extends Rewards.ComponentProps { @@ -51,8 +49,7 @@ class PageWallet extends React.Component { activeTabId: 0, modalActivity: false, modalPendingContribution: false, - modalVerify: false, - modalQRCode: false + modalVerify: false } } @@ -86,34 +83,11 @@ class PageWallet extends React.Component { }) } - onModalBackupOnRestore = (key: string | MouseEvent) => { - if (typeof key === 'string' && key.length > 0) { - key = this.pullRecoveryKeyFromFile(key) - this.actions.recoverWallet(key) - } - } - onModalBackupOnReset = () => { this.actions.onModalBackupClose() this.actions.completeReset() } - pullRecoveryKeyFromFile = (key: string) => { - let recoveryKey = null - if (key) { - let messageLines = key.match(/^.+$/gm) - if (messageLines) { - let passphraseLine = '' || messageLines[2] - if (passphraseLine) { - const passphrasePattern = new RegExp(['Recovery Key:', '(.+)$'].join(' ')) - recoveryKey = (passphraseLine.match(passphrasePattern) || [])[1] - return recoveryKey - } - } - } - return key - } - onModalActivityToggle = () => { if (!this.state.modalActivity) { this.actions.getMonthlyReport() @@ -166,21 +140,6 @@ class PageWallet extends React.Component { }) } - toggleQRCodeModal = () => { - // If we are opening the QR code panel, then request a payment ID if we do - // not already have one and close the backup/restore modal. - if (!this.state.modalQRCode) { - if (!this.props.rewardsData.paymentId) { - this.actions.getPaymentId() - } - this.actions.onModalBackupClose() - } - - this.setState({ - modalQRCode: !this.state.modalQRCode - }) - } - onModalActivityAction = (action: string, value: string, node: any) => { if (action === 'onMonthChange') { const items = value.split('_') @@ -592,35 +551,6 @@ class PageWallet extends React.Component { return (balance.wallets.blinded || 0) } - getBackupErrorMessage = () => { - const { ui } = this.props.rewardsData - const { walletRecoveryStatus } = ui - - if (walletRecoveryStatus === null) { - return '' - } - - // ledger::mojom::Result::CORRUPTED_DATA - if (walletRecoveryStatus === 17) { - const tags = getLocaleWithTag('walletRecoveryOutdated') - return ( - - {tags.beforeTag} - - {tags.duringTag} - - {tags.afterTag} - - ) - } - - if (walletRecoveryStatus !== 0) { - return getLocale('walletRecoveryFail') - } - - return '' - } - isWalletProviderEnabled = (walletProvider: string) => { const { currentCountryCode, parameters } = this.props.rewardsData const regions = parameters.walletProviderRegions[walletProvider] @@ -677,7 +607,6 @@ class PageWallet extends React.Component { ui, externalWallet, parameters, - paymentId, pendingContributionTotal, pendingContributions } = this.props.rewardsData @@ -725,16 +654,13 @@ class PageWallet extends React.Component { { this.props.layout === 'wide' && } { modalBackup - ? : null } @@ -764,14 +690,6 @@ class PageWallet extends React.Component { ? this.generateMonthlyReport() : null } - { - this.state.modalQRCode - ? - : null - } ) } diff --git a/components/brave_rewards/resources/page/reducers/default_state.ts b/components/brave_rewards/resources/page/reducers/default_state.ts index 65d23207730..7c2a092c7fb 100644 --- a/components/brave_rewards/resources/page/reducers/default_state.ts +++ b/components/brave_rewards/resources/page/reducers/default_state.ts @@ -17,7 +17,6 @@ export function defaultState (): Rewards.State { disconnectWalletError: false, modalBackup: false, modalRedirect: 'hide', - walletRecoveryStatus: null, promosDismissed: {} }, autoContributeList: [], @@ -71,7 +70,6 @@ export function defaultState (): Rewards.State { } }, initializing: true, - paymentId: '', showOnboarding: null, isUnsupportedRegion: false } diff --git a/components/brave_rewards/resources/page/reducers/rewards_reducer.ts b/components/brave_rewards/resources/page/reducers/rewards_reducer.ts index d6644616b77..d7b36ac26fb 100644 --- a/components/brave_rewards/resources/page/reducers/rewards_reducer.ts +++ b/components/brave_rewards/resources/page/reducers/rewards_reducer.ts @@ -69,7 +69,6 @@ const rewardsReducer: Reducer = (state: Rewards.State case types.ON_MODAL_BACKUP_CLOSE: { state = { ...state } let ui = state.ui - ui.walletRecoveryStatus = null ui.modalBackup = false state = { ...state, @@ -446,17 +445,6 @@ const rewardsReducer: Reducer = (state: Rewards.State } break } - case types.GET_PAYMENT_ID: { - chrome.send('brave_rewards.getPaymentId') - break - } - case types.ON_PAYMENT_ID: { - state = { - ...state, - paymentId: action.payload.paymentId - } - break - } case types.GET_ONBOARDING_STATUS: { chrome.send('brave_rewards.getOnboardingStatus') break diff --git a/components/brave_rewards/resources/page/reducers/wallet_reducer.ts b/components/brave_rewards/resources/page/reducers/wallet_reducer.ts index 04f60659bd0..699d933cd5f 100644 --- a/components/brave_rewards/resources/page/reducers/wallet_reducer.ts +++ b/components/brave_rewards/resources/page/reducers/wallet_reducer.ts @@ -4,7 +4,6 @@ import { Reducer } from 'redux' import { types } from '../actions/rewards_types' -import { getCurrentBalanceReport } from './utils' const walletReducer: Reducer = (state: Rewards.State, action) => { if (!state) { @@ -20,25 +19,6 @@ const walletReducer: Reducer = (state: Rewards.State, state.parameters = action.payload.properties break } - case types.RECOVER_WALLET: { - let key = action.payload.key - key = key.trim() - - if (!key || key.length === 0) { - let ui = state.ui - ui.walletRecoveryStatus = 0 - - state = { - ...state, - ui - } - - break - } - - chrome.send('brave_rewards.recoverWallet', [key]) - break - } case types.ON_EXTERNAL_WALLET_PROVIDER_LIST: { if (!action.payload.list) { break @@ -48,27 +28,6 @@ const walletReducer: Reducer = (state: Rewards.State, state.externalWalletProviderList = action.payload.list break } - case types.ON_RECOVER_WALLET_DATA: { - state = { ...state } - const result = action.payload.result - let ui = state.ui - - // TODO NZ check why enum can't be used inside Rewards namespace - ui.walletRecoveryStatus = result - if (result === 0) { - chrome.send('brave_rewards.fetchPromotions') - chrome.send('brave_rewards.fetchBalance') - chrome.send('brave_rewards.getPaymentId') - getCurrentBalanceReport() - ui.modalBackup = false - } - - state = { - ...state, - ui - } - break - } case types.GET_BALANCE_REPORT: { chrome.send('brave_rewards.getBalanceReport', [ action.payload.month, diff --git a/components/brave_rewards/resources/page/stories/redux_state.ts b/components/brave_rewards/resources/page/stories/redux_state.ts index 1d27b53e019..9b7c742e946 100644 --- a/components/brave_rewards/resources/page/stories/redux_state.ts +++ b/components/brave_rewards/resources/page/stories/redux_state.ts @@ -21,7 +21,6 @@ export const reduxState: Rewards.ApplicationState = { disconnectWalletError: false, modalBackup: false, modalRedirect: 'hide', - walletRecoveryStatus: null, promosDismissed: {} }, autoContributeList: [], @@ -131,7 +130,6 @@ export const reduxState: Rewards.ApplicationState = { } }, initializing: false, - paymentId: '', showOnboarding: false } } diff --git a/components/brave_rewards/resources/ui/components/index.ts b/components/brave_rewards/resources/ui/components/index.ts index d5f8d02828c..fbfe1e3ccbe 100644 --- a/components/brave_rewards/resources/ui/components/index.ts +++ b/components/brave_rewards/resources/ui/components/index.ts @@ -14,13 +14,12 @@ import List from './list' import ListToken from './listToken' import MainToggle from './mainToggle' import ModalActivity from './modalActivity' -import ModalBackupRestore from './modalBackupRestore' +import ModalBackupReset from './modalBackupReset' import ModalContribute from './modalContribute' import ModalDonation from './modalDonation' import ModalPending from './modalPending' import ModalRedirect from './modalRedirect' import ModalShowAdsHistory from './modalShowAdsHistory' -import ModalQRCode from './modalQRCode' import NextContribution from './nextContribution' import Profile from './profile' import RestoreSites from './restoreSites' @@ -51,13 +50,12 @@ export { ListToken, MainToggle, ModalActivity, - ModalBackupRestore, + ModalBackupReset, ModalContribute, ModalDonation, ModalPending, ModalRedirect, ModalShowAdsHistory, - ModalQRCode, NextContribution, Profile, RestoreSites, diff --git a/components/brave_rewards/resources/ui/components/modalBackupRestore/__snapshots__/spec.tsx.snap b/components/brave_rewards/resources/ui/components/modalBackupReset/__snapshots__/spec.tsx.snap similarity index 98% rename from components/brave_rewards/resources/ui/components/modalBackupRestore/__snapshots__/spec.tsx.snap rename to components/brave_rewards/resources/ui/components/modalBackupReset/__snapshots__/spec.tsx.snap index 4590154945e..f66f0d5fb3a 100644 --- a/components/brave_rewards/resources/ui/components/modalBackupRestore/__snapshots__/spec.tsx.snap +++ b/components/brave_rewards/resources/ui/components/modalBackupReset/__snapshots__/spec.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ModalBackupRestore tests basic tests matches the snapshot 1`] = ` +exports[`ModalBackupReset tests basic tests matches the snapshot 1`] = `