Skip to content

Commit 9d9b50d

Browse files
Merge branch 'trunk' into issue/7997-simplifiedLogin-prologue
2 parents 26f3602 + 30bc4e9 commit 9d9b50d

File tree

47 files changed

+1316
-614
lines changed

Some content is hidden

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

47 files changed

+1316
-614
lines changed

CodeGeneration/Sourcery/Copiable/Models+Copiable.swifttemplate

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ let specsToGenerate: [CopiableSpec] = matchingTypes.map { type in
183183
}
184184

185185
return CopiableSpec(
186-
name: type.name,
186+
name: type.globalName,
187187
accessLevelWithSpacePostfix: type.accessLevel == "internal" ? "" : "\(type.accessLevel) ",
188188
properties: propSpecs
189189
)

CodeGeneration/Sourcery/Fakes/Fakes.swifttemplate

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ let specsToGenerate: [FakeableSpec] = matchingTypes.map { type in
6969
)
7070
}
7171

72-
return FakeableSpec(name: type.name, accessLevelWithSpacePostfix: accessLevel, content: .initializer(propSpecs))
72+
return FakeableSpec(name: type.globalName, accessLevelWithSpacePostfix: accessLevel, content: .initializer(propSpecs))
7373
}
7474
-%>
7575
<%#

Experiments/Experiments/ABTest.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ public enum ABTest: String, CaseIterable {
1616
/// Experiment ref: pbxNRc-1S0-p2
1717
case aaTestLoggedOut = "woocommerceios_explat_aa_test_logged_out_202211"
1818

19+
/// A/B test for the Products Onboarding banner on the My Store dashboard.
20+
/// Experiment ref: pbxNRc-26F-p2
21+
case productsOnboardingBanner = "woocommerceios_products_onboarding_first_product_banner"
22+
1923
/// Returns a variation for the given experiment
2024
public var variation: Variation {
2125
ExPlat.shared?.experiment(rawValue) ?? .control
@@ -26,7 +30,7 @@ public enum ABTest: String, CaseIterable {
2630
/// When adding a new experiment, add it to the appropriate case depending on its context (logged-in or logged-out experience).
2731
public var context: ExperimentContext {
2832
switch self {
29-
case .aaTestLoggedIn202210:
33+
case .aaTestLoggedIn202210, .productsOnboardingBanner:
3034
return .loggedIn
3135
case .aaTestLoggedOut:
3236
return .loggedOut

Experiments/Experiments/DefaultFeatureFlagService.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
3333
return true
3434
case .searchProductsBySKU:
3535
return true
36-
case .orderCreationSearchCustomers:
37-
return buildConfig == .localDeveloper || buildConfig == .alpha
3836
case .wpcomSignup:
3937
guard isFeatureFlagEnabled(.simplifiedLoginFlowI1) else {
4038
return buildConfig == .localDeveloper || buildConfig == .alpha

Experiments/Experiments/FeatureFlag.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ public enum FeatureFlag: Int {
7070
///
7171
case searchProductsBySKU
7272

73-
/// Enables the Search Customers functionality in the Order Creation screen
74-
///
75-
case orderCreationSearchCustomers
76-
7773
/// Enables signing up for a WP.com account.
7874
///
7975
case wpcomSignup

Fakes/Fakes/Hardware.generated.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ extension CardBrand {
1212
.visa
1313
}
1414
}
15-
extension CardPresentReceiptParameters {
15+
extension Hardware.CardPresentReceiptParameters {
1616
/// Returns a "ready to use" type filled with fake values.
1717
///
18-
public static func fake() -> CardPresentReceiptParameters {
18+
public static func fake() -> Hardware.CardPresentReceiptParameters {
1919
.init(
2020
amount: .fake(),
2121
formattedAmount: .fake(),
@@ -27,10 +27,10 @@ extension CardPresentReceiptParameters {
2727
)
2828
}
2929
}
30-
extension CardPresentTransactionDetails {
30+
extension Hardware.CardPresentTransactionDetails {
3131
/// Returns a "ready to use" type filled with fake values.
3232
///
33-
public static func fake() -> CardPresentTransactionDetails {
33+
public static func fake() -> Hardware.CardPresentTransactionDetails {
3434
.init(
3535
last4: .fake(),
3636
expMonth: .fake(),
@@ -44,10 +44,10 @@ extension CardPresentTransactionDetails {
4444
)
4545
}
4646
}
47-
extension Charge {
47+
extension Hardware.Charge {
4848
/// Returns a "ready to use" type filled with fake values.
4949
///
50-
public static func fake() -> Charge {
50+
public static func fake() -> Hardware.Charge {
5151
.init(
5252
id: .fake(),
5353
amount: .fake(),
@@ -66,10 +66,10 @@ extension ChargeStatus {
6666
.succeeded
6767
}
6868
}
69-
extension PaymentIntent {
69+
extension Hardware.PaymentIntent {
7070
/// Returns a "ready to use" type filled with fake values.
7171
///
72-
public static func fake() -> PaymentIntent {
72+
public static func fake() -> Hardware.PaymentIntent {
7373
.init(
7474
id: .fake(),
7575
status: .fake(),

0 commit comments

Comments
 (0)