Skip to content

[wip] Add Shop Pay to PaymentSheet list view #6019

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
davidme-stripe wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[wip] Add Shop Pay to PaymentSheet list view #6019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd3e6b8
Add Shop Pay to PS list
davidme-stripe Jan 27, 2026
af50060
Add screenshot test
davidme-stripe Jan 27, 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
35 changes: 35 additions & 0 deletions Example/PaymentSheet Example/PaymentSheet Example/ExampleWalletButtonsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ struct ExampleWalletButtonsContainerView: View {
// Wallet button visibility options
@State private var applePayVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility = .automatic
@State private var linkVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility = .automatic
@State private var shopPayVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility = .automatic
@State private var applePayVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility = .automatic
@State private var linkVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility = .automatic
@State private var shopPayVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility = .automatic

// Shop Pay testing options
@State private var billingAddressRequired: Bool = false
Expand Down Expand Up @@ -97,6 +99,16 @@ struct ExampleWalletButtonsContainerView: View {
}
.pickerStyle(SegmentedPickerStyle())
}
VStack(alignment: .leading) {
Text("Shop Pay in PaymentElement")
.font(.subheadline)
Picker("Shop Pay PaymentElement", selection: $shopPayVisibilityInPaymentElement) {
Text("Automatic").tag(PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility.automatic)
Text("Always").tag(PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility.always)
Text("Never").tag(PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility.never)
}
.pickerStyle(SegmentedPickerStyle())
}
}
Group {
VStack(alignment: .leading) {
Expand All @@ -118,6 +130,15 @@ struct ExampleWalletButtonsContainerView: View {
}
.pickerStyle(SegmentedPickerStyle())
}
VStack(alignment: .leading) {
Text("Shop Pay in WalletButtonsView")
.font(.subheadline)
Picker("Shop Pay WalletButtonsView", selection: $shopPayVisibilityInWalletButtonsView) {
Text("Automatic").tag(PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility.automatic)
Text("Never").tag(PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility.never)
}
.pickerStyle(SegmentedPickerStyle())
}
}
}

