Merge branch 'trunk' into task/hide-cart-images-when-the-view-is-too-narrow

Author: joshheald

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 21.6
+Experience a refreshed WooCommerce app with an updated look that aligns with our new branding! We’ve also improved payment reliability—card reader updates now handle low battery issues better, and errors during payments and refunds are managed more smoothly. Enjoy a more seamless and polished experience in every transaction.
+
 ## 21.5
 Get ready for a smoother WooCommerce experience! This update brings smarter AI-powered product previews, instant dashboard stats, and improved email receipts for failed payments. We’ve also fine-tuned order creation, enhanced Jetpack setups, and enabled previews for coming-soon stores. Plus, we’ve addressed navigation, database recovery, and streamlined workflows.
 

Podfile

@@ -91,9 +91,9 @@ 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', '~> 9.10.1'
+  pod 'WordPressAuthenticator', '~> 9.10.2'
   # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
-  pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: 'e5247b2d9bdb522c5d210dd6b66d58a4013eed99'
+  # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: 'e5247b2d9bdb522c5d210dd6b66d58a4013eed99'
   # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'
 
   wordpress_shared

Podfile.lock

@@ -24,7 +24,7 @@ PODS:
   - WordPress-Aztec-iOS (1.19.10)
   - WordPress-Editor-iOS (1.19.10):
     - WordPress-Aztec-iOS (= 1.19.10)
-  - WordPressAuthenticator (9.10.1):
+  - WordPressAuthenticator (9.10.2):
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
@@ -67,14 +67,16 @@ DEPENDENCIES:
   - StripeTerminal (~> 3.9.1)
   - SwiftLint (= 0.54.0)
   - WordPress-Editor-iOS (~> 1.19)
-  - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `e5247b2d9bdb522c5d210dd6b66d58a4013eed99`)
+  - WordPressAuthenticator (~> 9.10.2)
   - WordPressShared (~> 2.1)
   - WordPressUI (~> 1.15)
   - Wormholy (~> 1.6.6)
   - WPMediaPicker (~> 1.8)
   - ZendeskSupportSDK (~> 9.0.0)
 
 SPEC REPOS:
+  https://github.com/wordpress-mobile/cocoapods-specs.git:
+    - WordPressAuthenticator
   trunk:
     - Alamofire
     - Automattic-Tracks-iOS
@@ -107,16 +109,6 @@ SPEC REPOS:
     - ZendeskSupportProvidersSDK
     - ZendeskSupportSDK
 
-EXTERNAL SOURCES:
-  WordPressAuthenticator:
-    :commit: e5247b2d9bdb522c5d210dd6b66d58a4013eed99
-    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
-
-CHECKOUT OPTIONS:
-  WordPressAuthenticator:
-    :commit: e5247b2d9bdb522c5d210dd6b66d58a4013eed99
-    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
-
 SPEC CHECKSUMS:
   Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
   Automattic-Tracks-iOS: 2d4bee68ff9db4d51f2f6c9fc85857dc69a008a4
@@ -135,7 +127,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
   WordPress-Aztec-iOS: 8eaa928fb3a5694924ed3befac64beaae5656e12
   WordPress-Editor-iOS: 98ce1fc542c3a09e48ddc9423405b1d1e48240f1
-  WordPressAuthenticator: d54323ca733b41b10a7fd64f5d1ca2d9efc47720
+  WordPressAuthenticator: 29baee176dea1dc0d414a9086723cabc54cb20f7
   WordPressKit: faf8c6de7c2acfe71cf95b4db896901060967089
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 700e3ec5a9f77b6920c8104c338c85788036ab3c
@@ -150,6 +142,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 281acf2bb731d2a67f913cfe653ed0da9f5b2f42
   ZendeskSupportSDK: b512cfc74b6bf8490e589f02cf52e27ed4f2bebe
 
-PODFILE CHECKSUM: a5c6ecec21ce4254ca5a1f247b0b6aee18153139
+PODFILE CHECKSUM: 85b59bc018f0afba2a57464d12a00fce1deaa13c
 
 COCOAPODS: 1.16.2

README.md

@@ -1,6 +1,6 @@
 
 
-<h1 align="center"><img src="docs/images/logo-woocommerce.svg" width="300"><br>for iOS</h1>
+<h1 align="center"><img src="docs/images/logo-woo.svg" width="300"><br>for iOS</h1>
 
 <p align="center">A Jetpack-powered companion app for WooCommerce.</p>
 

RELEASE-NOTES.txt

