Fixed poor merge issues

paypal · Feb 14, 2024 · b0e2d10 · b0e2d10
1 parent 10ced08
commit b0e2d10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Demo/Demo/SwiftUIComponents/SwiftUIPaymentButtonDemo.swift b/Demo/Demo/SwiftUIComponents/SwiftUIPaymentButtonDemo.swift
@@ -90,14 +90,14 @@ struct SwiftUIPaymentButtonDemo: View {
                 switch selectedFunding {
                 case .payPal:
                     if selectedSize == .standard {
-                        Picker("Edges", selection: $edgesIndex) {
-                            ForEach(edges.indices, id: \.self) { index in
-                                Text(edges[index])
+                        Picker("Shape", selection: $shapeIndex) {
+                            ForEach(shape.indices, id: \.self) { index in
+                                Text(shape[index])
                             }
                         }
                         .pickerStyle(SegmentedPickerStyle())
-                        .onChange(of: edgesIndex) { _ in
-                            selectedEdge = PaymentButtonEdges.allCases[edgesIndex]
+                        .onChange(of: shapeIndex) { _ in
+                            selectedShape = PaymentButtonShape.allCases[shapeIndex]
                             buttonID += 1
                         }
 

diff --git a/UnitTests/PaymentButtonsTests/PayPalCreditButton_Tests.swift b/UnitTests/PaymentButtonsTests/PayPalCreditButton_Tests.swift
@@ -13,7 +13,7 @@ class PayPalCreditButton_Tests: XCTestCase {
     func testInit_whenPayPalCreditButtonCreated_hasDefaultUIValues() {
         let sut = PayPalCreditButton()
         XCTAssertEqual(sut.shape, PaymentButtonShape.rounded)
-        XCTAssertEqual(sut.size, PaymentButtonSize.collapsed)
+        XCTAssertEqual(sut.size, PaymentButtonSize.standard)
         XCTAssertEqual(sut.color, PaymentButtonColor.darkBlue)
         XCTAssertNil(sut.insets)
         XCTAssertNil(sut.label)