Fix #7837: Don't initialize ads with wallet info when rewards is not …

…enabled (#7884) Bump brave-core to 1.57.47 Co-authored-by: Kyle Hickinson <[email protected]>
brave · Aug 16, 2023 · 8334b9a · 8334b9a
1 parent fea59db
commit 8334b9a
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -347,7 +347,7 @@ public class BrowserViewController: UIViewController {
       if rewards.isEnabled {
         rewards.startLedgerService(nil)
       } else {
-        rewards.ads.initialize(walletInfo: .init()) { _ in }
+        rewards.ads.initialize() { _ in }
       }
     }
 

diff --git a/Sources/Brave/Frontend/Browser/New Tab Page/NewTabPageViewController.swift b/Sources/Brave/Frontend/Browser/New Tab Page/NewTabPageViewController.swift
@@ -588,7 +588,7 @@ class NewTabPageViewController: UIViewController {
       Preferences.BraveNews.userOptedIn.value = true
       Preferences.BraveNews.isShowingOptIn.value = false
       Preferences.BraveNews.isEnabled.value = true
-      rewards.ads.initialize(walletInfo: .init()) { [weak self] _ in
+      rewards.ads.initialize() { [weak self] _ in
         // Initialize ads if it hasn't already been done
         self?.loadFeedContents()
       }

diff --git a/Sources/Brave/Frontend/Rewards/BraveRewards.swift b/Sources/Brave/Frontend/Rewards/BraveRewards.swift
@@ -83,7 +83,7 @@ public class BraveRewards: NSObject {
           recoverySeed: Data(seed).base64EncodedString()
         )
       }
-      self.ads.initialize(walletInfo: walletInfo ?? .init()) { success in
+      self.ads.initialize(walletInfo: walletInfo) { success in
         if !success {
           self.isAdsInitialized = false
         } else {
@@ -168,7 +168,7 @@ public class BraveRewards: NSObject {
           at: configuration.storageURL.appendingPathComponent("ads")
         )
         if ads.isEnabled {
-          ads.initialize(walletInfo: .init()) { _ in }
+          ads.initialize() { _ in }
         }
       }
     }

diff --git a/Sources/BraveNews/Customize/NewsSettingsView.swift b/Sources/BraveNews/Customize/NewsSettingsView.swift
@@ -271,7 +271,7 @@ public struct NewsSettingsView: View {
       OptInView { @MainActor in
         Preferences.BraveNews.isShowingOptIn.value = false
         // Initialize ads if it hasn't already been done
-        await dataSource.ads?.initialize(walletInfo: .init())
+        await dataSource.ads?.initialize()
         if dataSource.isSourcesExpired {
           await withCheckedContinuation { c in
             dataSource.load {

diff --git a/Sources/BraveShared/Extensions/BraveAdsExtensions.swift b/Sources/BraveShared/Extensions/BraveAdsExtensions.swift
@@ -9,7 +9,7 @@ import Shared
 import UIKit
 
 extension BraveAds {
-  public func initialize(walletInfo: BraveAds.WalletInfo, completion: @escaping (Bool) -> Void) {
+  public func initialize(walletInfo: BraveAds.WalletInfo? = nil, completion: @escaping (Bool) -> Void) {
     self.initialize(
       with: .init(deviceId: UIDevice.current.identifierForVendor?.uuidString ?? ""),
       buildChannelInfo: .init(
@@ -22,7 +22,7 @@ extension BraveAds {
   }
 
   @discardableResult
-  @MainActor public func initialize(walletInfo: BraveAds.WalletInfo) async -> Bool {
+  @MainActor public func initialize(walletInfo: BraveAds.WalletInfo? = nil) async -> Bool {
     await withCheckedContinuation { c in
       self.initialize(walletInfo: walletInfo) { success in
         c.resume(returning: success)

diff --git a/Sources/BraveWallet/Preview Content/MockBraveWalletService.swift b/Sources/BraveWallet/Preview Content/MockBraveWalletService.swift
@@ -239,5 +239,9 @@ class MockBraveWalletService: BraveWalletBraveWalletService {
   func discoverEthAllowances(_ completion: @escaping ([BraveWallet.AllowanceInfo]) -> Void) {
     completion([])
   }
+
+  func convertFevm(toFvmAddress isMainnet: Bool, fevmAddresses: [String], completion: @escaping ([String: String]) -> Void) {
+    completion([:])
+  }
 }
 #endif
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   "license": "MPL-2.0",
   "dependencies": {
     "@mozilla/readability": "^0.4.2",
-    "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.57.42/brave-core-ios-1.57.42.tgz",
+    "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.57.47/brave-core-ios-1.57.47.tgz",
     "leo-sf-symbols": "github:brave/leo-sf-symbols#992b64e89da8195041382804337bda9599cfdbf9",
     "page-metadata-parser": "^1.1.3",
     "webpack-cli": "^4.8.0"