Merge branch 'main' into task/ET-5868

Modules/App/Sources/Utils/ProtonMailUniffi/PMCustomLabel+Mapping.swift

@@ -39,7 +39,7 @@ extension PMSystemLabel {
         return .init(
             folderID: id,
             type: systemFolder,
-            unreadCount: UnreadCountFormatter.stringIfGreaterThan0(count: unread),
+            unreadCount: UnreadCountFormatter.stringIfGreaterThan0(count: count),
             isSelected: false
         )
     }

Modules/App/Tests/TestData/PMSystemLabel+TestData.swift

@@ -38,8 +38,7 @@ extension PMSystemLabel {
             notify: false,
             displayOrder: displayOrder,
             sticky: false,
-            total: 0,
-            unread: 0
+            count: 0
         )
     }
 }

Modules/InboxIAP/Sources/Telemetry/TelemetryReporter.swift

@@ -64,7 +64,7 @@ final class TelemetryReporter: TelemetryReporting {
     }
 
     private func generalDimensions() -> GeneralDimensions {
-        .init(upsellEntryPoint: entryPoint!, planBeforeUpgrade: "free", modalVariant: .comparison)
+        .init(upsellEntryPoint: entryPoint!, planBeforeUpgrade: "free", modalVariant: .comparisonPlus)
     }
 
     private func planSpecificDimensions(storeKitProductID: String) -> PlanSpecificDimensions {

Modules/InboxIAP/Tests/TelemetryReporterTests.swift

@@ -31,7 +31,7 @@ final class TelemetryReporterTests {
         .init(
             upsellEntryPoint: entryPoint,
             planBeforeUpgrade: "free",
-            modalVariant: .comparison
+            modalVariant: .comparisonPlus
         )
     }
 

mail-sdk-version

@@ -1 +1 @@
-0.164.0
+0.164.2