Merge branch 'trunk' into woomob-692-woo-posbarcodes-scanning-on-the-order-complete-screen-should

Author: joshheald

Modules/Sources/NetworkingCore/Model/Order.swift

@@ -69,6 +69,11 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
     ///
     public let createdVia: String?
 
+    public var salesChannel: SalesChannel? {
+        guard let createdVia else { return nil }
+        return SalesChannel(rawValue: createdVia)
+    }
+
     /// Order struct initializer.
     ///
     public init(siteID: Int64,

Modules/Sources/NetworkingCore/Model/SalesChannel.swift

@@ -0,0 +1,32 @@
+import Foundation
+
+public enum SalesChannel {
+    case pointOfSale
+}
+
+extension SalesChannel: RawRepresentable {
+    public init?(rawValue: String) {
+        switch rawValue {
+        case "pos-rest-api":
+            self = .pointOfSale
+        default:
+            return nil
+        }
+    }
+
+    public var rawValue: String {
+        switch self {
+        case .pointOfSale:
+            return description
+        }
+    }
+
+    public var description: String {
+        switch self {
+        case .pointOfSale:
+            return NSLocalizedString("salesChannel.pos.description",
+                                     value: "POS",
+                                     comment: "The acronym for 'Point of Sale'.")
+        }
+    }
+}

RELEASE-NOTES.txt

@@ -8,6 +8,7 @@
 - [*] Shipping Labels: Fixed a portion of layout issues caused by bigger accessibility content size categories. [https://github.com/woocommerce/woocommerce-ios/pull/15844]
 - [*] Shipping Labels: Enable the confirm button on the payment method sheet even when there are no changes. [https://github.com/woocommerce/woocommerce-ios/pull/15856]
 - [*] POS: start a new cart by scanning a barcode on the payment success screen [https://github.com/woocommerce/woocommerce-ios/pull/15870]
+- [*] Watch app: Fixed connection issue upon fresh install [https://github.com/woocommerce/woocommerce-ios/pull/15867]
 
 22.7
 -----

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -1248,6 +1248,7 @@ enum WooAnalyticsStat: String {
     case watchAppOpened = "watch_app_opened"
     case watchStoreDataSynced = "watch_store_data_synced"
     case watchConnectingOpened = "watch_connecting_opened"
+    case watchSyncingFailed = "watch_syncing_failed"
     case watchMyStoreOpened = "watch_my_store_opened"
     case watchOrdersListOpened = "watch_orders_list_opened"
     case watchPushNotificationTapped = "watch_push_notification_tapped"

WooCommerce/Classes/POS/Presentation/PointOfSaleBarcodeScannerInformationModal.swift

@@ -82,8 +82,9 @@ private extension PointOfSaleBarcodeScannerInformationModal {
             comment: "Accessible version of more details link in barcode info modal, announcing it as a link for screen readers"
         )
         static let barcodeInfoSecondaryMessage = NSLocalizedString(
-            "pos.barcodeInfoModal.secondaryMessage",
-            value: "• Refer to your Bluetooth barcode scanner's instructions to set HID mode.",
+            "pos.barcodeInfoModal.secondaryMessage.2",
+            value: "• Refer to your Bluetooth barcode scanner's instructions to set HID mode. This usually " +
+            "requires scanning a special barcode in the manual.",
             comment: "Secondary bullet point in the barcode info modal in POS, instructing to set scanner to HID mode"
         )
         static let barcodeInfoTertiaryMessage = NSLocalizedString(
@@ -110,8 +111,9 @@ private extension PointOfSaleBarcodeScannerInformationModal {
             comment: "Accessible version of primary bullet point in barcode info modal, without bullet character for screen readers"
         )
         static let barcodeInfoSecondaryMessageAccessible = NSLocalizedString(
-            "pos.barcodeInfoModal.secondaryMessage.accessible",
-            value: "Second: Refer to your Bluetooth barcode scanner's instructions to set H-I-D mode.",
+            "pos.barcodeInfoModal.secondaryMessage.accessible.2",
+            value: "Second: Refer to your Bluetooth barcode scanner's instructions to set H-I-D mode. This usually " +
+            "requires scanning a special barcode in the manual.",
             comment: "Accessible version of secondary bullet point in barcode info modal, without bullet character for screen readers"
         )
         static let barcodeInfoTertiaryMessageAccessible = NSLocalizedString(

WooCommerce/Classes/POS/TabBar/POSIneligibleView.swift

@@ -77,10 +77,6 @@ struct POSIneligibleView: View {
 
     private var suggestionText: String {
         switch reason {
-        case .notTablet:
-            return NSLocalizedString("pos.ineligible.suggestion.notTablet",
-                                     value: "Please use a tablet to access POS features.",
-                                     comment: "Suggestion for not tablet: use iPad")
         case .unsupportedIOSVersion:
             return NSLocalizedString("pos.ineligible.suggestion.unsupportedIOSVersion",
                                      value: "Point of Sale requires iOS 17 or later. Please update your device to iOS 17+ to use this feature.",
@@ -105,16 +101,6 @@ struct POSIneligibleView: View {
             return NSLocalizedString("pos.ineligible.suggestion.featureSwitchSyncFailure",
                                      value: "Try relaunching the app or check your internet connection and try again.",
                                      comment: "Suggestion for feature switch sync failure: relaunch or check connection")
-        case let .unsupportedCountry(supportedCountries):
-            let countryNames = supportedCountries.map { $0.readableCountry }
-            let formattedCountryList = ListFormatter.localizedString(byJoining: countryNames)
-            let format = NSLocalizedString(
-                "pos.ineligible.suggestion.unsupportedCountry",
-                value: "POS is currently only available in %1$@. Check back later for availability in your region.",
-                comment: "Suggestion for unsupported country with list of supported countries. " +
-                "%1$@ is a placeholder for the localized list of supported country names."
-            )
-            return String.localizedStringWithFormat(format, formattedCountryList)
         case let .unsupportedCurrency(supportedCurrencies):
             let currencyList = supportedCurrencies.map { $0.rawValue }
             let formattedCurrencyList = ListFormatter.localizedString(byJoining: currencyList)
@@ -130,10 +116,6 @@ struct POSIneligibleView: View {
             return NSLocalizedString("pos.ineligible.suggestion.siteSettingsNotAvailable",
                                      value: "Check your internet connection and try relaunching the app. If the issue persists, please contact support.",
                                      comment: "Suggestion for site settings unavailable: check connection or contact support")
-        case .featureFlagDisabled:
-            return NSLocalizedString("pos.ineligible.suggestion.featureFlagDisabled",
-                                     value: "POS is currently disabled.",
-                                     comment: "Suggestion for disabled feature flag: notify that POS is disabled remotely")
         case .selfDeallocated:
             return NSLocalizedString("pos.ineligible.suggestion.selfDeallocated",
                                      value: "Try relaunching the app to resolve this issue.",
@@ -176,24 +158,6 @@ private extension POSIneligibleView {
     }
 }
 
-#Preview("Unsupported country") {
-    if #available(iOS 17.0, *) {
-        POSIneligibleView(
-            reason: .unsupportedCountry(supportedCountries: [.US, .GB]),
-            onRefresh: {}
-        )
-    }
-}
-
-#Preview("Not a tablet") {
-    if #available(iOS 17.0, *) {
-        POSIneligibleView(
-            reason: .notTablet,
-            onRefresh: {}
-        )
-    }
-}
-
 #Preview("Unsupported iOS version") {
     if #available(iOS 17.0, *) {
         POSIneligibleView(
@@ -212,15 +176,6 @@ private extension POSIneligibleView {
     }
 }
 
-#Preview("Feature flag disabled") {
-    if #available(iOS 17.0, *) {
-        POSIneligibleView(
-            reason: .featureFlagDisabled,
-            onRefresh: {}
-        )
-    }
-}
-
 #Preview("Feature switch disabled") {
     if #available(iOS 17.0, *) {
         POSIneligibleView(

WooCommerce/Classes/System/WatchDependenciesSynchronizer.swift

@@ -1,6 +1,7 @@
 import WatchConnectivity
 import Combine
 import Networking
+import protocol WooFoundation.Analytics
 import class WooFoundation.CurrencySettings
 
 /// Type that syncs the necessary dependencies to the watch session.
@@ -10,6 +11,8 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
     /// Current WatchKit Session
     private let watchSession: WCSession
 
+    private let analytics: Analytics
+
     /// Subscriptions store for combine publishers
     ///
     private var subscriptions = Set<AnyCancellable>()
@@ -34,16 +37,15 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
     ///
     @Published var account: Account?
 
-    /// Tracks if the current watch session is active or not
-    ///
-    @Published private var isSessionActive: Bool = false
-
     /// Toggle this value to force a credentials sync.
     ///
     @Published private var syncTrigger = false
 
-    init(watchSession: WCSession = WCSession.default, storedDependencies: WatchDependencies?) {
+    init(watchSession: WCSession = WCSession.default,
+         storedDependencies: WatchDependencies?,
+         analytics: Analytics = ServiceLocator.analytics) {
         self.watchSession = watchSession
+        self.analytics = analytics
         super.init()
 
         self.storeID = storedDependencies?.storeID
@@ -80,9 +82,7 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
                 let (storeID, storeName, credentials, currencySettings) = required
                 let (enablesCrashReports, account) = configuration
 
-                guard let storeID, let storeName, let credentials else {
-                    return nil
-                }
+                guard let storeID, let storeName, let credentials else { return nil }
 
                 return .init(storeID: storeID,
                              storeName: storeName,
@@ -95,16 +95,30 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
             .debounce(for: 0.5, scheduler: DispatchQueue.main)
 
         // Syncs the dependencies to the paired counterpart when the session becomes available.
-        Publishers.CombineLatest3(watchDependencies, $isSessionActive, $syncTrigger)
-            .sink { [watchSession] dependencies, isSessionActive, forceSync in
+        watchDependencies.combineLatest($syncTrigger)
+            .sink { [weak self, watchSession] dependencies, forceSync in
 
                 // Do not update the context if the session is not active, the watch is not paired or the watch app is not installed.
-                guard isSessionActive, watchSession.isPaired, watchSession.isWatchAppInstalled else { return }
+                guard watchSession.activationState == .activated,
+                      watchSession.isPaired,
+                      watchSession.isWatchAppInstalled else {
+                    self?.analytics.track(
+                        .watchSyncingFailed,
+                        properties: [
+                            "session_active": watchSession.activationState == .activated,
+                            "session_paired": watchSession.isPaired,
+                            "watch_app_installed": watchSession.isWatchAppInstalled
+                        ],
+                        error: SyncError.watchSessionInactiveOrNotPaired
+                    )
+                    return
+                }
 
                 do {
 
                     // If dependencies is nil, send an empty dictionary. This is most likely a logged out state
                     guard let dependencies else {
+                        self?.analytics.track(.watchSyncingFailed, withError: SyncError.noDependenciesFound)
                         return try watchSession.updateApplicationContext([:])
                     }
 
@@ -118,9 +132,11 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
 
                         try watchSession.updateApplicationContext(jsonObject)
                     } else {
+                        self?.analytics.track(.watchSyncingFailed, withError: SyncError.encodingApplicationContextFailed)
                         DDLogError("⛔️ Unable to encode watch dependencies for synchronization. Resulting object is not a dictionary")
                     }
                 } catch {
+                    self?.analytics.track(.watchSyncingFailed, withError: error)
                     DDLogError("⛔️ Error synchronizing credentials into watch session: \(error)")
                 }
             }
@@ -129,7 +145,6 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
 
     func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {
         DDLogInfo("🔵 WatchSession activated \(activationState)")
-        self.isSessionActive = activationState == .activated
     }
 
     func sessionDidBecomeInactive(_ session: WCSession) {
@@ -138,7 +153,6 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
 
     func sessionDidDeactivate(_ session: WCSession) {
         // Try to guarantee an active session
-        self.isSessionActive = false
         watchSession.activate()
     }
 }
@@ -149,13 +163,12 @@ extension WatchDependenciesSynchronizer {
     /// This is in order to not duplicate tracks configuration which involve quite a lot of information to be transmitted to the watch.
     ///
     func session(_ session: WCSession, didReceiveUserInfo userInfo: [String: Any] = [:]) {
-
         // The user info could contain a track event. Send it if we found one.
         guard let rawEvent = userInfo[WooConstants.watchTracksKey] as? String,
               let analyticEvent = WooAnalyticsStat(rawValue: rawEvent) else {
             return DDLogError("⛔️ Unsupported watch tracks event: \(userInfo)")
         }
-        ServiceLocator.analytics.track(analyticEvent)
+        analytics.track(analyticEvent)
     }
 }
 
@@ -173,7 +186,14 @@ extension WatchDependenciesSynchronizer {
         guard message[WooConstants.watchSyncKey] as? Bool == true else {
             return DDLogError("⛔️ Unsupported sync request message: \(message)")
         }
-
         syncTrigger.toggle()
     }
 }
+
+extension WatchDependenciesSynchronizer {
+    enum SyncError: Error {
+        case watchSessionInactiveOrNotPaired
+        case noDependenciesFound
+        case encodingApplicationContextFailed
+    }
+}