Merge branch 'release/7.8' into issue/4960-plugins

Author: allendav

WooCommerce/Classes/Tools/Logging/WooCrashLoggingStack.swift

@@ -116,6 +116,10 @@ class WCCrashLoggingDataProvider: CrashLoggingDataProvider {
         return BuildConfiguration.current.rawValue
     }
 
+    var shouldEnableAutomaticSessionTracking: Bool {
+        return CrashLoggingSettings.didOptIn
+    }
+
     @objc func updateCrashLoggingSystem(_ notification: Notification) {
         /// Bumping this call to a later run loop is a little bit hack-y, but because the `StoresManager` fires the events
         /// we're interested as part of its initialization, we need to wait for that initalization to be complete before

WooCommerce/Classes/ViewRelated/Dashboard/Settings/SettingsViewController.swift

@@ -81,10 +81,6 @@ final class SettingsViewController: UIViewController {
     ///
     private var storePickerCoordinator: StorePickerCoordinator?
 
-    /// Flag indicating whether the currently selected store is eligible
-    /// for card present payments
-    private var canCollectPayments: Bool = false
-
     /// Announcement for the current app version
     ///
     private var announcement: Announcement?
@@ -204,21 +200,6 @@ private extension SettingsViewController {
         sites = sitesResultsController.fetchedObjects
     }
 
-    /// Determine if any payment gateway account for this site supports card present payments
-    ///
-    private func checkAvailabilityForPayments() {
-        paymentGatewayAccounts = paymentGatewayAccountsResultsController?.fetchedObjects ?? []
-        canCollectPayments = paymentGatewayAccounts.contains(where: \.isCardPresentEligible)
-    }
-
-    private var storeSettingsRows: [Row] {
-        var result = [Row]()
-        if canCollectPayments {
-            result.append(.inPersonPayments)
-        }
-        return result
-    }
-
     func configureTableViewFooter() {
         // `tableView.tableFooterView` can't handle a footerView that uses autolayout only.
         // Hence the container view with a defined frame.
@@ -239,7 +220,6 @@ private extension SettingsViewController {
 
     func refreshViewContent() {
         updateSites()
-        checkAvailabilityForPayments()
         configureSections()
         tableView.reloadData()
     }
@@ -299,14 +279,12 @@ private extension SettingsViewController {
             sections.append(Section(title: pluginsTitle, rows: [.plugins], footerHeight: UITableView.automaticDimension))
         }
 
-        // Store Settings
-        if storeSettingsRows.isNotEmpty {
-            sections.append(
-                Section(title: storeSettingsTitle,
-                        rows: storeSettingsRows,
-                        footerHeight: UITableView.automaticDimension)
+        sections.append(
+            Section(title: storeSettingsTitle,
+                rows: [.inPersonPayments],
+                footerHeight: UITableView.automaticDimension
             )
-        }
+        )
 
         // Help & Feedback
         if couldShowBetaFeaturesRow() {