Uplift of #13554 (squashed) to beta

brave · Jun 14, 2022 · 411a962 · 411a962
1 parent c144448
commit 411a962
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/browser/brave_wallet/keyring_service_unittest.cc b/browser/brave_wallet/keyring_service_unittest.cc
@@ -2821,10 +2821,14 @@ TEST_F(KeyringServiceUnitTest, AddFilecoinAccounts) {
  KeyringService service(json_rpc_service(), GetPrefs());
  {
  ASSERT_TRUE(CreateWallet(&service, "brave"));
-
+#if BUILDFLAG(IS_ANDROID)
  ASSERT_FALSE(AddAccount(&service, "FIL account1", mojom::CoinType::FIL));
+#else
+ ASSERT_TRUE(AddAccount(&service, "FIL account1", mojom::CoinType::FIL));
+#endif
  service.Reset();
  }
+
  base::test::ScopedFeatureList feature_list{
  features::kBraveWalletFilecoinFeature};
 
@@ -3059,11 +3063,12 @@ TEST_F(KeyringServiceUnitTest, PreCreateEncryptors) {
  KeyringService service(json_rpc_service(), GetPrefs());
  ASSERT_TRUE(CreateWallet(&service, "brave"));
  EXPECT_NE(service.encryptors_.at(mojom::kDefaultKeyringId), nullptr);
- EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId));
 #if BUILDFLAG(IS_ANDROID)
  EXPECT_FALSE(service.encryptors_.contains(mojom::kSolanaKeyringId));
+ EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId));
 #else
  EXPECT_NE(service.encryptors_.at(mojom::kSolanaKeyringId), nullptr);
+ EXPECT_NE(service.encryptors_.at(mojom::kFilecoinKeyringId), nullptr);
 #endif
  }
  {
@@ -3085,11 +3090,12 @@ TEST_F(KeyringServiceUnitTest, PreCreateEncryptors) {
  KeyringService service(json_rpc_service(), GetPrefs());
  ASSERT_TRUE(CreateWallet(&service, "brave"));
  EXPECT_NE(service.encryptors_.at(mojom::kDefaultKeyringId), nullptr);
- EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId));
 #if BUILDFLAG(IS_ANDROID)
  EXPECT_FALSE(service.encryptors_.contains(mojom::kSolanaKeyringId));
+ EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId));
 #else
  EXPECT_NE(service.encryptors_.at(mojom::kSolanaKeyringId), nullptr);
+ EXPECT_NE(service.encryptors_.at(mojom::kFilecoinKeyringId), nullptr);
 #endif
  service.Lock();
  base::test::ScopedFeatureList feature_list;
@@ -3116,11 +3122,12 @@ TEST_F(KeyringServiceUnitTest, PreCreateEncryptors) {
  ASSERT_TRUE(
  RestoreWallet(&service, *mnemonic_to_be_restored, "brave", false));
  EXPECT_NE(service.encryptors_.at(mojom::kDefaultKeyringId), nullptr);
- EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId));
 #if BUILDFLAG(IS_ANDROID)
  EXPECT_FALSE(service.encryptors_.contains(mojom::kSolanaKeyringId));
+ EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId));
 #else
  EXPECT_NE(service.encryptors_.at(mojom::kSolanaKeyringId), nullptr);
+ EXPECT_NE(service.encryptors_.at(mojom::kFilecoinKeyringId), nullptr);
 #endif
 
  base::test::ScopedFeatureList feature_list;

diff --git a/components/brave_wallet/common/features.cc b/components/brave_wallet/common/features.cc
@@ -14,7 +14,12 @@ namespace features {
 const base::Feature kNativeBraveWalletFeature{"NativeBraveWallet",
  base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kBraveWalletFilecoinFeature{
- "BraveWalletFilecoin", base::FEATURE_DISABLED_BY_DEFAULT};
+#if BUILDFLAG(IS_ANDROID)
+ "BraveWalletFilecoin", base::FEATURE_DISABLED_BY_DEFAULT
+#else
+ "BraveWalletFilecoin", base::FEATURE_ENABLED_BY_DEFAULT
+#endif
+};
 
 const base::Feature kBraveWalletSolanaFeature{
 #if BUILDFLAG(IS_ANDROID)