Merge branch 'trunk' into woomob-1098-woo-poslocal-catalog-add-incremental-sync-triggers-pull-to

Author: joshheald

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,11 +6,10 @@
 ## Description
 <!-- Take the time to write a good summary. Why is it needed? What does it do? When fixing bugs try to avoid just writing “See original issue” – clarify what the problem was and how you’ve fixed it. -->
 
-## Steps to reproduce
-<!-- Step-by-step testing instructions. For new user flows, consider instead stating the goal of the workflow and see if your PR reviewer can accomplish the workflow without specific steps! -->
-
-## Testing information
-<!-- This is your opportunity to break out individual scenarios that need testing (when necessary) and/or include a checklist for the reviewer to go through. Consider documenting the following from your own completed testing: devices used, alternate workflows, edge cases, affected areas, critical flows, areas not tested, and any remaining unknowns. Provide feedback on this new section of the PR template through Sept 30, 2024 to Apps Quality; additional context here: https://woomobilep2.wordpress.com/2024/05/06/woocommerce-mobile-quality-report-march-april/#comment-12036 -->
+## Test Steps
+<!-- Describe how to test your changes. Include only what’s needed for the reviewer to validate the behavior.
+For new features, outline the main user flow or goal rather than every tap or click — the reviewer should be able to complete the flow naturally.
+If applicable, mention key devices, scenarios, or edge cases to verify. -->
 
 ## Screenshots
 <!-- Include before and after images or gifs when appropriate. -->

Modules/Sources/Codegen/Sourcery/Copiable/Models+Copiable.swifttemplate

@@ -205,6 +205,7 @@ let specsToGenerate: [CopiableSpec] = matchingTypes.map { type in
 import <%= module %>
 <% } -%>
 
+// swiftlint:disable line_length
 <% for copiableSpec in specsToGenerate { -%>
 
 extension <%= copiableSpec.name %> {
@@ -231,3 +232,5 @@ extension <%= copiableSpec.name %> {
     }
 }
 <% } -%>
+
+// swiftlint:enable line_length

Modules/Sources/Codegen/Sourcery/Fakes/Fakes.swifttemplate

@@ -97,6 +97,8 @@ import Networking
 import Hardware
 import WooFoundation
 
+// swiftlint:disable line_length
+
 <% for spec in specsToGenerate { -%>
 extension <%= spec.name -%> {
     /// Returns a "ready to use" type filled with fake values.
@@ -115,3 +117,5 @@ extension <%= spec.name -%> {
 }
 <% } -%>
 <% } -%>
+
+// swiftlint:enable line_length

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -100,6 +100,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pointOfSaleSurveys:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .pointOfSaleSettingsCardReaderFlow:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -207,4 +207,8 @@ public enum FeatureFlag: Int {
     /// Enables surveys for potential and current POS merchants
     ///
     case pointOfSaleSurveys
+
+    /// Enables card reader connection flow within POS settings
+    ///
+    case pointOfSaleSettingsCardReaderFlow
 }

Modules/Sources/Fakes/Hardware.generated.swift

@@ -6,6 +6,8 @@ import Networking
 import Hardware
 import WooFoundation
 
+// swiftlint:disable line_length
+
 extension Hardware.CardBrand {
     /// Returns a "ready to use" type filled with fake values.
     ///
@@ -97,3 +99,5 @@ extension Hardware.PaymentMethod {
         .card
     }
 }
+
+// swiftlint:enable line_length

Modules/Sources/Fakes/Networking.generated.swift

@@ -6,6 +6,8 @@ import Networking
 import Hardware
 import WooFoundation
 
+// swiftlint:disable line_length
+
 extension Networking.AIProduct {
     /// Returns a "ready to use" type filled with fake values.
     ///
@@ -2611,3 +2613,5 @@ extension Networking.WordPressTheme {
         )
     }
 }
+
+// swiftlint:enable line_length

Modules/Sources/Fakes/NetworkingCore.generated.swift

@@ -6,6 +6,8 @@ import Networking
 import Hardware
 import WooFoundation
 
+// swiftlint:disable line_length
+
 extension NetworkingCore.Account {
     /// Returns a "ready to use" type filled with fake values.
     ///
@@ -593,3 +595,5 @@ extension NetworkingCore.User {
         )
     }
 }
+
+// swiftlint:enable line_length

Modules/Sources/Fakes/WooFoundation.generated.swift

@@ -2,3 +2,5 @@
 // DO NOT EDIT
 
 // Currently empty because none of the given sources conforms to GeneratedFakeable
+
+// swiftlint:enable line_length

Modules/Sources/Fakes/WooFoundationCore.generated.swift

@@ -6,10 +6,14 @@ import Networking
 import Hardware
 import WooFoundation
 
+// swiftlint:disable line_length
+
 extension WooFoundationCore.CurrencyCode {
     /// Returns a "ready to use" type filled with fake values.
     ///
     public static func fake() -> WooFoundationCore.CurrencyCode {
         .AED
     }
 }
+
+// swiftlint:enable line_length