Fix various bugs found through the QA process (#305)

* Showing all time trading rewards * Bump Abacus and fix the rewards learn more link * Use non-staging version of Firebase config for TestFlight build (#302) * Firebase initialization clean up (#303) * BUG2-152 Fixing scroll back in time on price chart. (#304) * BUG2-31 Fix rewards learn more * BUG2-148 Trading rewards for the week, only appear after I view the trading rewards page. * Fixing adjust target leverage receipt not updating * Clean up
dydxprotocol · Nov 25, 2024 · ea03bd9 · ea03bd9
1 parent aa3ff94
commit ea03bd9
Show file tree

Hide file tree

Showing 16 changed files with 110 additions and 103 deletions.
diff --git a/FirebaseStaticInjections/FirebaseStaticInjections/_Configure/FirebaseRunner.swift b/FirebaseStaticInjections/FirebaseStaticInjections/_Configure/FirebaseRunner.swift
@@ -10,18 +10,11 @@ import FirebaseCore
 import FirebaseCrashlytics
 import Utilities
 
-public final class FirebaseRunner: NSObject, SingletonProtocol {
-    public static var optionsFile: String? {
-        didSet {
-            guard oldValue != optionsFile else { return }
-            shared = .init(optionsFile: optionsFile)
-        }
-    }
+public final class FirebaseRunner: NSObject {
+
     public let enabled: Bool
 
-    public private(set) static var shared: FirebaseRunner = {
-        FirebaseRunner(optionsFile: optionsFile)
-    }()
+    public static var shared: FirebaseRunner?
 
     public init(optionsFile: String?) {
         if let optionsFile = optionsFile,
@@ -34,6 +27,7 @@ public final class FirebaseRunner: NSObject, SingletonProtocol {
             FirebaseConfiguration.shared.setLoggerLevel(.min)
             enabled = true
         } else {
+            NSLog("Unable to initialize Firebase for options file: \(optionsFile ?? "")")
             enabled = false
         }
         super.init()

diff --git a/FirebaseStaticInjections/FirebaseStaticInjections/_Notification/FirebaseNotification.swift b/FirebaseStaticInjections/FirebaseStaticInjections/_Notification/FirebaseNotification.swift
@@ -28,7 +28,7 @@ public class FirebaseNotificationHandler: NotificationHandler {
             if token != oldValue {
                 updateAssociation()
                 if let token = token {
-                    Console.shared.log("Firebase registration token: \(token)")
+                    NSLog("Firebase registration token: \(token)")
                 }
                 switch Installation.source {
                 case .debug, .testFlight:
@@ -44,7 +44,6 @@ public class FirebaseNotificationHandler: NotificationHandler {
         self.tag = tag
         super.init()
 
-        _ = FirebaseRunner.shared
         Messaging.messaging().delegate = self
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
             self?.token = Messaging.messaging().fcmToken

diff --git a/Shared/CommonAppDelegate.swift b/Shared/CommonAppDelegate.swift
@@ -89,20 +89,21 @@ open class CommonAppDelegate: ParticlesAppDelegate {
 
     open func useProductionFirebase() -> Bool {
         switch Installation.source {
-        case .debug, .testFlight, .jailBroken: return false
-        case .appStore: return true
+        case .debug, .jailBroken: return false
+        case .appStore, .testFlight: return true
         }
     }
 
     open func injectFirebase() {
         Console.shared.log("injectFirebase")
+        let optionsFile: String
         if useProductionFirebase() {
-            FirebaseRunner.optionsFile = "GoogleService-Info"
+            optionsFile = "GoogleService-Info"
         } else {
-            FirebaseRunner.optionsFile = "GoogleService-Info-Staging"
+            optionsFile = "GoogleService-Info-Staging"
         }
-        _ = FirebaseRunner.shared
-        if FirebaseRunner.shared.enabled {
+        FirebaseRunner.shared = FirebaseRunner(optionsFile: optionsFile)
+        if FirebaseRunner.shared?.enabled ?? false  {
             add(tracking: FirebaseTracking())
             add(errorLogging: CrashlyticsErrorLogging())
         }
@@ -181,10 +182,10 @@ open class CommonAppDelegate: ParticlesAppDelegate {
     }
 
     override open func startup(completion: @escaping () -> Void) {
-        injectNotificationHandler()
         injectURLHandler()
         super.startup { [weak self] in
             self?.injectNotification()
+            self?.injectNotificationHandler()
             completion()
         }
     }

diff --git a/dydx/Podfile.lock b/dydx/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Abacus (1.13.32)
+  - Abacus (1.13.33)
   - AmplitudeSwift (1.10.6):
     - AnalyticsConnector (~> 1.0.1)
   - AnalyticsConnector (1.0.3)
@@ -382,7 +382,7 @@ CHECKOUT OPTIONS:
     :git: https://github.com/dydxprotocol/Charts.git
 
 SPEC CHECKSUMS:
-  Abacus: 7dbb761660678bc7fce87674e112f7d69356a8d3
+  Abacus: bf913dcbe8c9aa6e4c0201c9874e31ddff38e0ea
   AmplitudeSwift: 421c075d47e24bcf843024c853460f0769aeac2f
   AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9
   AppsFlyerFramework: ad7ff0d22aa36c7f8cc4f71a5424e19b89ccb8ae

diff --git a/dydx/Pods/Local Podspecs/abacus.podspec.json b/dydx/Pods/Local Podspecs/abacus.podspec.json
diff --git a/dydx/Pods/Manifest.lock b/dydx/Pods/Manifest.lock
diff --git a/dydx/Pods/Pods.xcodeproj/project.pbxproj b/dydx/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...enters/dydxPresenters/_v4/MarketInfo/Components/dydxMarketPriceCandlesViewPresenter.swift b/...enters/dydxPresenters/_v4/MarketInfo/Components/dydxMarketPriceCandlesViewPresenter.swift
@@ -208,9 +208,11 @@ class dydxMarketPriceCandlesViewPresenter: HostedViewPresenter<dydxMarketPriceCa
                         CandleDataPoint(candle: candle, resolution: resolution.key)
                     }
 
-            listInteractor.list = []        // Needed to ensure the chart reloads properly
-            listInteractor.list = candleDataPoints
-        } else {
+            if listInteractor.list as? [CandleDataPoint] != candleDataPoints {
+                listInteractor.list = []        // Needed to ensure the chart reloads properly
+                listInteractor.list = candleDataPoints
+            }
+         } else {
             listInteractor.list = []
         }
     }