Skip to content

Commit b713e3f

Browse files
authored
Merge branch 'trunk' into update-changelog-stripe-uk
2 parents 8872aa6 + d9ffd67 commit b713e3f

File tree

153 files changed

+4567
-1598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+4567
-1598
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<!--
22
Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
33
-->
4+
## 23.6
5+
This update improves app stability and usability. We’ve enhanced compatibility for stores using HTTP site addresses, optimized how tabs load based on saved states, and fixed an issue that prevented dismissing the keyboard when editing product titles.
6+
47
## 23.5
58
This update brings smoother store management and better control. You can now filter orders by source, and manage all POS orders directly within the POS interface. Plus, we fixed a scrolling issue on the Create Coupon screen for a more seamless experience.
69

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ let specsToGenerate: [CopiableSpec] = matchingTypes.map { type in
205205
import <%= module %>
206206
<% } -%>
207207

208+
// swiftlint:disable line_length
208209
<% for copiableSpec in specsToGenerate { -%>
209210

210211
extension <%= copiableSpec.name %> {
@@ -231,3 +232,5 @@ extension <%= copiableSpec.name %> {
231232
}
232233
}
233234
<% } -%>
235+
236+
// swiftlint:enable line_length

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ import Networking
9797
import Hardware
9898
import WooFoundation
9999

100+
// swiftlint:disable line_length
101+
100102
<% for spec in specsToGenerate { -%>
101103
extension <%= spec.name -%> {
102104
/// Returns a "ready to use" type filled with fake values.
@@ -115,3 +117,5 @@ extension <%= spec.name -%> {
115117
}
116118
<% } -%>
117119
<% } -%>
120+
121+
// swiftlint:enable line_length

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
100100
return buildConfig == .localDeveloper || buildConfig == .alpha
101101
case .pointOfSaleSurveys:
102102
return buildConfig == .localDeveloper || buildConfig == .alpha
103+
case .pointOfSaleSettingsCardReaderFlow:
104+
return buildConfig == .localDeveloper || buildConfig == .alpha
103105
default:
104106
return true
105107
}

Modules/Sources/Experiments/FeatureFlag.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,8 @@ public enum FeatureFlag: Int {
207207
/// Enables surveys for potential and current POS merchants
208208
///
209209
case pointOfSaleSurveys
210+
211+
/// Enables card reader connection flow within POS settings
212+
///
213+
case pointOfSaleSettingsCardReaderFlow
210214
}

Modules/Sources/Fakes/Hardware.generated.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import Networking
66
import Hardware
77
import WooFoundation
88

9+
// swiftlint:disable line_length
10+
911
extension Hardware.CardBrand {
1012
/// Returns a "ready to use" type filled with fake values.
1113
///
@@ -97,3 +99,5 @@ extension Hardware.PaymentMethod {
9799
.card
98100
}
99101
}
102+
103+
// swiftlint:enable line_length

Modules/Sources/Fakes/Networking.generated.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import Networking
66
import Hardware
77
import WooFoundation
88

9+
// swiftlint:disable line_length
10+
911
extension Networking.AIProduct {
1012
/// Returns a "ready to use" type filled with fake values.
1113
///
@@ -2611,3 +2613,5 @@ extension Networking.WordPressTheme {
26112613
)
26122614
}
26132615
}
2616+
2617+
// swiftlint:enable line_length

Modules/Sources/Fakes/NetworkingCore.generated.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import Networking
66
import Hardware
77
import WooFoundation
88

9+
// swiftlint:disable line_length
10+
911
extension NetworkingCore.Account {
1012
/// Returns a "ready to use" type filled with fake values.
1113
///
@@ -593,3 +595,5 @@ extension NetworkingCore.User {
593595
)
594596
}
595597
}
598+
599+
// swiftlint:enable line_length

Modules/Sources/Fakes/WooFoundation.generated.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
// DO NOT EDIT
33

44
// Currently empty because none of the given sources conforms to GeneratedFakeable
5+
6+
// swiftlint:enable line_length

Modules/Sources/Fakes/WooFoundationCore.generated.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ import Networking
66
import Hardware
77
import WooFoundation
88

9+
// swiftlint:disable line_length
10+
911
extension WooFoundationCore.CurrencyCode {
1012
/// Returns a "ready to use" type filled with fake values.
1113
///
1214
public static func fake() -> WooFoundationCore.CurrencyCode {
1315
.AED
1416
}
1517
}
18+
19+
// swiftlint:enable line_length

0 commit comments

Comments
 (0)