Merge branch 'trunk' into issue/15016-show-gateway-specific-documentation-when-learn-more-tapped

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

RELEASE-NOTES.txt

@@ -3,7 +3,7 @@
 21.7
 -----
 - [*] 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
 -----

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/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)
 

WooCommerce/Classes/Authentication/WPComLogin/WPComEmailLoginView.swift

@@ -79,7 +79,8 @@ struct WPComEmailLoginView: View {
                     text: $viewModel.emailAddress,
                     isSecure: false,
                     errorMessage: nil,
-                    isFocused: isEmailFieldFocused
+                    isFocused: isEmailFieldFocused,
+                    autocapitalization: .none
                 ))
                 .focused($isEmailFieldFocused)
 

WooCommerce/Classes/Authentication/WPComLogin/WPComPasswordLoginView.swift

@@ -90,7 +90,8 @@ struct WPComPasswordLoginView: View {
                     text: $viewModel.password,
                     isSecure: true,
                     errorMessage: nil,
-                    isFocused: isPasswordFieldFocused
+                    isFocused: isPasswordFieldFocused,
+                    autocapitalization: .none
                 ))
                 .focused($isPasswordFieldFocused)
 

WooCommerce/Classes/POS/Controllers/PointOfSaleOrderController.swift

@@ -25,12 +25,14 @@ final class PointOfSaleOrderController: PointOfSaleOrderControllerProtocol {
     init(orderService: POSOrderServiceProtocol,
          receiptService: POSReceiptServiceProtocol,
          stores: StoresManager = ServiceLocator.stores,
-         currencySettings: CurrencySettings = ServiceLocator.currencySettings) {
+         currencySettings: CurrencySettings = ServiceLocator.currencySettings,
+         celebration: PaymentCaptureCelebrationProtocol = PaymentCaptureCelebration()) {
         self.orderService = orderService
         self.receiptService = receiptService
         self.stores = stores
         self.storeCurrency = currencySettings.currencyCode
         self.currencyFormatter = CurrencyFormatter(currencySettings: currencySettings)
+        self.celebration = celebration
     }
 
     var orderStatePublisher: AnyPublisher<PointOfSaleInternalOrderState, Never> {
@@ -41,6 +43,7 @@ final class PointOfSaleOrderController: PointOfSaleOrderControllerProtocol {
     private let receiptService: POSReceiptServiceProtocol
 
     private let currencyFormatter: CurrencyFormatter
+    private let celebration: PaymentCaptureCelebrationProtocol
     private let storeCurrency: CurrencyCode
     private let stores: StoresManager
 
@@ -98,6 +101,10 @@ final class PointOfSaleOrderController: PointOfSaleOrderControllerProtocol {
         orderState = .idle
     }
 
+    private func celebrate() {
+        celebration.celebrate()
+    }
+
     @MainActor
     func collectCashPayment() async throws {
         guard let siteID = stores.sessionManager.defaultStoreID else {
@@ -120,7 +127,11 @@ final class PointOfSaleOrderController: PointOfSaleOrderControllerProtocol {
                                                  order: updatedOrder,
                                                  giftCard: nil,
                                                  fields: fieldsToUpdate,
-                                                 onCompletion: { result in
+                                                 onCompletion: { [weak self] result in
+                guard let self = self else { return }
+                if case .success = result {
+                    self.celebrate()
+                }
                 continuation.resume(with: result)
             })
             stores.dispatch(action)

WooCommerce/Classes/POS/Models/PointOfSalePaymentMethod.swift

@@ -0,0 +1,6 @@
+import Foundation
+
+enum PointOfSalePaymentMethod {
+    case card
+    case cash
+}