Fix #2959, Fix #2954: Update Rewards lib to fix rewards initializations

brave · Oct 14, 2020 · b0a55ae · b0a55ae
1 parent 3e29e42
commit b0a55ae
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/BraveRewards/BraveRewards.dSYM.zip b/BraveRewards/BraveRewards.dSYM.zip
diff --git a/BraveRewards/BraveRewards.framework/BraveRewards b/BraveRewards/BraveRewards.framework/BraveRewards
diff --git a/BraveRewards/BraveRewards.framework/Headers/BATBraveAds.h b/BraveRewards/BraveRewards.framework/Headers/BATBraveAds.h
@@ -131,8 +131,8 @@ NS_SWIFT_NAME(BraveAds)
 - (void)reportAdNotificationEvent:(NSString *)notificationUuid
                         eventType:(BATAdNotificationEventType)eventType;
 
-/// Update ad totals on month roll over, optionally reconcile with server
-- (void)updateAdRewards:(BOOL)shouldReconcile;
+/// Reconcile ad rewards with server
+- (void)reconcileAdRewards;
 
 /// Get the number of ads received and the estimated earnings of viewing said ads for this cycle
 - (void)detailsForCurrentCycle:(void (^)(NSInteger adsReceived, double estimatedEarnings, NSDate * _Nullable nextPaymentDate))completion NS_SWIFT_NAME(detailsForCurrentCycle(_:));

diff --git a/BraveRewards/BraveRewards.framework/Headers/BATBraveLedger.h b/BraveRewards/BraveRewards.framework/Headers/BATBraveLedger.h
@@ -87,6 +87,9 @@ NS_SWIFT_NAME(BraveLedger)
 /// Creates a cryptocurrency wallet
 - (void)createWallet:(nullable void (^)(NSError * _Nullable error))completion;
 
+/// Get the brave wallet's payment ID and seed for ads confirmations
+- (void)currentWalletInfo:(void (^)(NSString *_Nullable paymentId, NSString *_Nullable seed))completion;
+
 /// Get parameters served from the server
 - (void)getRewardsParameters:(nullable void (^)(BATRewardsParameters * _Nullable))completion;
 

diff --git a/BraveRewards/BraveRewards.resolved b/BraveRewards/BraveRewards.resolved
@@ -1,4 +1,4 @@
 build: Release
-brave-browser: 1.15.x (00602b4f9ba575752538a0ad32c4ceb99583d312)
-brave-core: 1.15.x (c6ab6d295a8a3d57d6ffb5b5a0ec6ef28cba1f52)
-  latest tag: v1.15.73
+brave-browser: 1.15.x (dae7941496593dd747ca2618bdccaa82f4a4c423)
+brave-core: 1.15.x (b366ad1270da73b5cadfa13614b3d6608b2761ee)
+  latest tag: v1.15.74
diff --git a/BraveRewardsUI/Settings/SettingsViewController.swift b/BraveRewardsUI/Settings/SettingsViewController.swift
@@ -41,7 +41,7 @@ class SettingsViewController: UIViewController {
 
     preferredContentSize = CGSize(width: RewardsUX.preferredPanelSize.width, height: 750)
 
-    state.ads.updateAdRewards(false)
+    state.ads.reconcileAdRewards()
 
     settingsView.do {
       $0.rewardsToggleSection.toggleSwitch.addTarget(self, action: #selector(rewardsSwitchValueChanged), for: .valueChanged)