Skip to content

Commit

Permalink
[Link] Remove CardDetailsEditView (#1525)
Browse files Browse the repository at this point in the history 
* Add LinkCardEditElement

* Remove CardDetailsEditView

* Refactor to use CardExpiryDate

* Set default countries

* Remove default label

* Hide checkbox for default PM

* Re-add label

* Add snapshot tests

* Cleanup

* Fix animation glitch

* Properly the delegate

* Remove CardDetailsEditView.swift

* Fix tests

* Cleanup

* Add assert message

* Add TODO

* End editing when submitting the form

* Remove extra constraints

* Rename expiry date element var

* Fix test

* Remove hardcoded years

* Rename var

* Add clarifying comment
  • Loading branch information
@ramont-stripe
ramont-stripe authored Oct 19, 2022
1 parent bb773f3 commit 6c6e77a
Show file tree
Hide file tree
Showing 13 changed files with 316 additions and 418 deletions.
4 changes: 4 additions & 0 deletions Stripe.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@
D0518C88270E168A0048B58A /* ConfirmButtonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0518C87270E168A0048B58A /* ConfirmButtonTests.swift */; };
D060826526EA9C5C0002D656 /* STPPaymentMethodBoletoParamsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D060826426EA9C5C0002D656 /* STPPaymentMethodBoletoParamsTests.swift */; };
D069EA2A27557B4E00C1CF46 /* STPTextFieldDelegateProxyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D069EA2927557B4E00C1CF46 /* STPTextFieldDelegateProxyTests.swift */; };
D06C82A028FF340800832267 /* LinkCardEditElementSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06C829F28FF340800832267 /* LinkCardEditElementSnapshotTests.swift */; };
D071C95527626FDE00843C0C /* WalletHeaderViewSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D071C95427626FDE00843C0C /* WalletHeaderViewSnapshotTests.swift */; };
D08548FF279B72DD00D3A3DC /* LinkInlineSignupElementSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D08548FD279B729F00D3A3DC /* LinkInlineSignupElementSnapshotTests.swift */; };
D0854906279B9A3D00D3A3DC /* LinkSignupViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0854905279B9A3D00D3A3DC /* LinkSignupViewModelTests.swift */; };
Expand Down Expand Up @@ -903,6 +904,7 @@
D0518C87270E168A0048B58A /* ConfirmButtonTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfirmButtonTests.swift; sourceTree = "<group>"; };
D060826426EA9C5C0002D656 /* STPPaymentMethodBoletoParamsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = STPPaymentMethodBoletoParamsTests.swift; sourceTree = "<group>"; };
D069EA2927557B4E00C1CF46 /* STPTextFieldDelegateProxyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = STPTextFieldDelegateProxyTests.swift; sourceTree = "<group>"; };
D06C829F28FF340800832267 /* LinkCardEditElementSnapshotTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinkCardEditElementSnapshotTests.swift; sourceTree = "<group>"; };
D071C95427626FDE00843C0C /* WalletHeaderViewSnapshotTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WalletHeaderViewSnapshotTests.swift; sourceTree = "<group>"; };
D08548FD279B729F00D3A3DC /* LinkInlineSignupElementSnapshotTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkInlineSignupElementSnapshotTests.swift; sourceTree = "<group>"; };
D0854905279B9A3D00D3A3DC /* LinkSignupViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkSignupViewModelTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1480,6 +1482,7 @@
615EF62A27DB9B7A00F8E0EE /* ConfirmButtonSnapshotTests.swift */,
B6F09A96285BE4D400751867 /* PaymentSheetTestUtils.swift */,
D030C9B1281CA848000AFEB0 /* LinkBadgeViewSnapshotTest.swift */,
D06C829F28FF340800832267 /* LinkCardEditElementSnapshotTests.swift */,
D08548FD279B729F00D3A3DC /* LinkInlineSignupElementSnapshotTests.swift */,
D092E36E27BF380300B72609 /* LinkInstantDebitMandateViewSnapshotTests.swift */,
D0ECE12E27A9AD560082ED18 /* LinkLegalTermsViewSnapshotTests.swift */,
Expand Down Expand Up @@ -2270,6 +2273,7 @@
D060826526EA9C5C0002D656 /* STPPaymentMethodBoletoParamsTests.swift in Sources */,
3111C624252D3D4000207E32 /* STPAPIClientTest.swift in Sources */,
3111C5CA252BFC7000207E32 /* STPPaymentIntentParamsTest.swift in Sources */,
D06C82A028FF340800832267 /* LinkCardEditElementSnapshotTests.swift in Sources */,
E61BEEB0265F6CAC0002FA4F /* STPAnalyticsClientPaymentSheetTest.swift in Sources */,
8FF52D492566DF2F000C15EF /* STPPaymentMethodNetBankingParamsTest.m in Sources */,
3111C59B252BEE6700207E32 /* STPBSBNumberValidatorTests.swift in Sources */,
Expand Down
8 changes: 4 additions & 4 deletions StripePaymentSheet/StripePaymentSheet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
31226FFF286E3B1F0007ED5E /* AutoCompleteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31226FFC286E3B1F0007ED5E /* AutoCompleteViewController.swift */; };
31227000286E3B1F0007ED5E /* AddressSearchResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31226FFD286E3B1F0007ED5E /* AddressSearchResult.swift */; };
31227001286E3B1F0007ED5E /* String+AutoComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31226FFE286E3B1F0007ED5E /* String+AutoComplete.swift */; };
31227013286E3B2B0007ED5E /* CardDetailsEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31227002286E3B290007ED5E /* CardDetailsEditView.swift */; };
31227014286E3B2B0007ED5E /* AfterpayPriceBreakdownView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31227003286E3B290007ED5E /* AfterpayPriceBreakdownView.swift */; };
31227015286E3B2B0007ED5E /* ManualEntryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31227004286E3B2A0007ED5E /* ManualEntryButton.swift */; };
31227016286E3B2B0007ED5E /* ShadowedRoundedRectangleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31227005286E3B2A0007ED5E /* ShadowedRoundedRectangleView.swift */; };
Expand Down Expand Up @@ -239,6 +238,7 @@
31DCB12728F62865002EF128 /* icon-pm-upi@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 31DCB12628F62865002EF128 /* icon-pm-upi@3x.png */; };
31DCB12928F62B07002EF128 /* polling_error_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 31DCB12828F62B07002EF128 /* polling_error_icon@3x.png */; };
31DCB12B28F75531002EF128 /* PaymentSheetFlowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31DCB12A28F75531002EF128 /* PaymentSheetFlowController.swift */; };
D06C829B28FEFEC600832267 /* LinkCardEditElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06C829A28FEFEC600832267 /* LinkCardEditElement.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -333,7 +333,6 @@
31226FFC286E3B1F0007ED5E /* AutoCompleteViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoCompleteViewController.swift; sourceTree = "<group>"; };
31226FFD286E3B1F0007ED5E /* AddressSearchResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddressSearchResult.swift; sourceTree = "<group>"; };
31226FFE286E3B1F0007ED5E /* String+AutoComplete.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+AutoComplete.swift"; sourceTree = "<group>"; };
31227002286E3B290007ED5E /* CardDetailsEditView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardDetailsEditView.swift; sourceTree = "<group>"; };
31227003286E3B290007ED5E /* AfterpayPriceBreakdownView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AfterpayPriceBreakdownView.swift; sourceTree = "<group>"; };
31227004286E3B2A0007ED5E /* ManualEntryButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManualEntryButton.swift; sourceTree = "<group>"; };
31227005286E3B2A0007ED5E /* ShadowedRoundedRectangleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShadowedRoundedRectangleView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -537,6 +536,7 @@
31DCB12628F62865002EF128 /* icon-pm-upi@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-pm-upi@3x.png"; sourceTree = "<group>"; };
31DCB12828F62B07002EF128 /* polling_error_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "polling_error_icon@3x.png"; sourceTree = "<group>"; };
31DCB12A28F75531002EF128 /* PaymentSheetFlowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaymentSheetFlowController.swift; sourceTree = "<group>"; };
D06C829A28FEFEC600832267 /* LinkCardEditElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinkCardEditElement.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -728,7 +728,6 @@
31227003286E3B290007ED5E /* AfterpayPriceBreakdownView.swift */,
31227012286E3B2B0007ED5E /* Appearance+FontScaling.swift */,
3122700B286E3B2A0007ED5E /* AUBECSMandate.swift */,
31227002286E3B290007ED5E /* CardDetailsEditView.swift */,
3122700A286E3B2A0007ED5E /* CardScanButton.swift */,
3122700C286E3B2A0007ED5E /* CardScanningView.swift */,
3122700D286E3B2A0007ED5E /* CircularButton.swift */,
Expand Down Expand Up @@ -826,6 +825,7 @@
isa = PBXGroup;
children = (
312270AB286E3D250007ED5E /* InlineSignup */,
D06C829A28FEFEC600832267 /* LinkCardEditElement.swift */,
312270A9286E3D220007ED5E /* LinkEmailElement.swift */,
);
path = Elements;
Expand Down Expand Up @@ -1483,6 +1483,7 @@
310F6FC228D4F55600C9580D /* LinkVerificationView.swift in Sources */,
312270DC286E3D8A0007ED5E /* PayWithLinkViewController-SignUpViewModel.swift in Sources */,
310F6FC028D4F55600C9580D /* LinkCookieKey.swift in Sources */,
D06C829B28FEFEC600832267 /* LinkCardEditElement.swift in Sources */,
31227001286E3B1F0007ED5E /* String+AutoComplete.swift in Sources */,
312270FD286E3E6D0007ED5E /* ConsumerSession.swift in Sources */,
31226FF5286E3B100007ED5E /* PaymentSheetViewController.swift in Sources */,
Expand Down Expand Up @@ -1524,7 +1525,6 @@
3122720728762CA10007ED5E /* STPCameraView.swift in Sources */,
310F6FD228D4F5B300C9580D /* BottomSheetPresentationAnimator.swift in Sources */,
31227103286E3EA50007ED5E /* CardExpiryDate.swift in Sources */,
31227013286E3B2B0007ED5E /* CardDetailsEditView.swift in Sources */,
312270D9286E3D8A0007ED5E /* PayWithLinkViewController-BaseViewController.swift in Sources */,
31226FA5286E3A2F0007ED5E /* ConnectionsElement.swift in Sources */,
31227091286E3CF00007ED5E /* LinkMoreInfoView.swift in Sources */,
Expand Down
17 changes: 4 additions & 13 deletions StripePaymentSheet/StripePaymentSheet/Internal/API Bindings/Link/PaymentDetails.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,11 @@ extension ConsumerPaymentDetails.Details.Card {
}
}

var expiryDate: CardExpiryDate {
return CardExpiryDate(month: expiryMonth, year: expiryYear)
}

var hasExpired: Bool {
let expiryDate = CardExpiryDate(month: expiryMonth, year: expiryYear)
return expiryDate.expired()
}

Expand Down Expand Up @@ -321,18 +324,6 @@ extension ConsumerPaymentDetails {
}
}

var prefillDetails: STPCardFormView.PrefillDetails? {
switch details {
case .card(let card):
return STPCardFormView.PrefillDetails(last4: card.last4,
expiryMonth: card.expiryMonth,
expiryYear: card.expiryYear,
cardBrand: card.brand)
case .bankAccount:
return nil
}
}

var cvc: String? {
switch details {
case .card(let card):
Expand Down
Loading

0 comments on commit 6c6e77a

Please sign in to comment.