Skip to content

Commit f2d7276

Browse files
iamgabrielmaiamgabrielma
authored
Merge branch 'trunk' into issue/7741-add-customer-search-tracks
2 parents bcb8d16 + daffe2d commit f2d7276

File tree

238 files changed

+8888
-848
lines changed

Some content is hidden

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

238 files changed

+8888
-848
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<!--
22
Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
33
-->
4+
## 11.0
5+
Even though this release doesn’t have any surprising new features, we still put a lot of love into it! We fixed a few bugs and made several improvements to make your experience smoother.
6+
7+
## 10.9
8+
This release includes a lot more stability fixes to help you log in much easier. You can now connect your WordPress.com account with Jetpack and access your store that much faster. We've also updated our app to support devices with iOS 15+ only. Please update your device to iOS 15 to continue to use the app.
9+
410
## 10.8
511
Are you loving the new stats widget in the app? Today is your lucky day! It's now possible to view your Stats Widget on your lock screen. This is available for iOS 16 only. We also improved the card reader purchase flow with better autofill so it's easier to purchase a card reader directly from the app.
612

‎Experiments/Experiments.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
390390
GCC_WARN_UNUSED_FUNCTION = YES;
391391
GCC_WARN_UNUSED_VARIABLE = YES;
392-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
392+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
393393
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
394394
MTL_FAST_MATH = YES;
395395
ONLY_ACTIVE_ARCH = YES;
@@ -447,7 +447,7 @@
447447
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
448448
GCC_WARN_UNUSED_FUNCTION = YES;
449449
GCC_WARN_UNUSED_VARIABLE = YES;
450-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
450+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
451451
MTL_ENABLE_DEBUG_INFO = NO;
452452
MTL_FAST_MATH = YES;
453453
SDKROOT = iphoneos;
@@ -596,7 +596,7 @@
596596
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
597597
GCC_WARN_UNUSED_FUNCTION = YES;
598598
GCC_WARN_UNUSED_VARIABLE = YES;
599-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
599+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
600600
MTL_ENABLE_DEBUG_INFO = NO;
601601
MTL_FAST_MATH = YES;
602602
SDKROOT = iphoneos;

