Skip to content

Fix flicker on card art for horizontal mode #6339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wooj-stripe wants to merge 2 commits into
base: wooj/fixVending
Choose a base branch
from
+11 −5
Draft

Fix flicker on card art for horizontal mode #6339

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8074e58
Fix flicker on card art for horizontal mode
wooj-stripe Apr 14, 2026
6546b13
Merge branch 'wooj/fixVending' into wooj/fixVending-fixTapping
wooj-stripe Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions ...et/Source/PaymentSheet/Saved Payment Method Screen/SavedPaymentMethodCollectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ extension SavedPaymentMethodCollectionView {
traitCollection.performAsCurrent {
let overrideUserInterfaceStyle: UIUserInterfaceStyle = appearance.colors.componentBackground.isDark ? .dark : .light
if let viewModel = viewModel {
paymentMethodLogo.tag = 0
switch viewModel {
case .saved(let paymentMethod):
if let attributedText = attributedTextForLabel(paymentMethod: paymentMethod) {
Expand All @@ -360,8 +359,10 @@ extension SavedPaymentMethodCollectionView {
selectableRectangle.accessibilityLabel = paymentMethod.paymentSheetAccessibilityLabel
let paymentMethodCellImage = paymentMethod.makeSavedPaymentMethodCellImage(overrideUserInterfaceStyle: overrideUserInterfaceStyle, iconStyle: appearance.iconStyle)
if let cardArtURL = paymentMethod.cardArtCDNURL(cardArtEnabled: cardArtEnabled) {
paymentMethodLogo.tag = cardArtURL.hashValue
paymentMethodLogo.image = nil
if paymentMethodLogo.tag != cardArtURL.hashValue {
paymentMethodLogo.tag = cardArtURL.hashValue
paymentMethodLogo.image = nil
}
Task {
let image = try? await DownloadManager.sharedManager.downloadImage(url: cardArtURL)
guard paymentMethodLogo.tag == cardArtURL.hashValue else { return }
Expand All @@ -383,14 +384,18 @@ extension SavedPaymentMethodCollectionView {
accessibilityIdentifier = label.text
selectableRectangle.accessibilityIdentifier = label.text
selectableRectangle.accessibilityLabel = label.text
paymentMethodLogo.image = PaymentOption.applePay.makeSavedPaymentMethodCellImage(overrideUserInterfaceStyle: overrideUserInterfaceStyle)
let paymentMethodLogoImage = PaymentOption.applePay.makeSavedPaymentMethodCellImage(overrideUserInterfaceStyle: overrideUserInterfaceStyle)
paymentMethodLogo.image = paymentMethodLogoImage
paymentMethodLogo.tag = paymentMethodLogoImage.hashValue
paymentMethodLogoHeightConstraint.constant = paymentMethodLogoSize.height
case .link:
label.text = STPPaymentMethodType.link.displayName
accessibilityIdentifier = label.text
selectableRectangle.accessibilityIdentifier = label.text
selectableRectangle.accessibilityLabel = label.text
paymentMethodLogo.image = PaymentOption.link(option: .wallet).makeSavedPaymentMethodCellImage(overrideUserInterfaceStyle: overrideUserInterfaceStyle)
let paymentMethodLogoImage = PaymentOption.link(option: .wallet).makeSavedPaymentMethodCellImage(overrideUserInterfaceStyle: overrideUserInterfaceStyle)
paymentMethodLogo.image = paymentMethodLogoImage
paymentMethodLogo.tag = paymentMethodLogoImage.hashValue
paymentMethodLogoHeightConstraint.constant = paymentMethodLogoSize.height
paymentMethodLogo.tintColor = UIColor.linkIconBrand.resolvedContrastingColor(
forBackgroundColor: appearance.colors.componentBackground
Expand All @@ -403,6 +408,7 @@ extension SavedPaymentMethodCollectionView {
selectableRectangle.accessibilityLabel = String.Localized.add_new_payment_method
selectableRectangle.accessibilityIdentifier = "+ Add"
paymentMethodLogo.isHidden = true
paymentMethodLogo.tag = 0
plus.isHidden = false
plus.setNeedsDisplay()
}
Expand Down
Loading