Merge beta version 18.2.0.1 (#17136)

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 -----
 * [internal] Fixed an issue where source and platform tags were not added to a Zendesk ticket if the account has no blogs. [#17084]
 * [*] Set the post formats to have 'Standard' first and then alphabetized the remaining items. [#17074]
+* [*] Fixed wording of theme customization screen's menu bar by using "Activate" on inactive themes. [#17060]
 * [*] Added pull-to-refresh to My Site. [#17089]
 * [***] Weekly Roundup: users will receive a weekly notification that presents a summary of the activity on their most used sites [#17066, #17116]
 * [**] Site Comments: when editing a Comment, the author's name, email address, and web address can now be changed. [#17111]

WordPress/Classes/ViewRelated/Post/PostEditorAnalyticsSession.swift

@@ -96,7 +96,7 @@ private extension PostEditorAnalyticsSession {
         static let template = "template"
         static let startupTime = "startup_time_ms"
         static let canViewEditorOnboarding = "can_view_editor_onboarding"
-        static let unstableGalleryWithImageBlocks = "unstableGalleryWithImageBlocks"
+        static let unstableGalleryWithImageBlocks = "unstable_gallery_with_image_blocks"
     }
 
     var commonProperties: [String: String] {

WordPress/Classes/ViewRelated/Themes/ThemeBrowserViewController.swift

@@ -840,7 +840,7 @@ public protocol ThemePresenter: AnyObject {
         _ = themeService.installTheme(theme,
             for: blog,
             success: { [weak self] in
-                self?.presentUrlForTheme(theme, url: theme.customizeUrl(), activeButton: false)
+                self?.presentUrlForTheme(theme, url: theme.customizeUrl(), activeButton: !theme.isCurrentTheme())
             }, failure: nil)
     }
 
@@ -857,7 +857,7 @@ public protocol ThemePresenter: AnyObject {
         if let theme = theme, self.blog.supports(.customThemes) && !theme.custom {
             installThemeAndPresentCustomizer(theme)
         } else {
-            presentUrlForTheme(theme, url: theme?.customizeUrl(), activeButton: false)
+            presentUrlForTheme(theme, url: theme?.customizeUrl(), activeButton: !(theme?.isCurrentTheme() ?? true))
         }
     }
 

config/Version.internal.xcconfig

@@ -1,4 +1,4 @@
 VERSION_SHORT=18.2
 
 // Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=18.2.0.20210906
+VERSION_LONG=18.2.0.20210909

config/Version.public.xcconfig

@@ -1,4 +1,4 @@
 VERSION_SHORT=18.2
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=18.2.0.0
+VERSION_LONG=18.2.0.1

fastlane/metadata/default/release_notes.txt

@@ -1,9 +1,8 @@
-Do you use the Embed block? For media that you embed on your site, you’ll now see an option to “Resize for smaller devices.” Toggle on to resize your content to fit your screen; toggle off to disable.
+- Stay informed! You can now receive a weekly summary of the activity on your most popular sites.
 
-Enjoying the Blogging Reminders tool? We’ve added a new feature that lets you choose a specific time to receive a notification.
+- You have even more control of your site comments — when you edit them you can now also adjust the author’s name, email address, and web address.
+We have made a couple of handy tweaks to the Block editor. The Embed block now gives you a sneak preview when you add something from YouTube or Twitter (more providers to come). Also, when you go to insert a block and nothing is found, there is now a no results view.
 
-Need to close your account? (We hope you never leave us!) But if needed, you now have the ability to do so in your Account Settings.
+- If you go to Post Settings > Post Format, you will find the “Standard” option still at the top, but the other options are now neatly alphabetized below. (Options will vary with themes!)
 
-Geotagging posts is no longer supported on the web, so we’ve removed the Location option under Post Settings.
-
-We also made other improvements, including a fix to a cropping issue in the Reader, as well as the ability to recommend the app to your friends on your Me and About screens.
+- And one more quick one: Refreshing your site is now super easy — just pull to refresh from the My Site screen!