Fix unsupported condition detection in timeline subcomponents

cursoragent · cursoragent · commit b37f7a577519 · 2026-03-05T13:55:43.000Z
diff --git a/RevenueCatUI/Templates/V2/ViewModelHelpers/PresentedPartials.swift b/RevenueCatUI/Templates/V2/ViewModelHelpers/PresentedPartials.swift
@@ -393,7 +393,12 @@ extension PaywallComponent.TimelineComponent {
 
     func containsUnsupportedConditions() -> Bool {
         (overrides?.hasUnsupportedCondition() == true) ||
-        items.contains(where: { $0.overrides?.hasUnsupportedCondition() == true })
+        items.contains(where: {
+            ($0.overrides?.hasUnsupportedCondition() == true) ||
+            ($0.title.overrides?.hasUnsupportedCondition() == true) ||
+            ($0.description?.overrides?.hasUnsupportedCondition() == true) ||
+            ($0.icon.overrides?.hasUnsupportedCondition() == true)
+        })
     }
 
 }
diff --git a/Tests/RevenueCatUITests/PaywallsV2/ToPresentedOverridesTests.swift b/Tests/RevenueCatUITests/PaywallsV2/ToPresentedOverridesTests.swift
@@ -237,6 +237,36 @@ class ToPresentedOverridesTests: TestCase {
         expect(tabs.containsUnsupportedConditions()).to(beFalse())
     }
 
+    func testTimelineWithUnsupportedConditionInTitle_ReturnsTrue() throws {
+        let timeline = self.makeTimeline(
+            titleOverrides: [
+                .init(extendedConditions: [.unsupported], properties: .init())
+            ]
+        )
+
+        expect(timeline.containsUnsupportedConditions()).to(beTrue())
+    }
+
+    func testTimelineWithUnsupportedConditionInDescription_ReturnsTrue() throws {
+        let timeline = self.makeTimeline(
+            descriptionOverrides: [
+                .init(extendedConditions: [.unsupported], properties: .init())
+            ]
+        )
+
+        expect(timeline.containsUnsupportedConditions()).to(beTrue())
+    }
+
+    func testTimelineWithUnsupportedConditionInIcon_ReturnsTrue() throws {
+        let timeline = self.makeTimeline(
+            iconOverrides: [
+                .init(extendedConditions: [.unsupported], properties: .init())
+            ]
+        )
+
+        expect(timeline.containsUnsupportedConditions()).to(beTrue())
+    }
+
     func testButtonWithUnsupportedConditionInStack_ReturnsTrue() throws {
         let button = PaywallComponent.ButtonComponent(
             action: .restorePurchases,
@@ -508,6 +538,67 @@ class ToPresentedOverridesTests: TestCase {
         expect(result.count).to(equal(3))
     }
 
+    private func makeTimeline(
+        titleOverrides: PaywallComponent.ComponentOverrides<PaywallComponent.PartialTextComponent>? = nil,
+        descriptionOverrides: PaywallComponent.ComponentOverrides<PaywallComponent.PartialTextComponent>? = nil,
+        iconOverrides: PaywallComponent.ComponentOverrides<PaywallComponent.PartialIconComponent>? = nil
+    ) -> PaywallComponent.TimelineComponent {
+        let title = PaywallComponent.TextComponent(
+            text: "text_1",
+            color: .init(light: .hex("#000000")),
+            overrides: titleOverrides
+        )
+
+        let description: PaywallComponent.TextComponent? = descriptionOverrides.map { overrides in
+            .init(
+                text: "text_1",
+                color: .init(light: .hex("#000000")),
+                overrides: overrides
+            )
+        }
+
+        let icon = PaywallComponent.IconComponent(
+            baseUrl: "https://revenuecat.com",
+            iconName: "icon",
+            formats: .init(
+                svg: "icon.svg",
+                png: "icon.png",
+                heic: "icon.heic",
+                webp: "icon.webp"
+            ),
+            size: .init(width: .fit, height: .fit),
+            padding: .zero,
+            margin: .zero,
+            color: .init(light: .hex("#000000")),
+            iconBackground: nil,
+            overrides: iconOverrides
+        )
+
+        let item = PaywallComponent.TimelineComponent.Item(
+            title: title,
+            description: description,
+            icon: icon,
+            connector: .init(
+                width: 1,
+                color: .init(light: .hex("#000000")),
+                margin: .zero
+            ),
+            overrides: nil
+        )
+
+        return .init(
+            iconAlignment: nil,
+            itemSpacing: nil,
+            textSpacing: nil,
+            columnGutter: nil,
+            size: .init(width: .fill, height: .fit),
+            padding: .zero,
+            margin: .zero,
+            items: [item],
+            overrides: nil
+        )
+    }
+
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,12 @@ extension PaywallComponent.TimelineComponent {`
`393`	`393`
`394`	`394`	`func containsUnsupportedConditions() -> Bool {`
`395`	`395`	`(overrides?.hasUnsupportedCondition() == true) \|\|`
`396`		`- items.contains(where: { $0.overrides?.hasUnsupportedCondition() == true })`
	`396`	`+ items.contains(where: {`
	`397`	`+ ($0.overrides?.hasUnsupportedCondition() == true) \|\|`
	`398`	`+ ($0.title.overrides?.hasUnsupportedCondition() == true) \|\|`
	`399`	`+ ($0.description?.overrides?.hasUnsupportedCondition() == true) \|\|`
	`400`	`+ ($0.icon.overrides?.hasUnsupportedCondition() == true)`
	`401`	`+ })`
`397`	`402`	`}`
`398`	`403`
`399`	`404`	`}`