Merge changes from 23.9.0.2 (#22228)

Author: mokagio

Gemfile.lock

@@ -21,29 +21,29 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     artifactory (3.0.15)
     ast (2.4.2)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.843.0)
-    aws-sdk-core (3.185.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.865.0)
+    aws-sdk-core (3.190.0)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-kms (1.74.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.141.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     buildkit (1.5.0)
@@ -131,14 +131,13 @@ GEM
     diffy (3.4.2)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.104.0)
+    excon (0.105.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -170,7 +169,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.216.0)
+    fastlane (2.217.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -237,7 +236,7 @@ GEM
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.51.0)
+    google-apis-androidpublisher_v3 (0.53.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
@@ -252,24 +251,25 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
+    google-cloud-env (2.1.0)
+      faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.29.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.9.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
@@ -282,7 +282,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
     kramdown (2.4.0)
       rexml
@@ -381,9 +381,6 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
     word_wrap (1.0.0)

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 
 23.9
 -----
+* [**] Updates the My Site header to show site actions in a context menu [#22151]
 * [**] Add media fitlers to the Site Media screen [#22096]
 * [*] The "aspect ratio" mode on the Site Media screen is now also available on iPhone via the new title menu [#22096]
 * [**] Update the classic editor to use the new Photos and Site Media pickers [#22060]

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -264,6 +264,10 @@ import Foundation
     case mySiteNoSitesViewActionTapped
     case mySiteNoSitesViewHidden
 
+    // My Site: Header Actions
+    case mySiteHeaderMoreTapped
+    case mySiteHeaderPersonalizeHomeTapped
+
     // Site Switcher
     case mySiteSiteSwitcherTapped
     case siteSwitcherDisplayed
@@ -1014,6 +1018,12 @@ import Foundation
         case .mySiteNoSitesViewHidden:
             return "my_site_no_sites_view_hidden"
 
+        // My Site Header Actions
+        case .mySiteHeaderMoreTapped:
+            return "my_site_header_more_tapped"
+        case .mySiteHeaderPersonalizeHomeTapped:
+            return "my_site_header_personalize_home_tapped"
+
         // Site Switcher
         case .mySiteSiteSwitcherTapped:
             return "my_site_site_switcher_tapped"

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift

@@ -162,10 +162,7 @@ private struct BloganuaryNudgeCardView: View {
 
         static let description = NSLocalizedString(
             "bloganuary.dashboard.card.description",
-            value: """
-            For the month of January, blogging prompts will come from Bloganuary - \
-            our community challenge to build a blogging habit for the new year.
-            """,
+            value: "For the month of January, blogging prompts will come from Bloganuary — our community challenge to build a blogging habit for the new year.",
             comment: "Short description for the Bloganuary event, shown right below the title."
         )
 

WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/BlogDetailHeaderView.swift

@@ -120,6 +120,9 @@ class BlogDetailHeaderView: UIView {
         if let siteActionsMenu = delegate?.makeSiteActionsMenu() {
             titleView.siteActionButton.showsMenuAsPrimaryAction = true
             titleView.siteActionButton.menu = siteActionsMenu
+            titleView.siteActionButton.addAction(UIAction { _ in
+                WPAnalytics.trackEvent(.mySiteHeaderMoreTapped)
+            }, for: .menuActionTriggered)
         }
 
         if let siteIconMenu = delegate?.makeSiteIconMenu() {

WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteActions.swift

@@ -46,14 +46,15 @@ extension SitePickerViewController {
             return DDLogError("Failed to show dashboard personalization screen: siteID is missing")
         }
 
-        // TODO: track event
         let viewController = UIHostingController(rootView: NavigationView {
             BlogDashboardPersonalizationView(viewModel: .init(blog: self.blog, service: .init(siteID: siteID)))
         }.navigationViewStyle(.stack)) // .stack is required for iPad
         if UIDevice.isPad() {
             viewController.modalPresentationStyle = .formSheet
         }
         present(viewController, animated: true)
+
+        WPAnalytics.trackEvent(.mySiteHeaderPersonalizeHomeTapped)
     }
 }
 

WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailToolbar.swift

@@ -36,7 +36,7 @@ class ReaderDetailToolbar: UIView, NibLoadable {
     }
 
     private var likeCount: Int {
-        post?.likeCount.intValue ?? 0
+        post?.likeCount?.intValue ?? 0
     }
 
     override func awakeFromNib() {