@@ -1,5 +1,11 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final IPA before release (e.g. major library or OS update).
+21.7
+-----
+- [*] Product Details: Display cover tag on the first product image [https://github.com/woocommerce/woocommerce-ios/pull/15041]
+- [*] Payments: Update learn more links to open Stripe-specific docs when using that gateway [https://github.com/woocommerce/woocommerce-ios/pull/15035]
+- [x] Now, usernames and emails in text fields across multiple login views are no longer capitalized. [https://github.com/woocommerce/woocommerce-ios/pull/15002]
+
 21.6
 -----
 - [*] Payments: improve retry handling when card reader updates fail due to low battery [https://github.com/woocommerce/woocommerce-ios/pull/14990]

WooCommerce/Classes/Analytics/TracksProvider.swift

@@ -12,6 +12,12 @@ public class TracksProvider: NSObject, AnalyticsProvider {
         tracksService.eventNamePrefix = Constants.eventNamePrefix
         return tracksService
     }()
+
+    private static var isPOSModeActive: Bool = false
+
+    public static func setPOSMode(_ active: Bool) {
+        isPOSModeActive = active
+    }
 }
 
 
@@ -28,6 +34,7 @@ public extension TracksProvider {
     }
 
     func track(_ eventName: String, withProperties properties: [AnyHashable: Any]?) {
+        let eventName = decorateEventNameForPOSIfNeeded(eventName)
         if let properties {
             guard Self.tracksService.trackEventName(eventName, withCustomProperties: properties) else {
                 return DDLogError("🔴 Error tracking \(eventName) with properties: \(properties)")
@@ -102,6 +109,26 @@ private extension TracksProvider {
         }
     }
 
+    private func decorateEventNameForPOSIfNeeded(_ eventName: String) -> String {
+        // We do not want to track some events that might happen in POS mode as `pos_` events,
+        // for example, when backgrounding the app or finishing async work from the app side.
+        // Ref: https://github.com/woocommerce/woocommerce-ios/pull/15006#issuecomment-2622001706
+        let exemptedEvents: Set<String> = [
+            "application_opened",
+            "application_closed",
+            "dynamic_dashboard_card_data_loading_completed"
+        ]
+        if exemptedEvents.contains(eventName) {
+            return eventName
+        }
+
+        if Self.isPOSModeActive {
+            let prefix = "pos_"
+            return "\(prefix)\(eventName)"
+        }
+        return eventName
+    }
+
     func refreshTracksMetadata() {
         DDLogInfo("♻️ Refreshing tracks metadata...")
         var userProperties = [String: Any]()

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -1268,9 +1268,9 @@ enum WooAnalyticsStat: String {
     case backgroundUpdatesDisabled = "background_updates_disabled"
 
     // MARK: Point of Sale events
-    case pointOfSaleAddItemToCart = "pos_item_added_to_cart"
-    case pointOfSalePaymentsOnboardingShown = "pos_payments_onboarding_shown"
-    case pointOfSalePaymentsOnboardingDismissed = "pos_payments_onboarding_dismissed"
+    case pointOfSaleAddItemToCart = "item_added_to_cart"
+    case pointOfSalePaymentsOnboardingShown = "payments_onboarding_shown"
+    case pointOfSalePaymentsOnboardingDismissed = "payments_onboarding_dismissed"
 
     // MARK: Custom Fields events
     case productDetailCustomFieldsTapped = "product_detail_custom_fields_tapped"

WooCommerce/Classes/Authentication/Jetpack Setup/Site Credential Login/SiteCredentialLoginView.swift

@@ -102,23 +102,25 @@ struct SiteCredentialLoginView: View {
                 VStack(alignment: .leading, spacing: Constants.fieldVerticalSpacing) {
                     // Username field.
                     AuthenticationFormFieldView(viewModel: .init(header: Localization.usernameFieldTitle,
-                                                                  placeholder: Localization.enterUsername,
-                                                                  keyboardType: .default,
-                                                                  text: $viewModel.username,
-                                                                  isSecure: false,
-                                                                  errorMessage: nil,
-                                                                  isFocused: focusedField == .username))
+                                                                 placeholder: Localization.enterUsername,
+                                                                 keyboardType: .default,
+                                                                 text: $viewModel.username,
+                                                                 isSecure: false,
+                                                                 errorMessage: nil,
+                                                                 isFocused: focusedField == .username,
+                                                                 autocapitalization: .none))
                     .focused($focusedField, equals: .username)
                     .disabled(viewModel.isLoggingIn)
 
                     // Password field.
                     AuthenticationFormFieldView(viewModel: .init(header: Localization.passwordFieldTitle,
-                                                                  placeholder: Localization.enterPassword,
-                                                                  keyboardType: .default,
-                                                                  text: $viewModel.password,
-                                                                  isSecure: true,
-                                                                  errorMessage: nil,
-                                                                  isFocused: focusedField == .password))
+                                                                 placeholder: Localization.enterPassword,
+                                                                 keyboardType: .default,
+                                                                 text: $viewModel.password,
+                                                                 isSecure: true,
+                                                                 errorMessage: nil,
+                                                                 isFocused: focusedField == .password,
+                                                                 autocapitalization: .none))
                     .focused($focusedField, equals: .password)
                     .disabled(viewModel.isLoggingIn)
 

WooCommerce/Classes/Authentication/Prologue/LoginPrologueViewController.swift

@@ -59,6 +59,7 @@ struct LoginPrologueView: View {
                     .padding(.bottom, 4 * Layout.stackSpacing)
 
                 Text(Localization.title)
+                    .accessibilityIdentifier("prologue-title-label")
                     .font(.title.bold())
                     .multilineTextAlignment(.center)
                     .foregroundColor(.white)

WooCommerce/Classes/Authentication/WPComLogin/WPCom2FALoginView.swift

@@ -75,7 +75,8 @@ struct WPCom2FALoginView: View {
                     text: $viewModel.verificationCode,
                     isSecure: false,
                     errorMessage: nil,
-                    isFocused: isFieldFocused
+                    isFocused: isFieldFocused,
+                    autocapitalization: .none
                 ))
                 .focused($isFieldFocused)