Merge 23.6 code freeze

Gemfile

@@ -2,6 +2,12 @@
 
 source 'https://rubygems.org'
 
+# To address the following error when running `bundle exec pod install`:
+#
+#   undefined method `deprecator' for ActiveSupport:Module (NoMethodError)
+#
+# See: https://github.com/fastlane/fastlane/issues/21585
+gem 'activesupport', '~> 7.0.8'
 # 1.12.x and higher, starting from 1.12.1, because that hotfix fixes Xcode 14.3 compatibility
 gem 'cocoapods', '~> 1.12', '>= 1.12.1'
 gem 'commonmarker'

Gemfile.lock

@@ -17,8 +17,8 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.830.0)
-    aws-sdk-core (3.184.0)
+    aws-partitions (1.843.0)
+    aws-sdk-core (3.185.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -30,7 +30,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+    aws-sigv4 (1.6.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     buildkit (1.5.0)
@@ -188,7 +188,7 @@ GEM
     fastlane-plugin-appcenter (2.1.1)
     fastlane-plugin-sentry (1.15.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (9.1.0)
+    fastlane-plugin-wpmreleasetoolkit (9.2.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -212,9 +212,9 @@ GEM
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.50.0)
+    google-apis-androidpublisher_v3 (0.51.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -265,7 +265,7 @@ GEM
       kramdown (~> 2.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
@@ -295,7 +295,7 @@ GEM
     public_suffix (4.0.7)
     racc (1.7.1)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rake-compiler (1.2.5)
       rake
     rchardet (1.8.0)
@@ -354,7 +354,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     word_wrap (1.0.0)
     xcodeproj (1.23.0)
@@ -373,6 +373,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 7.0.8)
   cocoapods (~> 1.12, >= 1.12.1)
   commonmarker
   danger (~> 9.3)

Podfile

@@ -148,7 +148,7 @@ abstract_target 'Apps' do
   # pod 'WPMediaPicker', git: 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', branch: ''
   # pod 'WPMediaPicker', path: '../MediaPicker-iOS'
 
-  pod 'WordPressAuthenticator', '~> 7.2.1-beta.2'
+  pod 'WordPressAuthenticator', '~> 7.2', '>= 7.2.1'
   # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
   # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: ''
   # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'

Podfile.lock

@@ -66,7 +66,7 @@ PODS:
   - WordPress-Aztec-iOS (1.19.9)
   - WordPress-Editor-iOS (1.19.9):
     - WordPress-Aztec-iOS (= 1.19.9)
-  - WordPressAuthenticator (7.2.1-beta.2):
+  - WordPressAuthenticator (7.2.1):
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
@@ -125,7 +125,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.9)
-  - WordPressAuthenticator (~> 7.2.1-beta.2)
+  - WordPressAuthenticator (>= 7.2.1, ~> 7.2)
   - WordPressKit (>= 8.9.1, ~> 8.9)
   - WordPressShared (~> 2.2)
   - WordPressUI (~> 1.15)
@@ -225,7 +225,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
   WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
-  WordPressAuthenticator: 1d73abee8fdd87032e987c40f140423a6aa0e577
+  WordPressAuthenticator: eb60491871a2b8819017deed2970b054d2678547
   WordPressKit: e774ca87068b8ea02bbb0bd0b75b98aa5d722cb9
   WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2
   WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
@@ -240,6 +240,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: e5c5369947a1f32a1c03bb35d92c86ee8c39833a
+PODFILE CHECKSUM: be61e28a7fc7d099c5bdd49f360cac8be5083101
 
 COCOAPODS: 1.12.1

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+23.7
+-----
+
+
 23.6
 -----
 * [***] [internal][Jetpack-only] [***] Added paid domain selection, plan selection, and checkout screens in site creation flow [#21688]

WordPress/Classes/ViewRelated/Reader/ReaderPostCardCell.swift

@@ -101,7 +101,7 @@ class ReaderPostCardCell: UITableViewCell {
             static let likeButtonHint = NSLocalizedString("reader.post.button.like.accessibility.hint",
                                                           value: "Likes the post.",
                                                           comment: "Accessibility hint for the like button on the reader post card cell")
-            static let likedButtonHint = NSLocalizedString("reader.post.button.like.accessibility.hint",
+            static let likedButtonHint = NSLocalizedString("reader.post.button.liked.accessibility.hint",
                                                           value: "Unlikes the post.",
                                                           comment: "Accessibility hint for the liked button on the reader post card cell")
             static let menuButtonLabel = NSLocalizedString("reader.post.button.menu.accessibility.label",

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,5 +1,10 @@
-We’ve made some visual changes to the reader. You’ll notice updates to feed cards, headers, buttons, recommendations, and more. Please feel free to give us lots of compliments.
-
-In the block editor, you can now split or exit a formatted block by pressing the “enter” key three times. The left-hand border is always visible for quote blocks, too, even in block-based themes on dark mode. And you can quote us on that.
-
-Finally, we fixed a code issue in blogging prompt settings that caused the app to crash.
+* [***] [internal] Added paid domain selection, plan selection, and checkout screens in site creation flow [#21688]
+* [**] When moving a post to trash, show a toast message with undo action instead of an inline undo row. [#21724]
+* [*] Site Domains: Fixed an issue where the message shared while adding a domain was inaccurate. [#21827]
+* [*] Fix an issue where login with site address is blocked after failing the first attempt. [#21848]
+* [*] Fix an issue with an issue [#16999] with HTML not being stripped from post titles [#21846]
+* [*] Fix an issue that leads to an ambiguous error message when an incorrect SMS 2FA code is submitted. [#21863]
+* [*] Fix an issue where two 2FA controllers were being opened at the same time when logging in. [#21865]
+* [*] Block Editor Social Icons: Fix visibility of inactive icons when used with block based themes in dark mode [https://github.com/WordPress/gutenberg/pull/55398]
+* [*] Block Editor Classic block: Add option to convert to blocks [https://github.com/WordPress/gutenberg/pull/55461]
+* [*] Block Editor Synced Patterns: Fix visibility of heading section when used with block based themes in dark mode [https://github.com/WordPress/gutenberg/pull/55399]

WordPress/Resources/en.lproj/Localizable.strings

@@ -251,6 +251,9 @@
 /* translators: %s: social link name e.g: \"Instagram\". */
 "%s social icon" = "%s social icon";
 
+/* translators: displayed right after the classic block is converted to blocks. %s: The localized classic block name */
+"'%s' block converted to blocks" = "'%s' block converted to blocks";
+
 /* translators: Missing block alert title. %s: The localized block name */
 "'%s' is not fully-supported" = "'%s' is not fully-supported";
 
@@ -760,6 +763,9 @@
    Label for the alt for a media asset (image) */
 "Alt Text" = "Alt Text";
 
+/* No comment provided by engineer. */
+"Alternatively, you can convert the content to blocks." = "Alternatively, you can convert the content to blocks.";
+
 /* No comment provided by engineer. */
 "Alternatively, you can detach and edit these blocks separately by tapping “Detach patterns”." = "Alternatively, you can detach and edit these blocks separately by tapping “Detach patterns”.";
 
@@ -2812,6 +2818,9 @@ Example: Reply to Pamela Nguyen */
 /* Title for a menu action in the context menu on the Jetpack install card. */
 "domain.dashboard.card.menu.hide" = "Hide this";
 
+/* Domain Management Screen Title */
+"domain.management.title" = "My Domains";
+
 /* Domain Purchase Completion footer */
 "domain.purchase.preview.footer" = "It may take up to 30 minutes for your custom domain to start working.";
 
@@ -5262,6 +5271,9 @@ Please install the %3$@ to use the app with this site.";
    Title of the 'Me' tab - used for spotlight indexing on iOS. */
 "Me" = "Me";
 
+/* Products header text in Me Screen. */
+"me.products.header" = "Products";
+
 /* Noun. Title. Links to the blog's Media library.
    Tab bar title for the Media tab in Media Picker
    The menu item to select during a guided tour.
@@ -6415,9 +6427,6 @@ Please install the %3$@ to use the app with this site.";
 /* Title of notification displayed when a page has failed to upload. */
 "Page failed to upload" = "Page failed to upload";
 
-/* A short message explaining that a page was moved to the trash bin. */
-"Page moved to trash." = "Page moved to trash.";
-
 /* Title of notification displayed when a page has been successfully saved as a draft. */
 "Page pending review" = "Page pending review";
 
@@ -6791,9 +6800,6 @@ Please install the %3$@ to use the app with this site.";
    The post formats available for the post. Should be the same as in core WP. */
 "Post Format" = "Post Format";
 
-/* A short message explaining that a post was moved to the trash bin. */
-"Post moved to trash." = "Post moved to trash.";
-
 /* Title of notification displayed when a post has been successfully saved as a draft. */
 "Post pending review" = "Post pending review";
 
@@ -6913,6 +6919,15 @@ Please install the %3$@ to use the app with this site.";
 /* Beginning text of the remaining social shares a user has left. %1$d is their current remaining shares. This text is combined with ' in the next 30 days' if there is no warning displayed. */
 "postsettings.social.shares.text.format" = "%1$d social shares remaining";
 
+/* A short message explaining that a page was moved to the trash bin. */
+"postsList.movePageToTrash.message" = "Page moved to trash";
+
+/* A short message explaining that a post was moved to the trash bin. */
+"postsList.movePostToTrash.message" = "Post moved to trash";
+
+/* The title of an 'undo' button. Tapping the button moves a trashed post or page out of the trash folder. */
+"postsList.movePostToTrash.undo" = "Undo";
+
 /* Subtitle for placeholder in Tenor picker. `The company name 'Tenor' should always be written as it is. */
 "Powered by Tenor" = "Powered by Tenor";
 
@@ -7267,13 +7282,15 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Text for the 'Like' button on the reader post card cell. */
 "reader.post.button.like" = "Like";
 
-/* Accessibility hint for the like button on the reader post card cell
-   Accessibility hint for the liked button on the reader post card cell */
+/* Accessibility hint for the like button on the reader post card cell */
 "reader.post.button.like.accessibility.hint" = "Likes the post.";
 
 /* Text for the 'Liked' button on the reader post card cell. */
 "reader.post.button.liked" = "Liked";
 
+/* Accessibility hint for the liked button on the reader post card cell */
+"reader.post.button.liked.accessibility.hint" = "Unlikes the post.";
+
 /* Accessibility hint for the site header on the reader post card cell */
 "reader.post.button.menu.accessibility.hint" = "Opens a menu with more actions.";
 
@@ -10076,8 +10093,6 @@ Example: given a notice format "Following %@" and empty site name, this will be
    Button title. Reverts the previous notification operation
    Revert an operation
    Revert enabling notification after successfully subcribing to the comments for the post.
-   The title of an 'undo' button. Tapping the button moves a trashed page out of the trash folder.
-   The title of an 'undo' button. Tapping the button moves a trashed post out of the trash folder.
    Undo action */
 "Undo" = "Undo";
 

WordPress/Resources/release_notes.txt

@@ -1,7 +1,8 @@
-In the block editor, you can now split or exit a formatted block by pressing the “enter” key three times. The left-hand border is always visible for quote blocks, too. And you can quote us on that.
-
-We also squashed a handful of bugs.
-
-- We fixed a code issue in blogging prompt settings that caused the app to crash.
-- During the signup process, you won’t end up in the reader by accident.
-- Creating a .com site? You should no longer see two overlays after completing the signup process. One and done.
+* [**] When moving a post to trash, show a toast message with undo action instead of an inline undo row. [#21724]
+* [*] Fix an issue where login with site address is blocked after failing the first attempt. [#21848]
+* [*] Fix an issue with an issue [#16999] with HTML not being stripped from post titles [#21846]
+* [*] Fix an issue that leads to an ambiguous error message when an incorrect SMS 2FA code is submitted. [#21863]
+* [*] Fix an issue where two 2FA controllers were being opened at the same time when logging in. [#21865]
+* [*] Block Editor Social Icons: Fix visibility of inactive icons when used with block based themes in dark mode [https://github.com/WordPress/gutenberg/pull/55398]
+* [*] Block Editor Classic block: Add option to convert to blocks [https://github.com/WordPress/gutenberg/pull/55461]
+* [*] Block Editor Synced Patterns: Fix visibility of heading section when used with block based themes in dark mode [https://github.com/WordPress/gutenberg/pull/55399]

config/Version.internal.xcconfig

@@ -1,4 +1,2 @@
-VERSION_SHORT=23.5
-
-// Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=23.5.0.20231027
+VERSION_LONG = 23.6.0.20231030
+VERSION_SHORT = 23.6

config/Version.public.xcconfig

@@ -1,4 +1,2 @@
-VERSION_SHORT=23.5
-
-// Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=23.5.0.3
+VERSION_LONG = 23.6.0.0
+VERSION_SHORT = 23.6

fastlane/Fastfile

@@ -53,7 +53,7 @@ Dotenv.load(USER_ENV_FILE_PATH)
 Dotenv.load(PROJECT_ENV_FILE_PATH)
 GITHUB_REPO = 'wordpress-mobile/wordpress-iOS'
 DEFAULT_BRANCH = 'trunk'
-PUBLIC_CONFIG_FILE = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
+PUBLIC_CONFIG_FILE = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.public.xcconfig')
 INTERNAL_CONFIG_FILE = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.internal.xcconfig')
 ENV['FASTLANE_WWDR_USE_HTTP1_AND_RETRIES'] = 'true'
 
@@ -162,7 +162,7 @@ def build_code_code_freeze_internal
   # Read the current build code from the .xcconfig file and parse it into an AppVersion object
   # The AppVersion is used because WP/JPiOS uses the four part (1.2.3.4) build code format, so the version
   # calculator can be used to calculate the next four-part version
-  release_version_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
+  release_version_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version)
   # Calculate the next release version, which will be used as the basis of the new build code
   release_version_next = VERSION_CALCULATOR.next_release_version(version: release_version_current)
   build_code_code_freeze = INTERNAL_BUILD_CODE_CALCULATOR.next_build_code(version: release_version_next)
@@ -197,7 +197,7 @@ def build_code_next_internal
   # Read the current build code from the .xcconfig file and parse it into an AppVersion object
   # The AppVersion is used because WP/JPiOS uses the four part (1.2.3.4) build code format, so the version
   # calculator can be used to calculate the next four-part version
-  build_code_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG'))
+  build_code_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG'))
   # Calculate the next build code
   build_code_next = INTERNAL_BUILD_CODE_CALCULATOR.next_build_code(version: build_code_current)
   # Return the formatted build code