‎Experiments/Experiments/ABTest.swift‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ public enum ABTest: String, CaseIterable {
1414

1515
/// A/A test to make sure there is no bias in the logged out state.
1616
/// Experiment ref: pbxNRc-1S0-p2
17-
case aaTestLoggedOut202209 = "woocommerceios_explat_aa_test_logged_out_202209"
18-
19-
/// A/B test for the login button order on the prologues screen.
20-
/// Experiment ref: pbxNRc-1VA-p2
21-
case loginPrologueButtonOrder = "woocommerceios_login_prologue_button_order_202209"
17+
case aaTestLoggedOut = "woocommerceios_explat_aa_test_logged_out_202211"
2218

2319
/// Returns a variation for the given experiment
2420
public var variation: Variation {
@@ -32,7 +28,7 @@ public enum ABTest: String, CaseIterable {
3228
switch self {
3329
case .aaTestLoggedIn202210:
3430
return .loggedIn
35-
case .aaTestLoggedOut202209, .loginPrologueButtonOrder:
31+
case .aaTestLoggedOut:
3632
return .loggedOut
3733
case .null:
3834
return .none

‎Experiments/Experiments/DefaultFeatureFlagService.swift‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,21 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
3636
case .orderCreationSearchCustomers:
3737
return buildConfig == .localDeveloper || buildConfig == .alpha
3838
case .wpcomSignup:
39-
return buildConfig == .localDeveloper || buildConfig == .alpha
39+
guard isFeatureFlagEnabled(.simplifiedLoginFlowI1) else {
40+
return buildConfig == .localDeveloper || buildConfig == .alpha
41+
}
42+
// To disable automatically sending signup link for unknown email IDs
43+
return false
4044
case .inAppPurchases:
4145
return buildConfig == .localDeveloper || buildConfig == .alpha
46+
case .storeCreationMVP:
47+
return buildConfig == .localDeveloper || buildConfig == .alpha
48+
case .simplifiedLoginFlowI1:
49+
return buildConfig == .localDeveloper || buildConfig == .alpha
50+
case .justInTimeMessagesOnDashboard:
51+
return buildConfig == .localDeveloper || buildConfig == .alpha
52+
case .productsOnboarding:
53+
return buildConfig == .localDeveloper || buildConfig == .alpha
4254
default:
4355
return true
4456
}

‎Experiments/Experiments/FeatureFlag.swift‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,21 @@ public enum FeatureFlag: Int {
8181
/// Enables In-app purchases for buying Hosted WooCommerce plans
8282
///
8383
case inAppPurchases
84+
85+
/// Store creation MVP.
86+
///
87+
case storeCreationMVP
88+
89+
/// Temporary feature flag for the simplified login flow.
90+
/// TODO: replace with A/B testing.
91+
///
92+
case simplifiedLoginFlowI1
93+
94+
/// Just In Time Messages on Dashboard
95+
///
96+
case justInTimeMessagesOnDashboard
97+
98+
/// Hides products onboarding development.
99+
///
100+
case productsOnboarding
84101
}

‎Fakes/Fakes.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
255255
GCC_WARN_UNUSED_FUNCTION = YES;
256256
GCC_WARN_UNUSED_VARIABLE = YES;
257-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
257+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
258258
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
259259
MTL_FAST_MATH = YES;
260260
ONLY_ACTIVE_ARCH = YES;
@@ -312,7 +312,7 @@
312312
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
313313
GCC_WARN_UNUSED_FUNCTION = YES;
314314
GCC_WARN_UNUSED_VARIABLE = YES;
315-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
315+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
316316
MTL_ENABLE_DEBUG_INFO = NO;
317317
MTL_FAST_MATH = YES;
318318
SDKROOT = iphoneos;

‎Fakes/Fakes/Networking.generated.swift‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,40 @@ extension JetpackUser {
261261
)
262262
}
263263
}
264+
extension JustInTimeMessage {
265+
/// Returns a "ready to use" type filled with fake values.
266+
///
267+
public static func fake() -> JustInTimeMessage {
268+
.init(
269+
siteID: .fake(),
270+
messageID: .fake(),
271+
featureClass: .fake(),
272+
ttl: .fake(),
273+
content: .fake(),
274+
cta: .fake()
275+
)
276+
}
277+
}
278+
extension JustInTimeMessage.CTA {
279+
/// Returns a "ready to use" type filled with fake values.
280+
///
281+
public static func fake() -> JustInTimeMessage.CTA {
282+
.init(
283+
message: .fake(),
284+
link: .fake()
285+
)
286+
}
287+
}
288+
extension JustInTimeMessage.Content {
289+
/// Returns a "ready to use" type filled with fake values.
290+
///
291+
public static func fake() -> JustInTimeMessage.Content {
292+
.init(
293+
message: .fake(),
294+
description: .fake()
295+
)
296+
}
297+
}
264298
extension Leaderboard {
265299
/// Returns a "ready to use" type filled with fake values.
266300
///
@@ -1475,6 +1509,7 @@ extension Site {
14751509
description: .fake(),
14761510
url: .fake(),
14771511
adminURL: .fake(),
1512+
loginURL: .fake(),
14781513
plan: .fake(),
14791514
isJetpackThePluginInstalled: .fake(),
14801515
isJetpackConnected: .fake(),

‎Fakes/Fakes/Yosemite.generated.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,18 @@ extension ProductReviewFromNoteParcel {
1616
)
1717
}
1818
}
19+
extension YosemiteJustInTimeMessage {
20+
/// Returns a "ready to use" type filled with fake values.
21+
///
22+
public static func fake() -> YosemiteJustInTimeMessage {
23+
.init(
24+
siteID: .fake(),
25+
messageID: .fake(),
26+
featureClass: .fake(),
27+
title: .fake(),
28+
detail: .fake(),
29+
buttonTitle: .fake(),
30+
url: .fake()
31+
)
32+
}
33+
}

‎Gemfile.lock‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ GEM
1717
ast (2.4.2)
1818
atomos (0.1.3)
1919
aws-eventstream (1.2.0)
20-
aws-partitions (1.631.0)
21-
aws-sdk-core (3.148.0)
20+
aws-partitions (1.653.0)
21+
aws-sdk-core (3.166.0)
2222
aws-eventstream (~> 1, >= 1.0.2)
23-
aws-partitions (~> 1, >= 1.525.0)
24-
aws-sigv4 (~> 1.1)
23+
aws-partitions (~> 1, >= 1.651.0)
24+
aws-sigv4 (~> 1.5)
2525
jmespath (~> 1, >= 1.6.1)
26-
aws-sdk-kms (1.58.0)
27-
aws-sdk-core (~> 3, >= 3.127.0)
26+
aws-sdk-kms (1.59.0)
27+
aws-sdk-core (~> 3, >= 3.165.0)
2828
aws-sigv4 (~> 1.1)
29-
aws-sdk-s3 (1.114.0)
30-
aws-sdk-core (~> 3, >= 3.127.0)
29+
aws-sdk-s3 (1.117.1)
30+
aws-sdk-core (~> 3, >= 3.165.0)
3131
aws-sdk-kms (~> 1)
3232
aws-sigv4 (~> 1.4)
33-
aws-sigv4 (1.5.1)
33+
aws-sigv4 (1.5.2)
3434
aws-eventstream (~> 1, >= 1.0.2)
3535
babosa (1.0.4)
3636
bigdecimal (1.4.4)
@@ -94,7 +94,7 @@ GEM
9494
escape (0.0.4)
9595
ethon (0.15.0)
9696
ffi (>= 1.15.0)
97-
excon (0.92.4)
97+
excon (0.93.1)
9898
faraday (1.10.2)
9999
faraday-em_http (~> 1.0)
100100
faraday-em_synchrony (~> 1.0)
@@ -124,7 +124,7 @@ GEM
124124
faraday_middleware (1.2.0)
125125
faraday (~> 1.0)
126126
fastimage (2.2.6)
127-
fastlane (2.210.0)
127+
fastlane (2.210.1)
128128
CFPropertyList (>= 2.3, < 4.0.0)
129129
addressable (>= 2.8, < 3.0.0)
130130
artifactory (~> 3.0)
@@ -164,8 +164,9 @@ GEM
164164
xcpretty (~> 0.3.0)
165165
xcpretty-travis-formatter (>= 0.0.3)
166166
fastlane-plugin-appcenter (1.11.1)
167-
fastlane-plugin-sentry (1.11.1)
168-
fastlane-plugin-wpmreleasetoolkit (5.5.0)
167+
fastlane-plugin-sentry (1.14.0)
168+
os (~> 1.1, >= 1.1.4)
169+
fastlane-plugin-wpmreleasetoolkit (5.6.0)
169170
activesupport (~> 5)
170171
bigdecimal (~> 1.4)
171172
buildkit (~> 1.5)
@@ -188,9 +189,9 @@ GEM
188189
git (1.12.0)
189190
addressable (~> 2.8)
190191
rchardet (~> 1.8)
191-
google-apis-androidpublisher_v3 (0.26.0)
192-
google-apis-core (>= 0.7, < 2.a)
193-
google-apis-core (0.7.2)
192+
google-apis-androidpublisher_v3 (0.29.0)
193+
google-apis-core (>= 0.9.0, < 2.a)
194+
google-apis-core (0.9.1)
194195
addressable (~> 2.5, >= 2.5.1)
195196
googleauth (>= 0.16.2, < 2.a)
196197
httpclient (>= 2.8.1, < 3.a)
@@ -199,27 +200,27 @@ GEM
199200
retriable (>= 2.0, < 4.a)
200201
rexml
201202
webrick
202-
google-apis-iamcredentials_v1 (0.13.0)
203-
google-apis-core (>= 0.7, < 2.a)
204-
google-apis-playcustomapp_v1 (0.10.0)
205-
google-apis-core (>= 0.7, < 2.a)
206-
google-apis-storage_v1 (0.17.0)
207-
google-apis-core (>= 0.7, < 2.a)
203+
google-apis-iamcredentials_v1 (0.15.0)
204+
google-apis-core (>= 0.9.0, < 2.a)
205+
google-apis-playcustomapp_v1 (0.12.0)
206+
google-apis-core (>= 0.9.1, < 2.a)
207+
google-apis-storage_v1 (0.19.0)
208+
google-apis-core (>= 0.9.0, < 2.a)
208209
google-cloud-core (1.6.0)
209210
google-cloud-env (~> 1.0)
210211
google-cloud-errors (~> 1.0)
211212
google-cloud-env (1.6.0)
212213
faraday (>= 0.17.3, < 3.0)
213214
google-cloud-errors (1.3.0)
214-
google-cloud-storage (1.40.0)
215+
google-cloud-storage (1.43.0)
215216
addressable (~> 2.8)
216217
digest-crc (~> 0.4)
217218
google-apis-iamcredentials_v1 (~> 0.1)
218-
google-apis-storage_v1 (~> 0.17.0)
219+
google-apis-storage_v1 (~> 0.19.0)
219220
google-cloud-core (~> 1.6)
220221
googleauth (>= 0.16.2, < 2.a)
221222
mini_mime (~> 1.0)
222-
googleauth (1.2.0)
223+
googleauth (1.3.0)
223224
faraday (>= 0.17.3, < 3.a)
224225
jwt (>= 1.4, < 3.0)
225226
memoist (~> 0.16)
@@ -250,10 +251,10 @@ GEM
250251
nap (1.1.0)
251252
naturally (2.2.1)
252253
netrc (0.11.0)
253-
nokogiri (1.13.8)
254+
nokogiri (1.13.9)
254255
mini_portile2 (~> 2.8.0)
255256
racc (~> 1.4)
256-
nokogiri (1.13.8-x86_64-darwin)
257+
nokogiri (1.13.9-x86_64-darwin)
257258
racc (~> 1.4)
258259
octokit (4.25.1)
259260
faraday (>= 1, < 3)

0 commit comments

Comments
 (0)