Merge 11.2 code freeze to trunk

Podfile

@@ -71,7 +71,7 @@ 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', '~> 4.2.0-beta.1'
+  pod 'WordPressAuthenticator', '~> 4.2.0'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

Podfile.lock

@@ -42,7 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (4.2.0-beta.1):
+  - WordPressAuthenticator (4.2.0):
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
@@ -91,7 +91,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.7)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 4.2.0-beta.1)
+  - WordPressAuthenticator (~> 4.2.0)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -162,7 +162,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 41527f0d502d006df9604aa5d968021c195a1917
+  WordPressAuthenticator: 27178591a805804bd27959f1f76ddcb94605916c
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -178,6 +178,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: e0c278d30dacb5909924805c869452fc3aaffbf6
+PODFILE CHECKSUM: 3eb40bbfcf83cb0e4f4b28bc5b6229c27ae4cbf7
 
 COCOAPODS: 1.11.3

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+11.3
+-----
+
+
 11.2
 -----
 - [***] You can now preview draft products before publishing. [https://github.com/woocommerce/woocommerce-ios/pull/8102]

WooCommerce/Resources/AppStoreStrings.pot

@@ -57,9 +57,9 @@ msgctxt "app_store_promo_text"
 msgid "Run your store from anywhere"
 msgstr ""
 
-msgctxt "v11.1-whats-new"
+msgctxt "v11.2-whats-new"
 msgid ""
-"Have you tried to create or update an order from the app? It's now possible to search for customers when you do! Check it out and please share your feedback!\n"
+"For this release, we focused on polishing a few things and taking care of minor bugs that our team found, including the option to preview your products before publishing them. Don’t be fooled – we are working on some pretty cool stuff for you all! Keep sharing feedback 💜\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of a screenshot in the App Store.

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -343,7 +343,8 @@ which should be translated separately and considered part of this sentence. */
 /* Title for the button on the Products onboarding banner */
 "Add a Product" = "Add a Product";
 
-/* The action to add a product */
+/* Message title of bottom sheet for selecting a template or manual product
+   The action to add a product */
 "Add a product" = "Add a product";
 
 /* Cell text in Add / Edit product when there are no images. */
@@ -1040,9 +1041,6 @@ which should be translated separately and considered part of this sentence. */
 /* Title text of the row that has a switch when creating a simple payment */
 "Charge Taxes" = "Charge Taxes";
 
-/* Login onboarding survey option: check my analytics. */
-"Check my analytics" = "Check my analytics";
-
 /* The message of the alert when there is an error in the URL of an external product */
 "Check that the URL entered is valid" = "Check that the URL entered is valid";
 
@@ -1061,12 +1059,18 @@ which should be translated separately and considered part of this sentence. */
 /* Navigation title on the shipping label country selector screen */
 "Choose a Country" = "Choose a Country";
 
+/* Title of the domain selector. */
+"Choose a domain" = "Choose a domain";
+
 /* Title of the password field on the account creation form. */
 "Choose a password" = "Choose a password";
 
 /* Navigation title on the shipping label states of a country selector screen */
 "Choose a State" = "Choose a State";
 
+/* Message title of bottom sheet for selecting a template or manual product */
+"Choose a template" = "Choose a template";
+
 /* Menu option for selecting media from the device's photo library. */
 "Choose from device" = "Choose from device";
 
@@ -1174,12 +1178,10 @@ which should be translated separately and considered part of this sentence. */
 /* Settings > Manage Card Reader > Connect > A button to begin a search for a reader */
 "Connect Card Reader" = "Connect Card Reader";
 
-/* Title of the Jetpack connection web view in the login flow */
+/* Action button to handle connecting the logged-in account to a given site.Presented when logging in with a store address that does not match the account entered
+   Title of the Jetpack connection web view in the login flow */
 "Connect Jetpack" = "Connect Jetpack";
 
-/* Action button to handle connecting the logged-in account to a given site.Presented when logging in with a store address that does not match the account entered */
-"Connect Jetpack to your account" = "Connect Jetpack to your account";
-
 /* Label for a button that when tapped, starts the process of connecting to a card reader */
 "Connect to Reader" = "Connect to Reader";
 
@@ -1258,7 +1260,8 @@ which should be translated separately and considered part of this sentence. */
    Continue button inside every cell inside Create Shipping Label form
    The button title text when there is a next step for logging in or signing up.
    Title of continue button
-   Title of dismiss button presented when users attempt to log in without Jetpack installed or connected */
+   Title of dismiss button presented when users attempt to log in without Jetpack installed or connected
+   Title of the button to continue with a selected domain. */
 "Continue" = "Continue";
 
 /* Part of a prompt suggesting that there is more content for the user to read. */
@@ -1421,9 +1424,6 @@ which should be translated separately and considered part of this sentence. */
 /* Button to create a new package in Shipping Label Package screen */
 "Create new package" = "Create new package";
 
-/* Login onboarding survey option: create or update my products. */
-"Create or update my products" = "Create or update my products";
-
 /* Action sheet option when the user wants to create full manual order */
 "Create order" = "Create order";
 
@@ -2412,7 +2412,7 @@ which should be translated separately and considered part of this sentence. */
 /* Title on the navigation bar for the in-app feedback survey */
 "How can we improve?" = "How can we improve?";
 
-/* Message title of bottom sheet for selecting a template or manual product */
+/* Message subtitle of bottom sheet for selecting a template or manual product */
 "How do you want to start?" = "How do you want to start?";
 
 /* Title of HS Tariff Number row in Package Content section in Customs screen of Shipping Label flow */
@@ -2686,9 +2686,6 @@ which should be translated separately and considered part of this sentence. */
 /* Subtitle for button displaying the Automattic Work With Us web page, indicating that Automattic employees can work from anywhere in the world */
 "Join from anywhere" = "Join from anywhere";
 
-/* Login onboarding survey option: just exploring. */
-"Just exploring" = "Just exploring";
-
 /* Alert button title - which keeps the user on the Product Visibility screen */
 "Keep Editing" = "Keep Editing";
 
@@ -2918,9 +2915,6 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Title of the action sheet displayed from the Coupon Details screen */
 "Manage Coupon" = "Manage Coupon";
 
-/* Login onboarding survey option: manage my orders. */
-"Manage my orders" = "Manage my orders";
-
 /* Title of the cell in Product Inventory Settings > Manage stock */
 "Manage stock" = "Manage stock";
 
@@ -3639,7 +3633,7 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Placeholder for editing the text of a text link */
 "Please enter some text" = "Please enter some text";
 
-/* No comment provided by engineer. */
+/* Instructional text shown when requesting the user's password for a login initiated via Sign In with Apple */
 "Please enter the password for your WordPress.com account to log in with your Apple ID." = "Please enter the password for your WordPress.com account to log in with your Apple ID.";
 
 /* Instruction text on the two-factor screen. */
@@ -4374,7 +4368,7 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Placeholder for the selected package in the Shipping Labels Package Details screen */
 "Select a package" = "Select a package";
 
-/* Message title of bottom sheet for selecting a product type to create a product */
+/* Message subtitle of bottom sheet for selecting a product type to create a product */
 "Select a product type" = "Select a product type";
 
 /* Select all button title in the issue refund screen */
@@ -4663,7 +4657,8 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Describes a site redirect domain */
 "Site Redirect" = "Site Redirect";
 
-/* The button title on the login onboarding screen to skip to the prologue screen.
+/* Navigation bar button on the domain selector screen to skip domain selection.
+   The button title on the login onboarding screen to skip to the prologue screen.
    Title for the button to skip the onboarding step informing the merchant of pending account requirements */
 "Skip" = "Skip";
 
@@ -4912,6 +4907,9 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Notice text after updating the order successfully */
 "Successfully updated" = "Successfully updated";
 
+/* Header label of the domain suggestions on the domain selector. */
+"SUGGESTIONS" = "SUGGESTIONS";
+
 /* Title of the footer in Shipping Label Package Detail screen */
 "Sum of products and package weight" = "Sum of products and package weight";
 
@@ -4924,9 +4922,6 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Message from the in-person payment card reader prompting user to swipe their card */
 "Swipe Card" = "Swipe Card";
 
-/* Login onboarding survey option: switch between multiple Stores. */
-"Switch between multiple Stores" = "Switch between multiple Stores";
-
 /* This action allows the user to change stores without logging out and logging back in again. */
 "Switch Store" = "Switch Store";
 
@@ -5430,6 +5425,9 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Footer text in Product Slug screen */
 "This is the URL-friendly version of the product title" = "This is the URL-friendly version of the product title";
 
+/* Subtitle of the domain selector. */
+"This is where people will find you on the Internet. Don't worry, you can change it later." = "This is where people will find you on the Internet. Don't worry, you can change it later.";
+
 /* Message in action sheet when an order item is about to be moved on Package Details screen of Shipping Label flow.The package name reads like: Package 1: Custom Envelope. */
 "This item is currently in Package %1$d: %2$@. Where would you like to move it?" = "This item is currently in Package %1$d: %2$@. Where would you like to move it?";
 
@@ -5637,9 +5635,6 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Message when a card is declined due to a potentially temporary problem. */
 "Trying again may succeed, or try another means of payment" = "Trying again may succeed, or try another means of payment";
 
-/* Login onboarding survey option: trying to set up a store. */
-"Trying to set up a store" = "Trying to set up a store";
-
 /* Settings > Manage Card Reader > Connect > Hint to power on reader */
 "Turn card reader on and place it next to mobile device" = "Turn card reader on and place it next to mobile device";
 
@@ -5661,6 +5656,9 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Placeholder for the Restriction Details row in Customs screen of Shipping Label flow */
 "Type of restriction" = "Type of restriction";
 
+/* Placeholder of the search text field on the domain selector. */
+"Type to get suggestions" = "Type to get suggestions";
+
 /* Error message when Bluetooth is not enabled or available. */
 "Unable to access Bluetooth - please enable Bluetooth and try again" = "Unable to access Bluetooth - please enable Bluetooth and try again";
 
@@ -6222,9 +6220,6 @@ This is the link to the website, and forms part of a longer sentence which it sh
 /* Content of the feedback banner on the coupon list screen */
 "We’ve been working on making it possible to view and edit coupons from your device!" = "We’ve been working on making it possible to view and edit coupons from your device!";
 
-/* Login onboarding survey title. */
-"What brings you to the WooCommerce app today?" = "What brings you to the WooCommerce app today?";
-
 /* Title of alert informing users of what email they can use to sign in.Presented when users attempt to log in with an email that does not match a WP.com account */
 "What email do I use to sign in?" = "What email do I use to sign in?";
 

WooCommerce/Resources/release_notes.txt

@@ -1 +1 @@
-Have you tried to create or update an order from the app? It's now possible to search for customers when you do! Check it out and please share your feedback!
+For this release, we focused on polishing a few things and taking care of minor bugs that our team found, including the option to preview your products before publishing them. Don’t be fooled – we are working on some pretty cool stuff for you all! Keep sharing feedback 💜

config/Version.Public.xcconfig

@@ -1,7 +1,7 @@
-VERSION_SHORT=11.1
+VERSION_SHORT=11.2
 
 // Public long version example: VERSION_LONG=1.2.0.0
-VERSION_LONG=11.1.0.2
+VERSION_LONG=11.2.0.0
 
 // Re-map our custom version values (used by release-toolkit) to the Xcode ones
 MARKETING_VERSION=$VERSION_SHORT

fastlane/Deliverfile

@@ -15,7 +15,7 @@ app_identifier 'com.automattic.woocommerce'
 screenshots_path './fastlane/promo_screenshots/'
 
 # Make sure to update these keys for a new version
-app_version "11.1"
+app_version "11.2"
 
 team_id '299112'