Merge branch 'trunk' into issue/8289-show-processing-directly-after-collect-payment

Author: joshheald

Podfile

@@ -35,7 +35,7 @@ end
 
 def wordpress_kit
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressKit', '~> 4.49.0'
+  pod 'WordPressKit', '~> 5.0.0'
   # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
 end
 
@@ -71,12 +71,12 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 4.3.0'
-#   pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
+  pod 'WordPressAuthenticator', '~> 5.0.0'
+  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 
-  pod 'WordPressShared', '~> 1.15'
+  pod 'WordPressShared', '~> 2.0-beta'
 
   pod 'WordPressUI', '~> 1.12.5'
   # pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => ''

Podfile.lock

@@ -15,9 +15,6 @@ PODS:
   - CocoaLumberjack/Core (3.7.4)
   - CocoaLumberjack/Swift (3.7.4):
     - CocoaLumberjack/Core
-  - FormatterKit/Resources (1.9.0)
-  - FormatterKit/TimeIntervalFormatter (1.9.0):
-    - FormatterKit/Resources
   - GoogleSignIn (6.0.2):
     - AppAuth (~> 1.4)
     - GTMAppAuth (~> 1.0)
@@ -42,29 +39,25 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (4.3.0):
-    - CocoaLumberjack (~> 3.5)
+  - WordPressAuthenticator (5.0.0):
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
-    - WordPressKit (~> 4.18-beta)
-    - WordPressShared (~> 1.12-beta)
+    - WordPressKit (~> 5.0-beta)
+    - WordPressShared (~> 2.0-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.49.0):
+  - WordPressKit (5.0.0):
     - Alamofire (~> 4.8.0)
-    - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
-    - WordPressShared (~> 1.15-beta)
+    - WordPressShared (~> 2.0-beta)
     - wpxmlrpc (~> 0.9)
-  - WordPressShared (1.16.1):
-    - CocoaLumberjack (~> 3.4)
-    - FormatterKit/TimeIntervalFormatter (~> 1.8)
+  - WordPressShared (2.0.0-beta.2)
   - WordPressUI (1.12.5)
   - Wormholy (1.6.5)
   - WPMediaPicker (1.8.1)
-  - wpxmlrpc (0.9.0)
+  - wpxmlrpc (0.10.0)
   - XLPagerTabStrip (9.0.0)
   - ZendeskCommonUISDK (6.1.1)
   - ZendeskCoreSDK (2.5.1)
@@ -91,9 +84,9 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.14)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 4.3.0)
-  - WordPressKit (~> 4.49.0)
-  - WordPressShared (~> 1.15)
+  - WordPressAuthenticator (~> 5.0.0)
+  - WordPressKit (~> 5.0.0)
+  - WordPressShared (~> 2.0-beta)
   - WordPressUI (~> 1.12.5)
   - Wormholy (~> 1.6.5)
   - WPMediaPicker (~> 1.8.1)
@@ -108,7 +101,6 @@ SPEC REPOS:
     - AppAuth
     - Automattic-Tracks-iOS
     - CocoaLumberjack
-    - FormatterKit
     - GoogleSignIn
     - Gridicons
     - GTMAppAuth
@@ -145,7 +137,6 @@ SPEC CHECKSUMS:
   AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add
   Automattic-Tracks-iOS: 63e55654f500b3e8fb35087e64575e00d12eb2f5
   CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
-  FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
   GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
   Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
   GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
@@ -162,13 +153,13 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: fd1084278edc077c48026c9080a1d9b0ca9c2304
-  WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
-  WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
+  WordPressAuthenticator: 0cdf1bff75bd3f58fe733d6457221f27bbbdc9f4
+  WordPressKit: 202f529323b079a344f7bc1493b7ebebfd9ed4b5
+  WordPressShared: 04403b43f821c4ed2b84a2112ef9f64f1e7cdceb
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
   Wormholy: 3252bc3e55a1847ef9a0976c1377bd77bf3635fa
   WPMediaPicker: 9011a0ec1f468c039af7485c244576b4c9889a0f
-  wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
+  wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
   XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5
   ZendeskCommonUISDK: 5808802951ad2bb424f0bed4259dc3c0ce9b52ec
   ZendeskCoreSDK: 19a18e5ef2edcb18f4dbc0ea0d12bd31f515712a
