Merge #22573 & #22590 from release/24.2 to trunk (#22591)

Author: oguzkocer

WordPress/Classes/ViewRelated/Blog/Site Monitoring/SiteMonitoringView.swift

@@ -88,7 +88,7 @@ final class SiteMonitoringViewModel: ObservableObject {
 private enum Strings {
     static let metrics = NSLocalizedString("siteMonitoring.metrics", value: "Metrics", comment: "Title for metrics screen.")
     static let phpLogs = NSLocalizedString("siteMonitoring.phpLogs", value: "PHP Logs", comment: "Title for PHP logs screen.")
-    static let webServerLogs = NSLocalizedString("siteMonitoring.metrics", value: "Web Server Logs", comment: "Title for web server log screen.")
+    static let webServerLogs = NSLocalizedString("siteMonitoring.webServerLogs", value: "Web Server Logs", comment: "Title for web server log screen.")
 }
 
 extension Date {

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift

@@ -787,6 +787,7 @@ import WordPressUI
 
     /// Scrolls to the top of the list of posts.
     @objc func scrollViewToTop() {
+        navigationMenuDelegate?.didScrollToTop()
         guard tableView.numberOfRows(inSection: .zero) > 0 else {
             tableView.setContentOffset(.zero, animated: true)
             return

WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderNavigationMenu.swift

@@ -4,6 +4,7 @@ protocol ReaderNavigationMenuDelegate: AnyObject {
     func scrollViewDidScroll(_ scrollView: UIScrollView, velocity: CGPoint)
     func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>)
     func didTapDiscoverBlogs()
+    func didScrollToTop()
 }
 
 struct ReaderNavigationMenu: View {

WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabView.swift

@@ -249,4 +249,8 @@ extension ReaderTabView: ReaderNavigationMenuDelegate {
         viewModel.showTab(at: discoverIndex)
     }
 
+    func didScrollToTop() {
+        updateMenuDisplay(hidden: false)
+    }
+
 }