Merge 24.3 code freeze (#22631)

wordpress-mobile · Feb 20, 2024 · 339ea0d · 339ea0d
2 parents d6978e2 + 8649a99
commit 339ea0d
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 60 deletions.
diff --git a/Podfile b/Podfile
@@ -50,8 +50,8 @@ def wordpress_ui
 end
 
 def wordpress_kit
-  # pod 'WordPressKit', '~> 13.0'
-  pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: '92c1536724af8bb57ee677996919c2a9e37434e8'
+  pod 'WordPressKit', '~> 13.1'
+  # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: ''
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: ''
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
   # pod 'WordPressKit', path: '../WordPressKit-iOS'
@@ -140,8 +140,8 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  # pod 'WordPressAuthenticator', '~> 9.0'
-  pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: 'fa06fca7178b268d382d91861752b3be0729e8a8'
+  pod 'WordPressAuthenticator', '~> 9.0', '>= 9.0.1'
+  # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: 'fa06fca7178b268d382d91861752b3be0729e8a8'
   # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
   # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -70,7 +70,7 @@ PODS:
     - WordPressKit (~> 13.0)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (13.0.0):
+  - WordPressKit (13.1.0):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
@@ -119,15 +119,17 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.9)
-  - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `fa06fca7178b268d382d91861752b3be0729e8a8`)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `92c1536724af8bb57ee677996919c2a9e37434e8`)
+  - WordPressAuthenticator (>= 9.0.1, ~> 9.0)
+  - WordPressKit (~> 13.1)
   - WordPressShared (~> 2.3)
   - WordPressUI (~> 1.15)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
+    - WordPressAuthenticator
+    - WordPressKit
     - WordPressShared
   trunk:
     - Alamofire
@@ -174,23 +176,11 @@ EXTERNAL SOURCES:
     :tag: 0.2.0
   Gutenberg:
     :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0.podspec
-  WordPressAuthenticator:
-    :commit: fa06fca7178b268d382d91861752b3be0729e8a8
-    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
-  WordPressKit:
-    :commit: 92c1536724af8bb57ee677996919c2a9e37434e8
-    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
-  WordPressAuthenticator:
-    :commit: fa06fca7178b268d382d91861752b3be0729e8a8
-    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
-  WordPressKit:
-    :commit: 92c1536724af8bb57ee677996919c2a9e37434e8
-    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
   Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
@@ -222,8 +212,8 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
   WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
-  WordPressAuthenticator: ba69878bfa1368636e92d29fcfb5bd1e0a11a3ef
-  WordPressKit: 7e5250e9e28fcdca787f8d313a7dc89a8571d774
+  WordPressAuthenticator: 0891ba77c788044d32fe67a4d0435fdd598cecbd
+  WordPressKit: 7189845e0325fc6022a02638b572e1de8c1d7cc6
   WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b
   WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
