From 0027e63ccb953529609495895c253ca3504651c1 Mon Sep 17 00:00:00 2001
From: erenbesel <erenbesel@gmail.com>
Date: Fri, 14 Feb 2025 14:17:03 +0100
Subject: [PATCH] review updates

---
 .../FormPhoneExtensionPickerItemView.swift     |  2 +-
 AdyenComponents/PayTo/PayToComponent.swift     |  6 +++++-
 .../FormItemViewBuilderTests.swift             | 18 ++++++++++++++++++
 .../PayTo/PayToComponentTests.swift            |  8 ++++----
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Adyen/UI/Form/Items/Phone Number/Phone Extension Picker/FormPhoneExtensionPickerItemView.swift b/Adyen/UI/Form/Items/Phone Number/Phone Extension Picker/FormPhoneExtensionPickerItemView.swift
index dce7a25b66..803066ce8b 100644
--- a/Adyen/UI/Form/Items/Phone Number/Phone Extension Picker/FormPhoneExtensionPickerItemView.swift	
+++ b/Adyen/UI/Form/Items/Phone Number/Phone Extension Picker/FormPhoneExtensionPickerItemView.swift	
@@ -68,7 +68,7 @@ public final class FormPhoneExtensionPickerItemView: FormItemView<FormPhoneExten
     }
     
     internal func setupView() {
-        var arrangedSubviews: [UIView] = []
+        let arrangedSubviews: [UIView]
         if item.allowsSelection {
             arrangedSubviews = [countryCodeLabel, chevronView, valueLabel]
         } else {
diff --git a/AdyenComponents/PayTo/PayToComponent.swift b/AdyenComponents/PayTo/PayToComponent.swift
index b2dacfb188..972135ff0d 100644
--- a/AdyenComponents/PayTo/PayToComponent.swift
+++ b/AdyenComponents/PayTo/PayToComponent.swift
@@ -14,6 +14,7 @@ public final class PayToComponent: PaymentComponent,
     private enum ViewIdentifier {
         static let flowSelectionTitleLabelItem = "flowSelectionTitleLabel"
         static let flowSelectionItem = "flowSelectionSegmentedControl"
+        static let phoneNumberItem = "phoneNumberItem"
         static let continueButtonItem = "continueButton"
     }
 
@@ -100,7 +101,10 @@ public final class PayToComponent: PaymentComponent,
             localizationParameters: configuration.localizationParameters,
             presenter: .init(self)
         )
-        item.identifier = ViewIdentifierBuilder.build(scopeInstance: self, postfix: "phoneNumberItem")
+        item.identifier = ViewIdentifierBuilder.build(
+            scopeInstance: self,
+            postfix: ViewIdentifier.phoneNumberItem
+        )
         return item
     }()
 
diff --git a/Tests/IntegrationTests/Card Tests/Items/CardNumberItem/FormItemViewBuilderTests.swift b/Tests/IntegrationTests/Card Tests/Items/CardNumberItem/FormItemViewBuilderTests.swift
index 6f1635b00b..6aacf0b11e 100644
--- a/Tests/IntegrationTests/Card Tests/Items/CardNumberItem/FormItemViewBuilderTests.swift	
+++ b/Tests/IntegrationTests/Card Tests/Items/CardNumberItem/FormItemViewBuilderTests.swift	
@@ -22,6 +22,24 @@ class FormItemViewBuilderTests: XCTestCase {
         let view = item.build(with: FormItemViewBuilder())
         
         XCTAssertNotNil(view as? FormPhoneExtensionPickerItemView)
+        XCTAssertFalse(item.allowsSelection)
+    }
+    
+    func testPhoneExtensionMultiple() {
+        let presenter = UIViewController()
+        let query = PhoneExtensionsQuery(paymentMethod: .payTo)
+        let selectableValues = PhoneExtensionsRepository.get(with: query)
+        let item = FormPhoneExtensionPickerItem(
+            preselectedExtension: selectableValues[0],
+            selectableExtensions: selectableValues,
+            validationFailureMessage: nil,
+            style: .init(),
+            presenter: .init(presenter)
+        )
+        let view = item.build(with: FormItemViewBuilder())
+        
+        XCTAssertNotNil(view as? FormPhoneExtensionPickerItemView)
+        XCTAssertTrue(item.allowsSelection)
     }
     
     func testViewBuildableFormTextItem() {
diff --git a/Tests/IntegrationTests/Components Tests/PayTo/PayToComponentTests.swift b/Tests/IntegrationTests/Components Tests/PayTo/PayToComponentTests.swift
index b9ef179674..669fd577c2 100644
--- a/Tests/IntegrationTests/Components Tests/PayTo/PayToComponentTests.swift	
+++ b/Tests/IntegrationTests/Components Tests/PayTo/PayToComponentTests.swift	
@@ -35,7 +35,7 @@ class PayToComponentTests: XCTestCase {
             context: Dummy.context
         )
 
-        setupRootViewController(sut.viewController)
+        sut.viewController.loadViewIfNeeded()
 
         // Check by accessibility identifier
         let flowSelectionTitleLabelItem = sut.viewController.view.findView(with: "AdyenComponents.PayToComponent.flowSelectionTitleLabel") as? UILabel
@@ -51,7 +51,7 @@ class PayToComponentTests: XCTestCase {
             context: Dummy.context
         )
 
-        setupRootViewController(sut.viewController)
+        sut.viewController.loadViewIfNeeded()
 
         // Check by accessibility identifier
         let flowSelectionItem = sut.viewController.view.findView(with: "AdyenComponents.PayToComponent.flowSelectionSegmentedControl") as? UISegmentedControl
@@ -68,7 +68,7 @@ class PayToComponentTests: XCTestCase {
             context: Dummy.context
         )
 
-        setupRootViewController(sut.viewController)
+        sut.viewController.loadViewIfNeeded()
 
         // Check by accessibility identifier
         let phoneNumberItem: FormPhoneNumberItemView = try XCTUnwrap(sut.viewController.view.findView(with: "AdyenComponents.PayToComponent.phoneNumberItem"))
@@ -84,7 +84,7 @@ class PayToComponentTests: XCTestCase {
             context: Dummy.context
         )
 
-        setupRootViewController(sut.viewController)
+        sut.viewController.loadViewIfNeeded()
 
         // Check by accessibility identifier
         let continueButton: FormButtonItemView = try XCTUnwrap(sut.viewController.view.findView(with: "AdyenComponents.PayToComponent.continueButton"))