Merge remote-tracking branch 'origin/release/19.2' into remove/circle-ci

Got a conflict in `Gemfile.lock`:

```diff
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -161,12 -159,11 +161,18 @@@ GE
        xcodeproj (>= 1.13.0, < 2.0.0)
        xcpretty (~> 0.3.0)
        xcpretty-travis-formatter (>= 0.0.3)
++<<<<<<< HEAD
 +    fastlane-plugin-appcenter (1.11.0)
 +    fastlane-plugin-sentry (1.8.1)
 +    fastlane-plugin-wpmreleasetoolkit (3.0.0)
++=======
+     fastlane-plugin-appcenter (1.11.1)
+     fastlane-plugin-sentry (1.11.0)
+     fastlane-plugin-wpmreleasetoolkit (2.3.0)
++>>>>>>> origin/release/19.2
        activesupport (~> 5)
        bigdecimal (~> 1.4)
 +      buildkit (~> 1.4)
        chroma (= 0.2.0)
        diffy (~> 3.3)
        git (~> 1.3)```
```

The reason is that `release/19.2` updated Fastlane, which in turn
updated the App Center and Sentry plugins, while this branch updated the
release toolkit.

I solved the conflict by keeping both sets of updates. I then run
`bundle install` to verify the `Gemfile.lock` was functional.

Author: mokagio

.buildkite/commands/run-ui-tests.sh

@@ -27,4 +27,13 @@ install_cocoapods
 echo "--- 🧪 Testing"
 xcrun simctl list >> /dev/null
 rake mocks &
+set +e
 bundle exec fastlane test_without_building name:"$TEST_NAME" try_count:3 device:"$DEVICE" ios_version:"$IOS_VERSION"
+TESTS_EXIT_STATUS=$?
+set -e
+
+echo "--- 📦 Zipping test results"
+cd build/results/ && zip -rq WordPress.xcresult.zip WordPress.xcresult
+
+echo "--- 🚦 Report Tests Exit Status"
+exit $TESTS_EXIT_STATUS

.buildkite/pipeline.yml

@@ -81,7 +81,7 @@ steps:
     env: *common_env
     plugins: *common_plugins
     artifact_paths:
-      - "build/results/"
+      - "build/results/*"
     notify:
       - github_commit_status:
           context: "UI Tests (iPhone)"
@@ -92,7 +92,7 @@ steps:
     env: *common_env
     plugins: *common_plugins
     artifact_paths:
-      - "build/results/"
+      - "build/results/*"
     notify:
       - github_commit_status:
           context: "UI Tests (iPad)"

Gemfile.lock

@@ -16,17 +16,17 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.551.0)
-    aws-sdk-core (3.125.5)
+    aws-partitions (1.552.0)
+    aws-sdk-core (3.126.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-kms (1.54.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.3)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-s3 (1.112.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -92,7 +92,7 @@ GEM
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.90.0)
+    excon (0.91.0)
     faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -122,7 +122,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.203.0)
+    fastlane (2.204.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -161,8 +161,8 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-appcenter (1.11.0)
-    fastlane-plugin-sentry (1.8.1)
+    fastlane-plugin-appcenter (1.11.1)
+    fastlane-plugin-sentry (1.11.0)
     fastlane-plugin-wpmreleasetoolkit (3.0.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
@@ -177,11 +177,11 @@ GEM
       progress_bar (~> 1.3)
       rake (>= 12.3, < 14.0)
       rake-compiler (~> 1.0)
-    ffi (1.15.5)
+    ffi (1.15.4)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    git (1.10.2)
+    git (1.10.0)
       rchardet (~> 1.8)
     google-apis-androidpublisher_v3 (0.16.0)
       google-apis-core (>= 0.4, < 2.a)
@@ -225,7 +225,7 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.9.1)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     jmespath (1.5.0)
     json (2.6.1)
@@ -236,7 +236,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.6.1)
     minitest (5.15.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
@@ -245,13 +245,13 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.13.11)
+    oj (3.13.10)
     optimist (3.0.1)
     options (2.3.2)
     optparse (0.1.1)
@@ -264,7 +264,7 @@ GEM
     public_suffix (4.0.6)
     racc (1.6.0)
     rake (13.0.6)
-    rake-compiler (1.1.9)
+    rake-compiler (1.1.6)
       rake
     rchardet (1.8.0)
     representable (3.1.1)

Podfile

@@ -20,7 +20,7 @@ workspace 'WordPress.xcworkspace'
 ## ===================================
 ##
 def wordpress_shared
-    pod 'WordPressShared', '~> 1.17.1-beta.1'
+    pod 'WordPressShared', '~> 1.17.1'
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :tag => ''
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit  => ''
@@ -39,15 +39,15 @@ def aztec
 end
 
 def wordpress_ui
-    pod 'WordPressUI', '~> 1.12.3'
+    pod 'WordPressUI', '~> 1.12.4'
     #pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :tag => ''
     #pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :branch => ''
     #pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :commit => ''
     #pod 'WordPressUI', :path => '../WordPressUI-iOS'
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.47.0-beta.4'
+    pod 'WordPressKit', '~> 4.47.0'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''

Podfile.lock

@@ -463,18 +463,18 @@ PODS:
     - WordPressKit (~> 4.18-beta)
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.47.0-beta.4):
+  - WordPressKit (4.47.0):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
     - WordPressShared (~> 1.15-beta)
     - wpxmlrpc (~> 0.9)
   - WordPressMocks (0.0.15)
-  - WordPressShared (1.17.1-beta.1):
+  - WordPressShared (1.17.1):
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (~> 1.8)
-  - WordPressUI (1.12.3)
+  - WordPressUI (1.12.4)
   - WPMediaPicker (1.8.2)
   - wpxmlrpc (0.9.0)
   - Yoga (1.14.0)
@@ -567,10 +567,10 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.7)
   - WordPressAuthenticator (~> 1.43.0)
-  - WordPressKit (~> 4.47.0-beta.4)
+  - WordPressKit (~> 4.47.0)
   - WordPressMocks (~> 0.0.15)
-  - WordPressShared (~> 1.17.1-beta.1)
-  - WordPressUI (~> 1.12.3)
+  - WordPressShared (~> 1.17.1)
+  - WordPressUI (~> 1.12.4)
   - WPMediaPicker (~> 1.8.2)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.71.0/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
@@ -579,8 +579,6 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
-    - WordPressKit
-    - WordPressShared
   trunk:
     - Alamofire
     - AlamofireImage
@@ -619,7 +617,9 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
+    - WordPressKit
     - WordPressMocks
+    - WordPressShared
     - WordPressUI
     - WPMediaPicker
     - wpxmlrpc
@@ -831,10 +831,10 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 144f124148079084860368dfd27cb96e0952853e
   WordPress-Editor-iOS: 20551d5a5e51f29832064f08faaaae8e1da7e1e2
   WordPressAuthenticator: e4a43745a647e4dc4b35d21b1353bc4f07f9f3c9
-  WordPressKit: 99ce7f470aff4a4acf518ac25efd6eb4ad9df996
+  WordPressKit: 46f0580eb097ddfab7ab143208f94b44def42632
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
-  WordPressShared: bc50e38a31e05134a7c643cef9cf6a7e28e9cf34
-  WordPressUI: 45591178e843ecb82e65e868ec766148befe9f9f
+  WordPressShared: 0c4bc5e25765732fcf5d07f28c81970ab28493fb
+  WordPressUI: 9e470758bc3a4a25e94478c2babe106f4ae7315a
   WPMediaPicker: a34b708a7b995a0889bd5098e3b79f4a50a7a9bd
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
@@ -847,6 +847,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: 492dd2b02f553799011a52c6949548ef8f7997ca
+PODFILE CHECKSUM: ca4d734683bfbe3120236b9255854f51086f6c0b
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+19.3
+-----
+
+
 19.2
 -----
 * [*] Site creation: Fixed bug where sites created within the app were not given the correct time zone, leading to post scheduling issues. [#17821]
@@ -7,7 +11,10 @@
 * [**] Notifications: added a button to mark all notifications in the selected filter as read. [#17840]
 * [**] People: you can now manage Email Followers on the People section! [#17854]
 * [*] Stats: fix navigation between Stats tab. [#17856]
-* [*] Quick Start: Fixed a bug where a user logging in via a self-hosted site not connected to Jetpack would see Quick Start when selecting "No thanks" on the Quick Start prompt. [#17855] 
+* [*] Quick Start: Fixed a bug where a user logging in via a self-hosted site not connected to Jetpack would see Quick Start when selecting "No thanks" on the Quick Start prompt. [#17855]
+* [**] Threaded comments: comments can now be moderated via a drop-down menu on each comment. [#17888]
+* [*] Stats: Users can now add a new Insights card from the navigation bar. [#17867]
+* [*] Site creation: The checkbox that appears when choosing a design no longer flickers when toggled. [#17868]
 
 19.1
 -----

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -66,7 +66,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
         case .postDetailsComments:
             return true
         case .commentThreadModerationMenu:
-            return false
+            return true
         case .mySiteDashboard:
             return false
         case .markAllNotificationsAsRead:

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+DomainCredit.swift

@@ -33,7 +33,15 @@ extension BlogDetailsViewController {
     private func presentDomainCreditRedemptionSuccess(domain: String) {
         let controller = DomainCreditRedemptionSuccessViewController(domain: domain, delegate: self)
         present(controller, animated: true) { [weak self] in
-            self?.updateTableViewAndHeader()
+            self?.updateTableView {
+                guard
+                    let parent = self?.parent as? MySiteViewController,
+                    let blog = self?.blog
+                else {
+                    return
+                }
+                parent.sitePickerViewController?.blogDetailHeaderView.blog = blog
+            }
         }
     }
 }