@@ -236,6 +226,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: cde235b576e5cd0b95b5a64d6bc75628c7adad12
+PODFILE CHECKSUM: c5e45de40d73e6b9d86e8abf4d65a7c53bcd7079
 
 COCOAPODS: 1.14.2
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+24.4
+-----
+
+
 24.3
 -----
 * [***] [internal] Refactored websocket connections to Pinghub. [#22611]

diff --git a/WordPress/Jetpack/Resources/release_notes.txt b/WordPress/Jetpack/Resources/release_notes.txt
@@ -1,5 +1,3 @@
-Dear reader, we’ve added a new look and feel for content navigation and filtering. Now when you’re looking for posts to read, you can find the best and ignore the rest.
-
-We fixed an issue that made images and other media blink away while being uploaded. Presto, no more disappearing act.
-
-Finally, we added new Site Monitoring menu items—including metrics, PHP logs, and web server logs—so you can keep a closer eye on your website. (Don’t worry, it’s not going anywhere.)
+* [***] [internal] Refactored websocket connections to Pinghub. [#22611]
+* [**] Multiple pre-publishing sheet fixes and improvements [#22606]
+* [*] Gravatar: Adds informative new view about Gravatar to the profile editing page. [#22615]
diff --git a/WordPress/Resources/en.lproj/Localizable.strings b/WordPress/Resources/en.lproj/Localizable.strings
@@ -1523,8 +1523,7 @@ Note that the word 'go' here should have a closer meaning to 'start' rather than
 /* Example prompt for the Prompts card in Feature Introduction. */
 "Cast the movie of your life." = "Cast the movie of your life.";
 
-/* Label for Categories
-   Label for the categories field. Should be the same as WP core. */
+/* Label for the categories field. Should be the same as WP core. */
 "Categories" = "Categories";
 
 /* Category menu item in share extension.
@@ -1643,9 +1642,6 @@ Note that the word 'go' here should have a closer meaning to 'start' rather than
    Title for the button to progress with the selected site homepage design. */
 "Choose" = "Choose";
 
-/* Label for Publish date picker */
-"Choose a date" = "Choose a date";
-
 /* Select domain name. Title */
 "Choose a domain" = "Choose a domain";
 
@@ -1752,12 +1748,10 @@ Note that the word 'go' here should have a closer meaning to 'start' rather than
    Period Stats 'Clicks' header */
 "Clicks" = "Clicks";
 
-/* Accessibility label for the date picker's close button.
-   Action button to close edior and cancel changes or insertion of post
+/* Action button to close edior and cancel changes or insertion of post
    Action button to close the editor
    Dismiss the current view
-   Dismisses the current screen
-   Voiceover accessibility label informing the user that this button dismiss the current view */
+   Dismisses the current screen */
 "Close" = "Close";
 
 /* Close account action label */
@@ -6997,6 +6991,28 @@ Please install the %3$@ to use the app with this site.";
 /* Label to show while converting and/or resizing media to send to server */
 "Preparing..." = "Preparing...";
 
+/* Label for a cell in the pre-publishing sheet */
+"prepublishing.categories" = "Categories";
+
+/* Label for a cell in the pre-publishing sheet */
+"prepublishing.jetpackSocial" = "Jetpack Social";
+
+/* Placeholder for a cell in the pre-publishing sheet */
+"prepublishing.postTitle" = "Title";
+
+/* Label in the header in the pre-publishing sheet
+   Voiceover accessibility label informing the user that this button dismiss the current view */
+"prepublishing.pubishingTo" = "Close";
+
+/* Primary button label in the pre-publishing sheet */
+"prepublishing.publish" = "Publish";
+
+/* Label for a cell in the pre-publishing sheet */
+"prepublishing.publishDate" = "Publish Date";
+
+/* Primary button label in the pre-publishing shee */
+"prepublishing.schedule" = "Schedule";
+
 /* The primary label for the auto-sharing row on the pre-publishing sheet.
 Indicates the number of social accounts that will be sharing the blog post.
 %1$d is a placeholder for the number of social network accounts that will be auto-shared.
@@ -7056,6 +7072,12 @@ Tapping on this row allows the user to edit the sharing message. */
 /* The navigation title for the pre-publishing social accounts screen. */
 "prepublishing.socialAccounts.navigationTitle" = "Social";
 
+/* Label for a cell in the pre-publishing sheet */
+"prepublishing.tags" = "Tags";
+
+/* Label for a cell in the pre-publishing sheet */
+"prepublishing.visibility" = "Visibility";
+
 /* Displays the Post Preview Interface
    Title for button to preview a selected layout
    Title for screen to preview a selected homepage design.
@@ -7157,18 +7179,13 @@ Tapping on this row allows the user to edit the sharing message. */
 /* Title of a Quick Start Tour */
 "Publish a post" = "Publish a post";
 
-/* Label for Publish date
-   Label for the publish date button. */
+/* Label for the publish date button. */
 "Publish Date" = "Publish Date";
 
-/* Immediately publish button title */
-"Publish immediately" = "Publish immediately";
-
 /* A short phrase indicating a post is due to be immedately published. */
 "Publish Immediately" = "Publish Immediately";
 
-/* Label for a button that publishes the post
-   Title of button allowing the user to immediately publish the post they are editing. */
+/* Title of button allowing the user to immediately publish the post they are editing. */
 "Publish Now" = "Publish Now";
 
 /* Text displayed in the share extension's summary view. It describes the publish page action. */
@@ -7177,6 +7194,18 @@ Tapping on this row allows the user to edit the sharing message. */
 /* Text displayed in the share extension's summary view. It describes the publish post action. */
 "Publish post on:" = "Publish post on:";
 
+/* Shows the download or upload progress with two parameters: preformatted completed and total bytes */
+"publishButton.progress" = "%1$@ of %2$@";
+
+/* Retry button title */
+"publishButton.retry" = "Retry";
+
+/* The Now button that clears the date selection */
+"publishDatePicker.now" = "Now";
+
+/* Post publish date picker */
+"publishDatePicker.title" = "Publish Date";
+
 /* Name for the status of a published post.
    Period Stats 'Published' header
    Title of the published filter. This filter shows a list of posts that the user has published. */
@@ -8126,9 +8155,6 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Schedule button, this is what the Publish button changes to in the Post Editor if the post has been scheduled for posting later. */
 "Schedule" = "Schedule";
 
-/* Label for the button that schedules the post */
-"Schedule Now" = "Schedule Now";
-
 /* Name for the status of a scheduled post
    Title of the scheduled filter. This filter shows a list of posts that are scheduled to be published at a future date. */
 "Scheduled" = "Scheduled";
@@ -9107,6 +9133,42 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* A hint shown to the user in stats informing the user that one of their posts has received a like. The %1$@ placeholder will be replaced with the title of a post, and the %2$@ will be replaced by the numeral one. */
 "stats.insights.totalLikes.guideText.singular" = "Your latest post %1$@ has received %2$@ like.";
 
+/* This description is used to set the accessibility label for the Stats Traffic chart, with Comments selected. */
+"stats.traffic.accessibilityLabel.comments" = "Bar Chart depicting Comments for the selected period.";
+
+/* This description is used to set the accessibility label for the Stats Traffic chart, with Likes selected. */
+"stats.traffic.accessibilityLabel.likes" = "Bar Chart depicting Likes for the selected period.";
+
+/* This description is used to set the accessibility label for the Stats Traffic chart, with Views selected. */
+"stats.traffic.accessibilityLabel.views" = "Bar Chart depicting Views for selected period";
+
+/* This description is used to set the accessibility label for the Stats Traffic chart, with Visitors selected. */
+"stats.traffic.accessibilityLabel.visitors" = "Bar Chart depicting Visitors for the selected period.";
+
+/* Text for the Stats Traffic Overview stat difference label. Shows the change from the previous period. E.g.: +12.3K. %1$@ is the placeholder for the change sign ('-', '+', or none). %2$@ is the placeholder for the change numerical value. */
+"stats.traffic.differenceLabelWithoutPercentage" = "%1$@%2$@";
+
+/* Text for the Stats Traffic Overview stat difference label. Shows the change from the previous period, including the percentage value. E.g.: +12.3K (5%). %1$@ is the placeholder for the change sign ('-', '+', or none). %2$@ is the placeholder for the change numerical value. %3$@ is the placeholder for the change percentage value, excluding the % sign. */
+"stats.traffic.differenceLabelWithPercentage" = "%1$@%2$@ (%3$@%%)";
+
+/* Stats views higher than previous month */
+"stats.traffic.label.monthDifference.higher" = "%@ higher than the previous month\n";
+
+/* Stats views lower than previous month */
+"stats.traffic.label.monthDifference.lower" = "%@ lower than the previous month\n";
+
+/* Stats views higher than previous 7 days */
+"stats.traffic.label.weekDifference.higher" = "%@ higher than the previous 7-days\n";
+
+/* Stats views lower than previous 7 days */
+"stats.traffic.label.weekDifference.lower" = "%@ lower than the previous 7-days\n";
+
+/* Stats views higher than previous year */
+"stats.traffic.label.yearDifference.higher" = "%@ higher than the previous year\n";
+
+/* Stats views lower than previous year */
+"stats.traffic.label.yearDifference.lower" = "%@ lower than the previous year\n";
+
 /* The status of the post. Should be the same as in core WP. */
 "Status" = "Status";
 
@@ -9418,7 +9480,6 @@ Example: given a notice format "Following %@" and empty site name, this will be
 "Tagline" = "Tagline";
 
 /* Label for selecting the blogs tags
-   Label for Tags
    Label for the tags field. Should be the same as WP core.
    Label for the Tags Section in the Blog Settings
    Tags menu item in share extension.
@@ -9516,6 +9577,9 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Accessibility hint for button used to view the user's site */
 "Tap to view your site" = "Tap to view your site";
 
+/* Accessibility hint, informing user the button can be used to visit the Gravatar website. */
+"Tap to visit the Gravatar website in an external browser" = "Tap to visit the Gravatar website in an external browser";
+
 /* A hint about the completed guided tour. */
 "Task complete." = "Task complete.";
 
@@ -9969,7 +10033,6 @@ Example: given a notice format "Following %@" and empty site name, this will be
    Label for list of stats by content title.
    Noun. Label for the title of a media asset (image / video)
    Placeholder for the post title.
-   Placeholder for title
    Post title
    Title of the new Category being created. */
 "Title" = "Title";
@@ -10323,6 +10386,12 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Unhides a site from the site picker list */
 "Unhide" = "Unhide";
 
+/* Message for error notice shown if the app can't find a specific site belonging to the user */
+"universalLink.qrCodeMedia.error.message" = "Check that you are logged into the correct account";
+
+/* Title for error notice shown if the app can't find a specific site belonging to the user */
+"universalLink.qrCodeMedia.error.title" = "Site not found";
+
 /* Label for size of media when it's not possible to calculate it.
    Unknown Tag Name */
 "Unknown" = "Unknown";
@@ -10408,6 +10477,9 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Title for sheet displayed allowing user to update their site icon */
 "Update Site Icon" = "Update Site Icon";
 
+/* A notice message that's shown after the user updates their profile information. */
+"Updates might take some time to sync with your Gravatar profile." = "Updates might take some time to sync with your Gravatar profile.";
+
 /* Accessibility hint for the Comments button in Stats Overview. */
 "Updates the bar chart to show comments." = "Updates the bar chart to show comments.";
 
@@ -10426,6 +10498,9 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Describes a status of a plugin */
 "Updating" = "Updating";
 
+/* Text in the profile editing page. Lets the user know about the consequences of their profile editing actions and how this relates to Gravatar. */
+"Updating your avatar, name and about info here will also update it across all sites that use Gravatar profiles." = "Updating your avatar, name and about info here will also update it across all sites that use Gravatar profiles.";
+
 /* Text displayed in HUD while a draft or scheduled post is being updated. */
 "Updating..." = "Updating...";
 
@@ -10639,8 +10714,7 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Insights views and visitors header */
 "Views & Visitors" = "Views & Visitors";
 
-/* Label for Visibility
-   The visibility settings of the post. Should be the same as in core WP.
+/* The visibility settings of the post. Should be the same as in core WP.
    Visibility label */
 "Visibility" = "Visibility";
 
@@ -11027,6 +11101,9 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* No comment provided by engineer. */
 "What is alt text?" = "What is alt text?";
 
+/* This is a link that takes the user to the external Gravatar website */
+"What is Gravatar?" = "What is Gravatar?";
+
 /* Navigates to page with details about What is WordPress.com. */
 "What is WordPress.com?" = "What is WordPress.com?";
 
@@ -11658,6 +11735,9 @@ from anywhere.";
 /* Prompt displayed as part of the stats Weekly Roundup push notification. */
 "Your weekly roundup is ready, tap here to see the details!" = "Your weekly roundup is ready, tap here to see the details!";
 
+/* Text in the profile editing page. Let the user know that their profile is managed by Gravatar. */
+"Your WordPress.com profile is powered by Gravatar." = "Your WordPress.com profile is powered by Gravatar.";
+
 /* Footer for AMP Traffic Site Setting, should match Calypso. */
 "Your WordPress.com site supports the use of Accelerated Mobile Pages, a Google-led initiative that dramatically speeds up loading times on mobile devices." = "Your WordPress.com site supports the use of Accelerated Mobile Pages, a Google-led initiative that dramatically speeds up loading times on mobile devices.";
 

diff --git a/WordPress/Resources/release_notes.txt b/WordPress/Resources/release_notes.txt
@@ -1 +1,3 @@
-We fixed an issue that made images and other media “blink” while being uploaded. Presto, no more disappearing act.
+* [***] [internal] Refactored websocket connections to Pinghub. [#22611]
+* [**] Multiple pre-publishing sheet fixes and improvements [#22606]
+* [*] Gravatar: Adds informative new view about Gravatar to the profile editing page. [#22615]
diff --git a/WordPress/WordPressTest/CommentService+RepliesTests.swift b/WordPress/WordPressTest/CommentService+RepliesTests.swift
@@ -89,11 +89,15 @@ final class CommentService_RepliesTests: CoreDataTestCase {
         let (mockService, mockApi) = makeMockService()
         let parentKey = CommentServiceRemoteREST.RequestKeys.parent.rawValue
 
-        mockService.getLatestReplyID(for: commentID,
-                                     siteID: siteID,
-                                     accountService: accountService,
-                                     success: { _ in },
-                                     failure: { _ in })
+        waitUntil { done in
+            mockService.getLatestReplyID(
+                for: self.commentID,
+                siteID: self.siteID,
+                accountService: self.accountService,
+                success: { _ in done() },
+                failure: { _ in done() }
+            )
+        }
 
         var parameters = [String: Any]()
         expect(mockApi.parametersPassedIn).toNot(beNil())
-Original file line number
+Diff line change
@@ -1,3 +1,7 @@
+.4
+    -----
 .3
     -----
     * [***] [internal] Refactored websocket connections to Pinghub. [#22611]
@@ Expand Down @@