@@ -178,6 +169,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: d57f522b14409f38c9fb733afac389ebebdb3ffd
+PODFILE CHECKSUM: 163bea8d6c3d10366ec3df45e35730da367abaa8
 
 COCOAPODS: 1.11.3

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 
 11.6
 -----
+- [***] We added a new Analytics Hub inside the My Store area of the app. Simply click on the See More button under the store stats to check more detailed information on Revenue, Orders and Products. [https://github.com/woocommerce/woocommerce-ios/pull/8356]
 - [*] In-Person Payments: fixed timing issues in payments flow, which caused "Remove card" to be shown for too long [https://github.com/woocommerce/woocommerce-ios/pull/8351]
 
 11.5

WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift

@@ -1773,3 +1773,31 @@ extension WooAnalyticsEvent {
         }
     }
 }
+
+// MARK: - Analytics Hub
+//
+extension WooAnalyticsEvent {
+    enum AnalyticsHub {
+        enum Keys: String {
+            case option
+        }
+
+        /// Tracks when the "See more" button is tapped in My Store, to open the Analytics Hub.
+        ///
+        static func seeMoreAnalyticsTapped() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .dashboardSeeMoreAnalyticsTapped, properties: [:])
+        }
+
+        /// Tracks when the date range selector button is tapped.
+        ///
+        static func dateRangeButtonTapped() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .analyticsHubDateRangeButtonTapped, properties: [:])
+        }
+
+        /// Tracks when a date range option is selected like “today”, “yesterday”, or “custom”.
+        ///
+        static func dateRangeOptionSelected(_ option: String) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .analyticsHubDateRangeOptionSelected, properties: [Keys.option.rawValue: option])
+        }
+    }
+}

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -130,6 +130,7 @@ public enum WooAnalyticsStat: String {
     case dashboardPulledToRefresh = "dashboard_pulled_to_refresh"
     case dashboardNewOrdersButtonTapped = "dashboard_unfulfilled_orders_button_tapped"
     case dashboardShareStoreButtonTapped = "dashboard_share_your_store_button_tapped"
+    case dashboardSeeMoreAnalyticsTapped = "dashboard_see_more_analytics_tapped"
 
     // MARK: Dashboard Data/Action Events
     //
@@ -149,6 +150,11 @@ public enum WooAnalyticsStat: String {
     case dashboardNewStatsRevertedBannerLearnMoreTapped = "dashboard_new_stats_reverted_banner_learn_more_tapped"
     case usedAnalytics = "used_analytics"
 
+    // MARK: Analytics Hub Events
+    //
+    case analyticsHubDateRangeButtonTapped = "analytics_hub_date_range_button_tapped"
+    case analyticsHubDateRangeOptionSelected = "analytics_hub_date_range_option_selected"
+
     // MARK: Products Onboarding Events
     //
     case productsOnboardingEligible = "products_onboarding_store_is_eligible"

WooCommerce/Classes/AppDelegate.swift

@@ -54,6 +54,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Setup Components
         setupAnalytics()
         setupCocoaLumberjack()
+        setupLibraryLogger()
         setupLogLevel(.verbose)
         setupPushNotificationsManagerIfPossible()
         setupAppRatingManager()
@@ -276,12 +277,19 @@ private extension AppDelegate {
         DDLog.add(logger)
     }
 
-    /// Sets up the current Log Leve.
+    /// Sets up loggers for WordPress libraries
+    ///
+    func setupLibraryLogger() {
+        let logger = ServiceLocator.wordPressLibraryLogger
+        WPSharedSetLoggingDelegate(logger)
+        WPAuthenticatorSetLoggingDelegate(logger)
+        WPKitSetLoggingDelegate(logger)
+    }
+
+    /// Sets up the current Log Level.
     ///
     func setupLogLevel(_ level: DDLogLevel) {
-        WPSharedSetLoggingLevel(level)
-        WPAuthenticatorSetLoggingLevel(level)
-        WPKitSetLoggingLevel(level)
+        CocoaLumberjack.dynamicLogLevel = level
     }
 
     /// Setup: Notice Presenter

WooCommerce/Classes/JustInTimeMessages/JustInTimeMessagesProvider.swift

@@ -0,0 +1,59 @@
+import Foundation
+import Yosemite
+
+enum JustInTimeMessagesSourceScreen {
+    case dashboard
+}
+
+/// Provides the Just in Time Messages content for a given source screen and site. It also tracks the requests success or error.
+///
+final class JustInTimeMessagesProvider {
+    private let stores: StoresManager
+    private let analytics: Analytics
+    private let appScreenJitmSourceMapping: [JustInTimeMessagesSourceScreen: String] = [.dashboard: "my_store"]
+
+    init(stores: StoresManager = ServiceLocator.stores,
+         analytics: Analytics = ServiceLocator.analytics) {
+        self.stores = stores
+        self.analytics = analytics
+    }
+
+    func loadMessage(for screen: JustInTimeMessagesSourceScreen, siteID: Int64) async throws -> JustInTimeMessageAnnouncementCardViewModel? {
+        guard let source = appScreenJitmSourceMapping[screen] else {
+            DDLogInfo("Could not load JITM for \(screen) because there is no mapping for the given screen")
+            return nil
+        }
+
+        return try await withCheckedThrowingContinuation { continuation in
+            let action = JustInTimeMessageAction.loadMessage(
+                siteID: siteID,
+                screen: source,
+                hook: .adminNotices) { [weak self] result in
+                    guard let self = self else { return }
+                    switch result {
+                    case let .success(messages):
+                        guard let message = messages.first else {
+                            return continuation.resume(returning: nil)
+                        }
+                        self.analytics.track(event:
+                                .JustInTimeMessage.fetchSuccess(source: source,
+                                                                messageID: message.messageID,
+                                                                count: Int64(messages.count)))
+                        let viewModel = JustInTimeMessageAnnouncementCardViewModel(
+                            justInTimeMessage: message,
+                            screenName: source,
+                            siteID: siteID)
+                        continuation.resume(returning: viewModel)
+                    case let .failure(error):
+                        self.analytics.track(event:
+                                .JustInTimeMessage.fetchFailure(source: source,
+                                                                error: error))
+                        continuation.resume(throwing: error)
+                    }
+                }
+            Task { @MainActor in
+                stores.dispatch(action)
+            }
+        }
+    }
+}

WooCommerce/Classes/ServiceLocator/ServiceLocator.swift

@@ -5,6 +5,7 @@ import Storage
 import Yosemite
 import Hardware
 import WooFoundation
+import WordPressShared
 
 /// Provides global dependencies.
 ///
@@ -179,6 +180,9 @@ final class ServiceLocator {
         return _fileLogger
     }
 
+    /// Provides an instance of `WordPressLoggingDelegate` for logging in WordPress libraries.
+    static let wordPressLibraryLogger: WordPressLoggingDelegate = WordPressLibraryLogger()
+
     /// Provides the access point to the CrashLogger
     /// - Returns: An implementation
     static var crashLogging: CrashLoggingStack {

WooCommerce/Classes/ServiceLocator/WordPressLibraryLogger.swift

@@ -0,0 +1,25 @@
+import CocoaLumberjack
+import WordPressShared
+
+class WordPressLibraryLogger: NSObject, WordPressLoggingDelegate {
+
+    func logError(_ str: String) {
+        DDLogError(str)
+    }
+
+    func logWarning(_ str: String) {
+        DDLogWarn(str)
+    }
+
+    func logInfo(_ str: String) {
+        DDLogInfo(str)
+    }
+
+    func logDebug(_ str: String) {
+        DDLogDebug(str)
+    }
+
+    func logVerbose(_ str: String) {
+        DDLogVerbose(str)
+    }
+}

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalScanningForReader.swift

@@ -21,8 +21,6 @@ final class CardPresentModalScanningForReader: CardPresentPaymentsModalViewModel
 
     let auxiliaryButtonTitle: String? = nil
 
-    let auxiliaryButtonimage: UIImage? = .infoOutlineImage
-
     var auxiliaryAttributedButtonTitle: NSAttributedString? {
         let result = NSMutableAttributedString(
             string: .localizedStringWithFormat(