Merge 21.2 code freeze (#19604)

Author: mokagio

Podfile

@@ -218,7 +218,7 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  pod 'WPMediaPicker', '~> 1.8.7-beta.1'
+  pod 'WPMediaPicker', '~> 1.8.7'
   # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0'
   ## while PR is in review:
   # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''

Podfile.lock

@@ -512,7 +512,7 @@ PODS:
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (~> 1.8)
   - WordPressUI (1.12.5)
-  - WPMediaPicker (1.8.7-beta.1)
+  - WPMediaPicker (1.8.7)
   - wpxmlrpc (0.9.0)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (6.1.2)
@@ -605,7 +605,7 @@ DEPENDENCIES:
   - WordPressKit (>= 4.58.2, ~> 4.58)
   - WordPressShared (~> 1.18.0)
   - WordPressUI (~> 1.12.5)
-  - WPMediaPicker (~> 1.8.7-beta.1)
+  - WPMediaPicker (~> 1.8.7)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.0/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
@@ -868,7 +868,7 @@ SPEC CHECKSUMS:
   WordPressKit: d8bc00bce09273fc241cf171b0e61ef8f4f29479
   WordPressShared: e5a479220643f46dc4d7726ef8dd45f18bf0c53b
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
-  WPMediaPicker: 59135aebb058a95a507045f93e478516729e5c0f
+  WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
   ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
@@ -880,6 +880,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 936784ec2e9d8246acccd6b123c0ba5b1b6e13b9
+PODFILE CHECKSUM: e4762593ef0d1097286d309c828f611976c1e771
 
 COCOAPODS: 1.11.2

WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift

@@ -356,8 +356,12 @@ private class AccountSettingsController: SettingsController {
     }
 
     private var localizedErrorMessageForAtomicSites: String {
-        NSLocalizedString("To close this account now, contact our support team.",
-                                 comment: "Error message displayed when unable to close user account due to having active atomic site.")
+        // Based on https://github.com/Automattic/wp-calypso/pull/65780
+        NSLocalizedString(
+            "accountSettings.closeAccount.error.atomicSite",
+            value: "This user account cannot be closed immediately because it has active purchases. Please contact our support team to finish deleting the account.",
+            comment: "Error message displayed when unable to close user account due to having active atomic site."
+        )
     }
 
     private var contactSupportAction: ((UIAlertAction) -> Void) {

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,3 +1,3 @@
-Dynamic widgets are now on Jetpack. Get daily, weekly, and all-time stats on your device’s home screen. You’ll also notice a shiny new landing screen in the app that responds to your device’s motion.
+* [*] [internal] Refactored fetching posts in the Reader tab. [#19539]
+* [*] Fixed an issue where the message "No media matching your search" for the media picker is not visible [#19555]
 
-Voice Control is now easier to use in the block editor—when you’re working with Image blocks, use the Voice Control cursor to select the caption for text entry.

WordPress/Resources/en.lproj/Localizable.strings

@@ -459,6 +459,9 @@
    Link to Account Settings section */
 "Account Settings" = "Account Settings";
 
+/* Error message displayed when unable to close user account due to having active atomic site. */
+"accountSettings.closeAccount.error.atomicSite" = "This user account cannot be closed immediately because it has active purchases. Please contact our support team to finish deleting the account.";
+
 /* Title of button that displays the App's acknoledgements */
 "Acknowledgements" = "Acknowledgements";
 
@@ -1961,6 +1964,7 @@
    Continue button (used to finish editing the home page during site creation).
    The button title text when there is a next step for logging in or signing up.
    The default Jetpack view button title
+   The primary button title in the migration welcome and notifications screens.
    Title for the continue button in the What's New page.
    Title of the continue button for the Site Intent screen.
    Title of the Continue button in the Site Name screen. */
@@ -4185,6 +4189,9 @@
 /* Title of the Jetpack powered overlay. */
 "jetpack.branding.overlay.title" = "WordPress is better with Jetpack";
 
+/* Title of a button that displays a blog post in a web view. */
+"jetpack.fullscreen.overlay.learnMore" = "Learn more at jetpack.com";
+
 /* Add an author prompt for the jetpack prologue */
 "jetpack.prologue.prompt.addAuthor" = "Add an author";
 
@@ -4787,6 +4794,39 @@
 /* Option to select the Microsft Outlook app when logging in with magic links */
 "Microsoft Outlook" = "Microsoft Outlook";
 
+/* Primary button title in the migration done screen. */
+"migration.done.actions.primary.title" = "Finish";
+
+/* Primary description in the migration done screen. */
+"migration.done.primaryDescription" = "We’ve transferred all your data and settings. Everything is right where you left it.";
+
+/* Title of the migration done screen. */
+"migration.done.title" = "Thanks for switching to Jetpack!";
+
+/* Secondary button title in the migration notifications screen. */
+"migration.notifications.actions.secondary.title" = "Decide later";
+
+/* Primary description in the migration notifications screen. */
+"migration.notifications.primaryDescription" = "You’ll get all the same notifications but now they’ll come from the Jetpack app.";
+
+/* Secondary description in the migration notifications screen */
+"migration.notifications.secondaryDescription" = "We’ve disabled notifications for the WordPress app.";
+
+/* Title of the migration notifications screen. */
+"migration.notifications.title" = "Allow notifications to keep up with your site";
+
+/* The primary description in the migration welcome screen */
+"migration.welcome.primaryDescription" = "It looks like you’re switching from the WordPress app.";
+
+/* No comment provided by engineer. */
+"migration.welcome.secondaryDescription.plural" = "migration.welcome.secondaryDescription.plural";
+
+/* No comment provided by engineer. */
+"migration.welcome.secondaryDescription.singular" = "migration.welcome.secondaryDescription.singular";
+
+/* The title in the migration welcome screen */
+"migration.welcome.title" = "Welcome to Jetpack!";
+
 /* Summary description for a threat */
 "Miscellaneous vulnerability" = "Miscellaneous vulnerability";
 
@@ -4956,7 +4996,8 @@
 /* A button title. */
 "Need help finding your site address?" = "Need help finding your site address?";
 
-/* Takes the user to get help */
+/* Takes the user to get help
+   The secondary button title in the migration welcome screen */
 "Need help?" = "Need help?";
 
 /* 'Need help?' button label, links off to the WP for iOS FAQ. */
@@ -8277,9 +8318,6 @@
 /* Error popup message to indicate that there was no category title filled in. */
 "Title for a category is mandatory." = "Title for a category is mandatory.";
 
-/* Error message displayed when unable to close user account due to having active atomic site. */
-"To close this account now, contact our support team." = "To close this account now, contact our support team.";
-
 /* Instructions for alert asking for email and name. */
 "To continue please enter your email address and name." = "To continue please enter your email address and name.";
 

WordPress/Resources/release_notes.txt

@@ -1 +1,3 @@
-Voice Control is now easier to use in the block editor—when you’re working with Image blocks, use the Voice Control cursor to select the caption for text entry.
+* [*] [internal] Refactored fetching posts in the Reader tab. [#19539]
+* [*] Fixed an issue where the message "No media matching your search" for the media picker is not visible [#19555]
+

config/Version.internal.xcconfig

@@ -1,4 +1,4 @@
-VERSION_SHORT=21.1
+VERSION_SHORT=21.2
 
 // Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=21.1.0.20221111
+VERSION_LONG=21.2.0.20221114

config/Version.public.xcconfig

@@ -1,4 +1,4 @@
-VERSION_SHORT=21.1
+VERSION_SHORT=21.2
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=21.1.0.2
+VERSION_LONG=21.2.0.0