Expand Down Expand Up @@ -163,8 +184,10 @@ struct ExampleWalletButtonsContainerView: View {
appearance: appearance,
applePayVisibilityInPaymentElement: applePayVisibilityInPaymentElement,
linkVisibilityInPaymentElement: linkVisibilityInPaymentElement,
shopPayVisibilityInPaymentElement: shopPayVisibilityInPaymentElement,
applePayVisibilityInWalletButtonsView: applePayVisibilityInWalletButtonsView,
linkVisibilityInWalletButtonsView: linkVisibilityInWalletButtonsView,
shopPayVisibilityInWalletButtonsView: shopPayVisibilityInWalletButtonsView,
shopPayTestingOptions: ShopPayTestingOptions(
billingAddressRequired: billingAddressRequired,
emailRequired: emailRequired,
Expand Down Expand Up @@ -200,8 +223,10 @@ struct ExampleWalletButtonsView: View {
appearance: PaymentSheet.Appearance = PaymentSheet.Appearance(),
applePayVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility = .automatic,
linkVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility = .automatic,
shopPayVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility = .automatic,
applePayVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility = .automatic,
linkVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility = .automatic,
shopPayVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility = .automatic,
shopPayTestingOptions: ShopPayTestingOptions = ShopPayTestingOptions(),
enableClickHandler: Bool = false,
rejectApplePay: Bool = false,
Expand All @@ -216,8 +241,10 @@ struct ExampleWalletButtonsView: View {
appearance: appearance,
applePayVisibilityInPaymentElement: applePayVisibilityInPaymentElement,
linkVisibilityInPaymentElement: linkVisibilityInPaymentElement,
shopPayVisibilityInPaymentElement: shopPayVisibilityInPaymentElement,
applePayVisibilityInWalletButtonsView: applePayVisibilityInWalletButtonsView,
linkVisibilityInWalletButtonsView: linkVisibilityInWalletButtonsView,
shopPayVisibilityInWalletButtonsView: shopPayVisibilityInWalletButtonsView,
shopPayTestingOptions: shopPayTestingOptions,
enableClickHandler: enableClickHandler,
rejectApplePay: rejectApplePay,
Expand Down Expand Up @@ -360,8 +387,10 @@ class ExampleWalletButtonsModel: ObservableObject {
let appearance: PaymentSheet.Appearance
let applePayVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility
let linkVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility
let shopPayVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility
let applePayVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility
let linkVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility
let shopPayVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility
let shopPayTestingOptions: ShopPayTestingOptions
let enableClickHandler: Bool
let rejectApplePay: Bool
Expand All @@ -386,8 +415,10 @@ class ExampleWalletButtonsModel: ObservableObject {
appearance: PaymentSheet.Appearance,
applePayVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility,
linkVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility,
shopPayVisibilityInPaymentElement: PaymentSheet.WalletButtonsVisibility.PaymentElementVisibility,
applePayVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility,
linkVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility,
shopPayVisibilityInWalletButtonsView: PaymentSheet.WalletButtonsVisibility.WalletButtonsViewVisibility,
shopPayTestingOptions: ShopPayTestingOptions = ShopPayTestingOptions(),
enableClickHandler: Bool = false,
rejectApplePay: Bool = false,
Expand All @@ -401,8 +432,10 @@ class ExampleWalletButtonsModel: ObservableObject {
self.appearance = appearance
self.applePayVisibilityInPaymentElement = applePayVisibilityInPaymentElement
self.linkVisibilityInPaymentElement = linkVisibilityInPaymentElement
self.shopPayVisibilityInPaymentElement = shopPayVisibilityInPaymentElement
self.applePayVisibilityInWalletButtonsView = applePayVisibilityInWalletButtonsView
self.linkVisibilityInWalletButtonsView = linkVisibilityInWalletButtonsView
self.shopPayVisibilityInWalletButtonsView = shopPayVisibilityInWalletButtonsView
self.shopPayTestingOptions = shopPayTestingOptions
self.enableClickHandler = enableClickHandler
self.rejectApplePay = rejectApplePay
Expand Down Expand Up @@ -504,8 +537,10 @@ class ExampleWalletButtonsModel: ObservableObject {
// Configure wallet button visibility
configuration.walletButtonsVisibility.paymentElement[.applePay] = self.applePayVisibilityInPaymentElement
configuration.walletButtonsVisibility.paymentElement[.link] = self.linkVisibilityInPaymentElement
configuration.walletButtonsVisibility.paymentElement[.shopPay] = self.shopPayVisibilityInPaymentElement
configuration.walletButtonsVisibility.walletButtonsView[.applePay] = self.applePayVisibilityInWalletButtonsView
configuration.walletButtonsVisibility.walletButtonsView[.link] = self.linkVisibilityInWalletButtonsView
configuration.walletButtonsVisibility.walletButtonsView[.shopPay] = self.shopPayVisibilityInWalletButtonsView

self.latestIntentConfig = .init(sharedPaymentTokenSessionWithMode: .payment(amount: 9999, currency: "USD", setupFutureUsage: nil, captureMethod: .automatic, paymentMethodOptions: nil), sellerDetails: .init(networkId: "stripe", externalId: "acct_1HvTI7Lu5o3P18Zp", businessName: "Till's Pills"), paymentMethodTypes: ["card", "shop_pay"], preparePaymentMethodHandler: { [weak self] paymentMethod, address in
self?.isProcessing = true
Expand Down
4 changes: 4 additions & 0 deletions StripeCore/StripeCore/Source/Analytics/STPAnalyticEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,25 @@ import Foundation
case mcPaymentCustomSavedPMSuccess = "mc_custom_payment_savedpm_success"
case mcPaymentCustomApplePaySuccess = "mc_custom_payment_applepay_success"
case mcPaymentCustomLinkSuccess = "mc_custom_payment_link_success"
case mcPaymentCustomShoppaySuccess = "mc_custom_payment_shoppay_success"

case mcPaymentCompleteNewPMSuccess = "mc_complete_payment_newpm_success"
case mcPaymentCompleteSavedPMSuccess = "mc_complete_payment_savedpm_success"
case mcPaymentCompleteApplePaySuccess = "mc_complete_payment_applepay_success"
case mcPaymentCompleteLinkSuccess = "mc_complete_payment_link_success"
case mcPaymentCompleteShoppaySuccess = "mc_complete_payment_shoppay_success"

case mcPaymentCustomNewPMFailure = "mc_custom_payment_newpm_failure"
case mcPaymentCustomSavedPMFailure = "mc_custom_payment_savedpm_failure"
case mcPaymentCustomApplePayFailure = "mc_custom_payment_applepay_failure"
case mcPaymentCustomLinkFailure = "mc_custom_payment_link_failure"
case mcPaymentCustomShoppayFailure = "mc_custom_payment_shoppay_failure"

case mcPaymentCompleteNewPMFailure = "mc_complete_payment_newpm_failure"
case mcPaymentCompleteSavedPMFailure = "mc_complete_payment_savedpm_failure"
case mcPaymentCompleteApplePayFailure = "mc_complete_payment_applepay_failure"
case mcPaymentCompleteLinkFailure = "mc_complete_payment_link_failure"
case mcPaymentCompleteShoppayFailure = "mc_complete_payment_shoppay_failure"

case mcPaymentEmbeddedSuccess = "mc_embedded_payment_success"
case mcPaymentEmbeddedFailure = "mc_embedded_payment_failure"
Expand Down
25 changes: 25 additions & 0 deletions ...ntSheet/Resources/StripePaymentSheet.xcassets/ShopPay/shoppay_logo.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"images" : [
{
"filename" : "shoppay_logo.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "Shop Pay Logo white.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
7 changes: 7 additions & 0 deletions ...ripePaymentSheet.xcassets/ShopPay/shoppay_logo.imageset/Shop Pay Logo white.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading