diff --git a/Debug App/Podfile.lock b/Debug App/Podfile.lock
index c3f006f4dd..b2de1949fb 100644
--- a/Debug App/Podfile.lock	
+++ b/Debug App/Podfile.lock	
@@ -4,9 +4,9 @@ PODS:
   - PrimerIPay88MYSDK (0.1.7)
   - PrimerKlarnaSDK (1.1.1)
   - PrimerNolPaySDK (1.0.1)
-  - PrimerSDK (2.32.0):
-    - PrimerSDK/Core (= 2.32.0)
-  - PrimerSDK/Core (2.32.0)
+  - PrimerSDK (2.32.1):
+    - PrimerSDK/Core (= 2.32.1)
+  - PrimerSDK/Core (2.32.1)
   - PrimerStripeSDK (1.0.0)
 
 DEPENDENCIES:
@@ -37,9 +37,9 @@ SPEC CHECKSUMS:
   PrimerIPay88MYSDK: 436ee0be7e2c97e4e81456ccddee20175e9e3c4d
   PrimerKlarnaSDK: 564105170cc7b467bf95c31851813ea41c468f8b
   PrimerNolPaySDK: 08b140ed39b378a0b33b4f8746544a402175c0cc
-  PrimerSDK: db06e6553747bdadf8a8ca276d556745af38bba3
+  PrimerSDK: 41eb9f627fa189f3edafdb18ea2a671d4403b3e2
   PrimerStripeSDK: c37d4e7c1b5256d67d4890c4cc4b38ddc9427489
 
 PODFILE CHECKSUM: fa17ead44d40b0b09abc2f30a5cc3d8aefe389e1
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/Debug App/Resources/Localized Views/Base.lproj/Main.storyboard b/Debug App/Resources/Localized Views/Base.lproj/Main.storyboard
index ad63005ba4..2ec5fd1e0c 100644
--- a/Debug App/Resources/Localized Views/Base.lproj/Main.storyboard	
+++ b/Debug App/Resources/Localized Views/Base.lproj/Main.storyboard	
@@ -1235,13 +1235,13 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="7" translatesAutoresizingMaskIntoConstraints="NO" id="vYu-uC-Lwg" userLabel="Surcharge Stack View">
                                                         <rect key="frame" x="0.0" y="51" width="374" height="58"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Apple Pay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eF4-2g-Y8U">
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Card Network surcharge" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eF4-2g-Y8U" userLabel="Card Network">
                                                                 <rect key="frame" x="0.0" y="0.0" width="374" height="17"/>
                                                                 <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="e.g. customer_1234" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XRQ-T7-rG4">
+                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Amount " textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XRQ-T7-rG4">
                                                                 <rect key="frame" x="0.0" y="24" width="374" height="34"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <textInputTraits key="textInputTraits"/>
@@ -1327,7 +1327,6 @@
                         <outlet property="applePayShippingContactPhoneSwitch" destination="5AD-oh-3KE" id="2lJ-0f-1Zm"/>
                         <outlet property="applePayShippingControlStackView" destination="hmd-vB-Ft9" id="LCC-bs-UVf"/>
                         <outlet property="applePayShippingDetailsSwitch" destination="l2a-lu-nlK" id="RbG-0x-lQg"/>
-                        <outlet property="applePaySurchargeTextField" destination="XRQ-T7-rG4" id="dnh-ml-Uz0"/>
                         <outlet property="applyThemingSwitch" destination="Xts-VY-QHZ" id="qQC-rP-kmS"/>
                         <outlet property="billingAddressCityTextField" destination="b68-sT-v40" id="537-Vp-BCo"/>
                         <outlet property="billingAddressCountryTextField" destination="Gxo-QT-E5X" id="8Yg-xu-Kez"/>
@@ -1380,6 +1379,7 @@
                         <outlet property="surchargeGroupStackView" destination="32O-OV-0ey" id="FDB-vq-q3D"/>
                         <outlet property="surchargeStackView" destination="vYu-uC-Lwg" id="7yI-tG-axF"/>
                         <outlet property="surchargeSwitch" destination="9eb-B5-B2t" id="bc9-Bn-FWV"/>
+                        <outlet property="surchargeTextField" destination="XRQ-T7-rG4" id="dnh-ml-Uz0"/>
                         <outlet property="test3DSScenarioTextField" destination="io7-2z-MxC" id="Cy0-nh-2P5"/>
                         <outlet property="test3DSStackView" destination="fxV-mt-ulz" id="65c-eM-qZo"/>
                         <outlet property="testErrorDescriptionTextField" destination="dNP-tk-egr" id="0np-AM-Wdo"/>
@@ -1910,13 +1910,13 @@
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="placeholderTextColor">
-            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29803921570000003" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.29803921568627451" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemRedColor">
-            <color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/Debug App/Sources/Model/CreateClientToken.swift b/Debug App/Sources/Model/CreateClientToken.swift
index d387591abc..45b39945dc 100644
--- a/Debug App/Sources/Model/CreateClientToken.swift	
+++ b/Debug App/Sources/Model/CreateClientToken.swift	
@@ -376,21 +376,24 @@ struct ClientSessionRequestBody {
             var extraMerchantData: [String: Any]?
             var captureVaultedCardCvv: Bool?
             var merchantName: String?
+            var networks: NetworkOptionGroup?
 
             enum CodingKeys: CodingKey {
-                case surcharge, instalmentDuration, extraMerchantData, captureVaultedCardCvv, merchantName
+                case surcharge, instalmentDuration, extraMerchantData, captureVaultedCardCvv, merchantName, networks
             }
 
             init(surcharge: SurchargeOption?,
                  instalmentDuration: String?,
                  extraMerchantData: [String: Any]?,
                  captureVaultedCardCvv: Bool?,
-                 merchantName: String?) {
+                 merchantName: String?,
+                 networks: NetworkOptionGroup?) {
                 self.surcharge = surcharge
                 self.instalmentDuration = instalmentDuration
                 self.extraMerchantData = extraMerchantData
                 self.captureVaultedCardCvv = captureVaultedCardCvv
                 self.merchantName = merchantName
+                self.networks = networks
             }
 
             func encode(to encoder: Encoder) throws {
@@ -409,27 +412,36 @@ struct ClientSessionRequestBody {
                     let jsonString = String(data: jsonData, encoding: .utf8)
                     try container.encode(jsonString, forKey: .extraMerchantData)
                 }
-                
+
+                if let captureVaultedCardCvv = captureVaultedCardCvv {
+                    try container.encode(captureVaultedCardCvv, forKey: .captureVaultedCardCvv)
+                }
+
                 if let merchantName = merchantName {
                     try container.encode(merchantName, forKey: .merchantName)
                 }
+
+                if let networks = networks {
+                    try container.encode(networks, forKey: .networks)
+                }
             }
 
             init(from decoder: Decoder) throws {
                 let container = try decoder.container(keyedBy: CodingKeys.self)
+
                 surcharge = try container.decodeIfPresent(SurchargeOption.self, forKey: .surcharge)
                 instalmentDuration = try container.decodeIfPresent(String.self, forKey: .instalmentDuration)
 
-                let jsonString = try container.decodeIfPresent(String.self, forKey: .extraMerchantData)
-                if let jsonData = jsonString?.data(using: .utf8) {
+                if let jsonString = try container.decodeIfPresent(String.self, forKey: .extraMerchantData),
+                   let jsonData = jsonString.data(using: .utf8) {
                     extraMerchantData = try JSONSerialization.jsonObject(with: jsonData) as? [String: Any]
                 } else {
                     extraMerchantData = nil
                 }
-                
-                merchantName = try container.decodeIfPresent(String.self, forKey: .merchantName)
 
-                captureVaultedCardCvv = try container.decodeIfPresent(Bool.self, forKey: .captureVaultedCardCvv) ?? false
+                captureVaultedCardCvv = try container.decodeIfPresent(Bool.self, forKey: .captureVaultedCardCvv)
+                merchantName = try container.decodeIfPresent(String.self, forKey: .merchantName)
+                networks = try container.decodeIfPresent(NetworkOptionGroup.self, forKey: .networks)
             }
 
             var dictionaryValue: [String: Any]? {
@@ -447,15 +459,19 @@ struct ClientSessionRequestBody {
                     dic["extraMerchantData"] = extraMerchantData
                 }
 
-                if let captureVaultedCardCvv = captureVaultedCardCvv, captureVaultedCardCvv == true {
+                if let captureVaultedCardCvv = captureVaultedCardCvv {
                     dic["captureVaultedCardCvv"] = captureVaultedCardCvv
                 }
-                
+
                 if let merchantName = merchantName {
                     dic["merchantName"] = merchantName
                 }
 
-                return dic.keys.count == 0 ? nil : dic
+                if let networks = networks {
+                    dic["networks"] = networks.dictionaryValue
+                }
+
+                return dic.isEmpty ? nil : dic
             }
         }
 
@@ -472,8 +488,39 @@ struct ClientSessionRequestBody {
                 return dic.keys.count == 0 ? nil : dic
             }
         }
-    }
 
+        struct NetworkOptionGroup: Codable {
+            var VISA: NetworkOption?
+            var MASTERCARD: NetworkOption?
+            var JCB: NetworkOption?
+
+            var dictionaryValue: [String: Any]? {
+                var dic: [String: Any] = [:]
+
+                if let VISA = VISA {
+                    dic["VISA"] = VISA.dictionaryValue
+                }
+
+                if let MASTERCARD = MASTERCARD {
+                    dic["MASTERCARD"] = MASTERCARD.dictionaryValue
+                }
+
+                if let JCB = JCB {
+                    dic["JCB"] = JCB.dictionaryValue
+                }
+
+                return dic.isEmpty ? nil : dic
+            }
+        }
+
+        struct NetworkOption: Codable {
+            var surcharge: SurchargeOption
+
+            var dictionaryValue: [String: Any] {
+                return ["surcharge": surcharge.dictionaryValue ?? [:]]
+            }
+        }
+    }
 }
 
 extension Encodable {
diff --git a/Debug App/Sources/View Controllers/Merchant Helpers/MerchantHelpers.swift b/Debug App/Sources/View Controllers/Merchant Helpers/MerchantHelpers.swift
index 985e99012b..e1998dcd3f 100644
--- a/Debug App/Sources/View Controllers/Merchant Helpers/MerchantHelpers.swift	
+++ b/Debug App/Sources/View Controllers/Merchant Helpers/MerchantHelpers.swift	
@@ -98,7 +98,8 @@ struct MerchantMockDataManager {
             instalmentDuration: "test",
             extraMerchantData: extraMerchantData,
             captureVaultedCardCvv: false,
-            merchantName: nil))
+            merchantName: nil,
+            networks: nil))
 
     static var extraMerchantData: [String: Any] = [
         "subscription": [
diff --git a/Debug App/Sources/View Controllers/MerchantHeadlessCheckoutRawDataViewController.swift b/Debug App/Sources/View Controllers/MerchantHeadlessCheckoutRawDataViewController.swift
index d3272bee12..3b0b484ae4 100644
--- a/Debug App/Sources/View Controllers/MerchantHeadlessCheckoutRawDataViewController.swift	
+++ b/Debug App/Sources/View Controllers/MerchantHeadlessCheckoutRawDataViewController.swift	
@@ -215,7 +215,6 @@ class MerchantHeadlessCheckoutRawDataViewController: UIViewController {
 extension MerchantHeadlessCheckoutRawDataViewController: UITextFieldDelegate {
 
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
-
         let text = textField.text
 
         var newText: String = ""
diff --git a/Debug App/Sources/View Controllers/MerchantSessionAndSettingsViewController.swift b/Debug App/Sources/View Controllers/MerchantSessionAndSettingsViewController.swift
index ad6cf445dc..65f6f9335b 100644
--- a/Debug App/Sources/View Controllers/MerchantSessionAndSettingsViewController.swift	
+++ b/Debug App/Sources/View Controllers/MerchantSessionAndSettingsViewController.swift	
@@ -127,7 +127,7 @@ class MerchantSessionAndSettingsViewController: UIViewController {
 
     @IBOutlet weak var surchargeSwitch: UISwitch!
     @IBOutlet weak var surchargeStackView: UIStackView!
-    @IBOutlet weak var applePaySurchargeTextField: UITextField!
+    @IBOutlet weak var surchargeTextField: UITextField!
 
     @IBOutlet weak var primerSDKButton: UIButton!
     @IBOutlet weak var primerHeadlessSDKButton: UIButton!
@@ -525,19 +525,35 @@ class MerchantSessionAndSettingsViewController: UIViewController {
                                                                                     instalmentDuration: nil,
                                                                                     extraMerchantData: nil,
                                                                                     captureVaultedCardCvv: enableCVVRecaptureFlowSwitch.isOn,
-                                                                                    merchantName: nil)
+                                                                                    merchantName: nil,
+                                                                                    networks: nil)
 
             clientSession.paymentMethod?.options?.PAYMENT_CARD = option
         }
-        
-        let applePayOptions = ClientSessionRequestBody.PaymentMethod.PaymentMethodOption(surcharge: nil,
-                                                                                instalmentDuration: nil,
-                                                                                extraMerchantData: nil,
-                                                                                captureVaultedCardCvv: nil,
-                                                                                merchantName: "Primer Merchant iOS")
 
+        let applePayOptions = ClientSessionRequestBody.PaymentMethod.PaymentMethodOption(surcharge: nil,
+                                                                                         instalmentDuration: nil,
+                                                                                         extraMerchantData: nil,
+                                                                                         captureVaultedCardCvv: nil,
+                                                                                         merchantName: "Primer Merchant iOS",
+                                                                                         networks: nil)
         clientSession.paymentMethod?.options?.APPLE_PAY = applePayOptions
-        
+
+        if let text = surchargeTextField.text, let amount = Int(text), surchargeSwitch.isOn {
+            let surcharge = ClientSessionRequestBody.PaymentMethod.SurchargeOption(amount: amount)
+            var networkOptionGroup = ClientSessionRequestBody.PaymentMethod.NetworkOptionGroup()
+            networkOptionGroup.VISA = ClientSessionRequestBody.PaymentMethod.NetworkOption(surcharge: surcharge)
+            networkOptionGroup.JCB = ClientSessionRequestBody.PaymentMethod.NetworkOption(surcharge: surcharge)
+            networkOptionGroup.MASTERCARD = ClientSessionRequestBody.PaymentMethod.NetworkOption(surcharge: surcharge)
+            let paymentCardOptions = ClientSessionRequestBody.PaymentMethod.PaymentMethodOption(surcharge: nil,
+                                                                                                instalmentDuration: nil,
+                                                                                                extraMerchantData: nil,
+                                                                                                captureVaultedCardCvv: nil,
+                                                                                                merchantName: "Primer Merchant iOS",
+                                                                                                networks: networkOptionGroup)
+            clientSession.paymentMethod?.options?.PAYMENT_CARD = paymentCardOptions
+        }
+
         if let metadata = metadataTextField.text, !metadata.isEmpty {
             clientSession.metadata = MetadataParser().parse(metadata)
         }
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 0000000000..35b492a740
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Primer3DS",
+        "repositoryURL": "https://github.com/primer-io/primer-sdk-3ds-ios",
+        "state": {
+          "branch": null,
+          "revision": "7d2c9ac8825a4459034a1416012cae61761543fd",
+          "version": "2.4.1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Sources/PrimerSDK/Classes/Core/PrimerHeadlessUniversalCheckout/Models/PrimerCardValidationModels.swift b/Sources/PrimerSDK/Classes/Core/PrimerHeadlessUniversalCheckout/Models/PrimerCardValidationModels.swift
index 133d5fd602..c4cd83816c 100644
--- a/Sources/PrimerSDK/Classes/Core/PrimerHeadlessUniversalCheckout/Models/PrimerCardValidationModels.swift
+++ b/Sources/PrimerSDK/Classes/Core/PrimerHeadlessUniversalCheckout/Models/PrimerCardValidationModels.swift
@@ -54,6 +54,10 @@ public class PrimerCardNetwork: NSObject {
         guard let network = network else { return nil }
         self.init(network: network)
     }
+
+    override public var description: String {
+        return "PrimerCardNetwork(displayName: \(displayName), network: \(network), allowed: \(allowed))"
+    }
 }
 
 @objc
diff --git a/Sources/PrimerSDK/Classes/Extensions & Utilities/PrimerButton.swift b/Sources/PrimerSDK/Classes/Extensions & Utilities/PrimerButton.swift
index c6a5b1d49c..88ae1bdf5e 100644
--- a/Sources/PrimerSDK/Classes/Extensions & Utilities/PrimerButton.swift	
+++ b/Sources/PrimerSDK/Classes/Extensions & Utilities/PrimerButton.swift	
@@ -160,27 +160,28 @@ extension PrimerButton {
 
     func startAnimating() {
         if activityIndicator.isAnimating { return }
-        activityIndicator.startAnimating()
-        var buttonStates: [ActivityIndicatorButtonState] = []
-        for state in [UIControl.State.disabled] {
-            let buttonState = ActivityIndicatorButtonState(state: state, title: title(for: state), image: image(for: state))
-            buttonStates.append(buttonState)
-            setTitle("", for: state)
-            setImage(UIImage(), for: state)
-        }
-        self.activityIndicatorButtonStates = buttonStates
         DispatchQueue.main.async {
+
+            self.activityIndicator.startAnimating()
+            var buttonStates: [ActivityIndicatorButtonState] = []
+            for state in [UIControl.State.disabled] {
+                let buttonState = ActivityIndicatorButtonState(state: state, title: self.title(for: state), image: self.image(for: state))
+                buttonStates.append(buttonState)
+                self.setTitle("", for: state)
+                self.setImage(UIImage(), for: state)
+            }
+            self.activityIndicatorButtonStates = buttonStates
             self.isEnabled = false
         }
     }
 
     func stopAnimating() {
-        activityIndicator.stopAnimating()
-        for buttonState in activityIndicatorButtonStates {
-            setTitle(buttonState.title, for: buttonState.state)
-            setImage(buttonState.image, for: buttonState.state)
-        }
         DispatchQueue.main.async {
+            self.activityIndicator.stopAnimating()
+            for buttonState in self.activityIndicatorButtonStates {
+                self.setTitle(buttonState.title, for: buttonState.state)
+                self.setImage(buttonState.image, for: buttonState.state)
+            }
             self.isEnabled = true
         }
     }
diff --git a/Sources/PrimerSDK/Classes/PCI/Tokenization View Models/FormsTokenizationViewModel/CardFormPaymentMethodTokenizationViewModel.swift b/Sources/PrimerSDK/Classes/PCI/Tokenization View Models/FormsTokenizationViewModel/CardFormPaymentMethodTokenizationViewModel.swift
index 6a5881487a..e5ac31406a 100644
--- a/Sources/PrimerSDK/Classes/PCI/Tokenization View Models/FormsTokenizationViewModel/CardFormPaymentMethodTokenizationViewModel.swift	
+++ b/Sources/PrimerSDK/Classes/PCI/Tokenization View Models/FormsTokenizationViewModel/CardFormPaymentMethodTokenizationViewModel.swift	
@@ -34,6 +34,20 @@ class CardFormPaymentMethodTokenizationViewModel: PaymentMethodTokenizationViewM
         return manager
     }()
 
+    // Used for Co-Badged Cards feature
+    private let cardPaymentMethodName = "PAYMENT_CARD"
+    private lazy var rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager? = {
+        // If the manager is not resolved (nil) Co-Badged cards feature will just not work and the card form should be working as before
+        let manager = try? PrimerHeadlessUniversalCheckout.RawDataManager(paymentMethodType: cardPaymentMethodName, delegate: self)
+        return manager
+    }()
+
+    private var rawCardData = PrimerCardData(cardNumber: "",
+                                             expiryDate: "",
+                                             cvv: "",
+                                             cardholderName: "")
+    fileprivate var currentlyAvailableCardNetworks: [PrimerCardNetwork]?
+
     private let theme: PrimerThemeProtocol = DependencyContainer.resolve()
 
     var userInputCompletion: (() -> Void)?
@@ -81,9 +95,17 @@ class CardFormPaymentMethodTokenizationViewModel: PaymentMethodTokenizationViewM
         return textField
     }()
 
-    var cardNetwork: CardNetwork? {
+    var defaultCardNetwork: CardNetwork? {
         didSet {
-            cvvField.cardNetwork = cardNetwork ?? .unknown
+            cvvField.cardNetwork = defaultCardNetwork ?? .unknown
+        }
+    }
+
+    var alternativelySelectedCardNetwork: CardNetwork? {
+        didSet {
+            if let alternativelySelectedCardNetwork {
+                cvvField.cardNetwork = alternativelySelectedCardNetwork
+            }
         }
     }
 
@@ -106,7 +128,25 @@ class CardFormPaymentMethodTokenizationViewModel: PaymentMethodTokenizationViewM
     }()
 
     private lazy var cardNumberContainerView: PrimerCustomFieldView = {
-        PrimerCardNumberField.cardNumberContainerViewWithFieldView(cardNumberField)
+        let containerView = PrimerCardNumberField.cardNumberContainerViewWithFieldView(cardNumberField)
+        containerView.onCardNetworkSelected = { [weak self] cardNetwork in
+            guard let self = self else { return }
+            self.alternativelySelectedCardNetwork = cardNetwork.network
+            self.rawCardData.cardNetwork = cardNetwork.network
+            self.rawDataManager?.rawData = self.rawCardData // TODO: (BNI) This does not work for unknown reason
+            self.cardComponentsManager.selectedCardNetwork = cardNetwork.network
+
+            // Select payment method based on the detected card network
+            let clientSessionActionsModule: ClientSessionActionsProtocol = ClientSessionActionsModule()
+            firstly {
+                clientSessionActionsModule.selectPaymentMethodIfNeeded(self.config.type, cardNetwork: cardNetwork.network.rawValue)
+            }
+            .done {
+                self.configureAmountLabels(cardNetwork: cardNetwork.network)
+            }
+            .catch { _ in }
+        }
+        return containerView
     }()
 
     // MARK: - Cardholder name field
@@ -657,13 +697,16 @@ class CardFormPaymentMethodTokenizationViewModel: PaymentMethodTokenizationViewM
         }
     }
 
-    func configurePayButton(cardNetwork: CardNetwork?) {
-        var amount: Int = AppState.current.amount ?? 0
-
-        if let surcharge = cardNetwork?.surcharge {
-            amount += surcharge
+    func configureAmountLabels(cardNetwork: CardNetwork?) {
+        if let surcharge = alternativelySelectedCardNetwork?.surcharge ?? cardNetwork?.surcharge,
+        PrimerAPIConfigurationModule.apiConfiguration?.clientSession?.order?.merchantAmount == nil,
+        let currency = AppState.current.currency {
+            configureSurchargeLabel(surchargeAmount: surcharge, currency: currency)
+        } else {
+            hideSurchargeLabel()
         }
 
+        let amount: Int = AppState.current.amount ?? 0
         configurePayButton(amount: amount)
     }
 
@@ -680,6 +723,19 @@ class CardFormPaymentMethodTokenizationViewModel: PaymentMethodTokenizationViewM
         }
     }
 
+    func configureSurchargeLabel(surchargeAmount: Int, currency: Currency) {
+        DispatchQueue.main.async {
+            let amount = "+ \(surchargeAmount.toCurrencyString(currency: currency))"
+            self.cardNumberContainerView.updateSurcharge(amount: amount)
+        }
+    }
+
+    func hideSurchargeLabel() {
+        DispatchQueue.main.async {
+            self.cardNumberContainerView.updateSurcharge(amount: nil)
+        }
+    }
+
     override func submitButtonTapped() {
         self.uiModule.submitButton?.startAnimating()
         let viewEvent = Analytics.Event.ui(
@@ -710,7 +766,7 @@ extension CardFormPaymentMethodTokenizationViewModel {
 
     private func dispatchActions() -> Promise<Void> {
         return Promise { seal in
-            var network = self.cardNetwork?.rawValue.uppercased()
+            var network = self.alternativelySelectedCardNetwork?.rawValue.uppercased() ?? self.defaultCardNetwork?.rawValue.uppercased()
             if network == nil || network == "UNKNOWN" {
                 network = "OTHER"
             }
@@ -910,50 +966,62 @@ extension CardFormPaymentMethodTokenizationViewModel: PrimerTextFieldViewDelegat
     }
 
     func primerTextFieldView(_ primerTextFieldView: PrimerTextFieldView, didDetectCardNetwork cardNetwork: CardNetwork?) {
-        self.cardNetwork = cardNetwork
+        self.defaultCardNetwork = cardNetwork
+
+        if let text = primerTextFieldView.textField.internalText {
+            rawCardData.cardNumber = text.replacingOccurrences(of: " ", with: "")
+            rawDataManager?.rawData = rawCardData
+        }
+
+        DispatchQueue.main.async {
+            self.handleCardNetworkDetection(cardNetwork)
+        }
+    }
+
+    private func handleCardNetworkDetection(_ cardNetwork: CardNetwork?) {
+        guard alternativelySelectedCardNetwork == nil
+        else { return }
 
-        var network = self.cardNetwork?.rawValue.uppercased()
+        self.rawCardData.cardNetwork = cardNetwork
+        self.rawDataManager?.rawData = self.rawCardData
+
+        var network = cardNetwork?.rawValue.uppercased()
         let clientSessionActionsModule: ClientSessionActionsProtocol = ClientSessionActionsModule()
 
         if let cardNetwork = cardNetwork,
-           cardNetwork != .unknown,
-           cardNumberContainerView.rightImage2 != cardNetwork.icon {
+            cardNetwork != .unknown {
+            // Set the network value to "OTHER" if it's nil or unknown
             if network == nil || network == "UNKNOWN" {
                 network = "OTHER"
             }
 
-            cardNumberContainerView.rightImage2 = cardNetwork.icon
+            // Update the UI with the detected card network icon
+            cardNumberContainerView.rightImage = cardNetwork.icon
 
+            // Select payment method based on the detected card network
             firstly {
                 clientSessionActionsModule.selectPaymentMethodIfNeeded(self.config.type, cardNetwork: network)
             }
             .done {
-                self.updateButtonUI()
+                self.configureAmountLabels(cardNetwork: cardNetwork)
             }
             .catch { _ in }
-        } else if cardNumberContainerView.rightImage2 != nil && (cardNetwork?.icon == nil || cardNetwork == .unknown) {
-            cardNumberContainerView.rightImage2 = nil
+
+        } else if cardNumberContainerView.rightImage != nil && (cardNetwork?.icon == nil || cardNetwork == .unknown) {
+            // Unselect payment method and remove the card network icon if unknown or nil
+            cardNumberContainerView.rightImage = nil
 
             firstly {
                 clientSessionActionsModule.unselectPaymentMethodIfNeeded()
             }
             .done {
-                self.updateButtonUI()
+                self.configureAmountLabels(cardNetwork: cardNetwork)
             }
             .catch { _ in }
         }
     }
 }
 
-extension CardFormPaymentMethodTokenizationViewModel {
-
-    private func updateButtonUI() {
-        if let amount = AppState.current.amount, self.uiModule.isSubmitButtonAnimating == false {
-            self.configurePayButton(amount: amount)
-        }
-    }
-}
-
 extension CardFormPaymentMethodTokenizationViewModel: SFSafariViewControllerDelegate {
 
     func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
@@ -1039,6 +1107,71 @@ extension CardFormPaymentMethodTokenizationViewModel: UITextFieldDelegate {
     }
 }
 
+// MARK: - PrimerHeadlessUniversalCheckoutRawDataManagerDelegate
+extension CardFormPaymentMethodTokenizationViewModel: PrimerHeadlessUniversalCheckoutRawDataManagerDelegate {
+
+    func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
+                              dataIsValid isValid: Bool,
+                              errors: [Swift.Error]?) {
+        let errorsDescription = errors?.map { $0.localizedDescription }.joined(separator: ", ")
+        logger.debug(message: "dataIsValid: \(isValid), errors: \(errorsDescription ?? "none")")
+    }
+
+    func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
+                              metadataDidChange metadata: [String: Any]?) {
+        logger.debug(message: "metadataDidChange: \(metadata ?? [:])")
+    }
+
+    func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
+                              willFetchMetadataForState cardState: PrimerValidationState) {
+        guard let state = cardState as? PrimerCardNumberEntryState else {
+            logger.error(message: "Received non-card metadata. Ignoring ...")
+            return
+        }
+        logger.debug(message: "willFetchCardMetadataForState: \(state.cardNumber)")
+    }
+
+    func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
+                              didReceiveMetadata metadata: PrimerPaymentMethodMetadata,
+                              forState cardState: PrimerValidationState) {
+
+        guard let metadata = metadata as? PrimerCardNumberEntryMetadata,
+              let cardState = cardState as? PrimerCardNumberEntryState else {
+            logger.error(message: "Received non-card metadata. Ignoring ...")
+            return
+        }
+
+        let metadataDescription = metadata.selectableCardNetworks?.items.map { $0.displayName }.joined(separator: ", ") ?? "n/a"
+        logger.debug(message: "didReceiveCardMetadata: (selectable ->) \(metadataDescription), cardState: \(cardState.cardNumber)")
+
+        if metadata.source == .remote, let networks = metadata.selectableCardNetworks?.items, !networks.isEmpty {
+            currentlyAvailableCardNetworks = metadata.selectableCardNetworks?.items
+        } else if let preferredDetectedNetwork = metadata.detectedCardNetworks.preferred {
+            currentlyAvailableCardNetworks = [preferredDetectedNetwork]
+        } else if let cardNetwork = metadata.detectedCardNetworks.items.first {
+            currentlyAvailableCardNetworks = [cardNetwork]
+        } else {
+            currentlyAvailableCardNetworks = []
+        }
+
+        currentlyAvailableCardNetworks = currentlyAvailableCardNetworks?.filter { $0.displayName != "Unknown" }
+        cardNumberContainerView.cardNetworks = currentlyAvailableCardNetworks ?? []
+
+        if currentlyAvailableCardNetworks?.count ?? 0 < 2 {
+            DispatchQueue.main.async {
+                self.cardNumberContainerView.resetCardNetworkSelection()
+                self.alternativelySelectedCardNetwork = nil
+                self.handleCardNetworkDetection(self.currentlyAvailableCardNetworks?.first?.network)
+            }
+        }
+    }
+
+    private func image(from model: PrimerCardNetwork) -> UIImage? {
+        let asset = PrimerHeadlessUniversalCheckout.AssetsManager.getCardNetworkAsset(for: model.network)
+        return asset?.cardImage
+    }
+}
+
 private extension String {
     func lowercasedAndFolded() -> String {
         self
diff --git a/Sources/PrimerSDK/Classes/PCI/User Interface/InternalCardComponentsManager.swift b/Sources/PrimerSDK/Classes/PCI/User Interface/InternalCardComponentsManager.swift
index e5564c32c5..5ed7c36be6 100644
--- a/Sources/PrimerSDK/Classes/PCI/User Interface/InternalCardComponentsManager.swift	
+++ b/Sources/PrimerSDK/Classes/PCI/User Interface/InternalCardComponentsManager.swift	
@@ -39,6 +39,7 @@ protocol InternalCardComponentsManagerProtocol {
     var expiryDateField: PrimerExpiryDateFieldView { get }
     var cvvField: PrimerCVVFieldView { get }
     var cardholderField: PrimerCardholderNameFieldView? { get }
+    var selectedCardNetwork: CardNetwork? { get }
     var delegate: InternalCardComponentsManagerDelegate { get }
     var customerId: String? { get }
     var merchantIdentifier: String? { get }
@@ -61,6 +62,7 @@ internal class InternalCardComponentsManager: NSObject, InternalCardComponentsMa
     var expiryDateField: PrimerExpiryDateFieldView
     var cvvField: PrimerCVVFieldView
     var cardholderField: PrimerCardholderNameFieldView?
+    var selectedCardNetwork: CardNetwork? // Network selected by the customer in Co-Badged Cards feature
     var billingAddressFieldViews: [PrimerTextFieldView]?
     var isRequiringCVVInput: Bool
     var paymentMethodType: String
@@ -236,7 +238,7 @@ and 4 characters for expiry year separated by '/'.
                     diagnosticsId: UUID().uuidString)
                 errors.append(err)
 
-            } else if !cvvField.cvv.isValidCVV(cardNetwork: CardNetwork(cardNumber: cardnumberField.cardnumber)) {
+            } else if !cvvField.cvv.isValidCVV(cardNetwork: selectedCardNetwork ?? CardNetwork(cardNumber: cardnumberField.cardnumber)) {
                 let err = PrimerValidationError.invalidCvv(
                     message: "CVV is not valid.",
                     userInfo: .errorUserInfoDictionary(),
@@ -288,19 +290,20 @@ and 4 characters for expiry year separated by '/'.
 
         if isRequiringCVVInput {
 
-            let cardPaymentInstrument = CardPaymentInstrument(number: self.cardnumberField.cardnumber,
-                                                              cvv: self.cvvField.cvv,
+            let cardPaymentInstrument = CardPaymentInstrument(number: cardnumberField.cardnumber,
+                                                              cvv: cvvField.cvv,
                                                               expirationMonth: expiryMonth,
                                                               expirationYear: cardExpirationYear,
-                                                              cardholderName: self.cardholderField?.cardholderName)
+                                                              cardholderName: cardholderField?.cardholderName,
+                                                              preferredNetwork: selectedCardNetwork?.rawValue)
             return cardPaymentInstrument
 
-        } else if let configId = AppState.current.apiConfiguration?.getConfigId(for: self.primerPaymentMethodType.rawValue),
-                  let cardholderName = self.cardholderField?.cardholderName {
+        } else if let configId = AppState.current.apiConfiguration?.getConfigId(for: primerPaymentMethodType.rawValue),
+                  let cardholderName = cardholderField?.cardholderName {
 
             let cardOffSessionPaymentInstrument = CardOffSessionPaymentInstrument(paymentMethodConfigId: configId,
-                                                                                  paymentMethodType: self.primerPaymentMethodType.rawValue,
-                                                                                  number: self.cardnumberField.cardnumber,
+                                                                                  paymentMethodType: primerPaymentMethodType.rawValue,
+                                                                                  number: cardnumberField.cardnumber,
                                                                                   expirationMonth: expiryMonth,
                                                                                   expirationYear: cardExpirationYear,
                                                                                   cardholderName: cardholderName)
diff --git a/Sources/PrimerSDK/Classes/PCI/User Interface/Root/PrimerCardFormViewController.swift b/Sources/PrimerSDK/Classes/PCI/User Interface/Root/PrimerCardFormViewController.swift
index 77b995cb59..eaa207ebb3 100644
--- a/Sources/PrimerSDK/Classes/PCI/User Interface/Root/PrimerCardFormViewController.swift	
+++ b/Sources/PrimerSDK/Classes/PCI/User Interface/Root/PrimerCardFormViewController.swift	
@@ -13,11 +13,12 @@ class PrimerCardFormViewController: PrimerFormViewController {
     private let theme: PrimerThemeProtocol = DependencyContainer.resolve()
     private let formPaymentMethodTokenizationViewModel: CardFormPaymentMethodTokenizationViewModel
 
-    init(navigationBarLogo: UIImage? = nil, viewModel: CardFormPaymentMethodTokenizationViewModel) {
-        self.formPaymentMethodTokenizationViewModel = viewModel
+    init(navigationBarLogo: UIImage? = nil,
+         viewModel: CardFormPaymentMethodTokenizationViewModel) {
+        formPaymentMethodTokenizationViewModel = viewModel
         super.init(nibName: nil, bundle: nil)
-        self.titleImage = navigationBarLogo
-        if self.titleImage == nil {
+        titleImage = navigationBarLogo
+        if titleImage == nil {
             title = Strings.PrimerCardFormView.title
         }
     }
diff --git a/Sources/PrimerSDK/Classes/PCI/User Interface/Text Fields/PrimerCustomTextField.swift b/Sources/PrimerSDK/Classes/PCI/User Interface/Text Fields/PrimerCustomTextField.swift
index 3e2e6ab713..90611bfac8 100644
--- a/Sources/PrimerSDK/Classes/PCI/User Interface/Text Fields/PrimerCustomTextField.swift	
+++ b/Sources/PrimerSDK/Classes/PCI/User Interface/Text Fields/PrimerCustomTextField.swift	
@@ -7,54 +7,82 @@
 
 import UIKit
 
+// swiftlint:disable type_body_length
 class PrimerCustomFieldView: UIView {
 
+    // MARK: - Properties
+
+    // Custom text field view for input
     var fieldView: PrimerTextFieldView!
-    override var tintColor: UIColor! {
-        didSet {
-            topPlaceholderLabel.textColor = tintColor
-            bottomLine.backgroundColor = tintColor
-        }
-    }
-    var placeholderText: String?
-    var rightImage1: UIImage? {
+
+    // Array of supported card networks, updating the dropdown view visibility on change
+    var cardNetworks: [PrimerCardNetwork] = [] {
         didSet {
-            rightImageView1Container.isHidden = rightImage1 == nil
-            rightImageView1.image = rightImage1
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
+                self.updateNetworksDropdownViewVisibility()
+            }
         }
     }
-    var rightImage1TintColor: UIColor? {
+
+    private var textFieldStackView: UIStackView!  // Stack view containing the text field and dropdown
+    private var networksDropdownView: UIView?  // Dropdown view for displaying available card networks
+    private var presentationButton: UIButton!  // Button used to trigger menu programmatically
+
+    private var surchargeView: UIView?  // The surcharge view
+    private var surchargeLabel: UILabel?  // Label inside the surcharge view
+
+    // Callback triggered when a card network is selected
+    var onCardNetworkSelected: ((PrimerCardNetwork) -> Void)?
+    var selectedCardNetwork: PrimerCardNetwork?
+
+    override var tintColor: UIColor! {  // Updates label and line color on tint change
         didSet {
-            rightImageView1.tintColor = rightImage1TintColor
+            topPlaceholderLabel.textColor = tintColor
+            bottomLine.backgroundColor = tintColor
         }
     }
-    var rightImage2: UIImage? {
+
+    // Placeholder text for the top label
+    var placeholderText: String?
+
+    // Image on the right side of the text field
+    var rightImage: UIImage? {
         didSet {
-            rightImageView2.isHidden = rightImage2 == nil
-            rightImageView2.image = rightImage2
+            rightImageView.isHidden = rightImage == nil
+            rightImageView.image = rightImage
         }
     }
-    var rightImage2TintColor: UIColor? {
+
+    // Tint color for the right image
+    var rightImageTintColor: UIColor? {
         didSet {
-            rightImageView2.tintColor = rightImage2TintColor
+            rightImageView.tintColor = rightImageTintColor
         }
     }
+
+    // Error text displayed below the text field
     var errorText: String? {
         didSet {
             errorLabel.text = errorText ?? ""
         }
     }
 
-    private var verticalStackView: UIStackView = UIStackView()
-    private let errorLabel = UILabel()
-    private let topPlaceholderLabel = UILabel()
-    private let rightImageView1Container = UIView()
-    private let rightImageView1 = UIImageView()   // As in the one furthest right
-    private let rightImageView2Container = UIView()
-    private let rightImageView2 = UIImageView()
-    private let bottomLine = UIView()
-    private var theme: PrimerThemeProtocol = DependencyContainer.resolve()
+    private var verticalStackView: UIStackView = UIStackView()  // Main vertical stack view for layout
+    private let errorLabel = UILabel()  // Label to display error messages
+    private let topPlaceholderLabel = UILabel()  // Label for the placeholder text
+    private let rightImageViewContainer = UIView()  // Container for right-side image view
+    let rightImageView = UIImageView()  // Right image view
+    private let bottomLine = UIView()  // Line below the text field
+    private var theme: PrimerThemeProtocol = DependencyContainer.resolve()  // Theme for styling
+
+    // References for icon and chevron image views in the dropdown
+    private var networkIconImageView: UIImageView?
+    private var chevronImageView: UIImageView?
 
+    // MARK: - Setup Methods
+
+    // Sets up the view hierarchy and layout
     func setup() {
         setupVerticalStackView()
         setupTopPlaceholderLabel()
@@ -62,14 +90,79 @@ class PrimerCustomFieldView: UIView {
         setupBottomLine()
         setupErrorLabel()
         constrainVerticalStackView()
+        setupSurchargeView()
+    }
+
+    // Function to reset the card network selection to the initial state
+    func resetCardNetworkSelection() {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+
+            self.selectedCardNetwork = nil
+            self.networkIconImageView?.image = self.cardNetworks.first?.network.icon  // Reset to the first available icon
+            self.rightImageView.image = self.cardNetworks.first?.network.icon
+            // Update visibility based on card network count
+            self.updateNetworksDropdownViewVisibility()
+        }
+    }
+
+    // MARK: - Surcharge View
+
+    private func setupSurchargeView() {
+        surchargeView = createSurchargeView(withAmount: "")
+        surchargeView?.isHidden = true
+        if let surchargeView = surchargeView {
+            textFieldStackView.insertArrangedSubview(surchargeView, at: 1)
+        }
+    }
+
+    func updateSurcharge(amount: String?) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            if let amount = amount, !amount.isEmpty {
+                self.surchargeLabel?.text = amount
+                self.surchargeView?.isHidden = false
+            } else {
+                self.surchargeView?.isHidden = true
+            }
+        }
+    }
+
+    private func createSurchargeView(withAmount amount: String) -> UIView {
+        let containerView = UIView()
+        containerView.backgroundColor = UIColor(red: 229/255, green: 229/255, blue: 234/255, alpha: 1)
+        containerView.layer.cornerRadius = 4
+        containerView.translatesAutoresizingMaskIntoConstraints = false
+
+        let label = UILabel()
+        label.text = amount
+        label.textColor = UIColor(red: 17/255, green: 17/255, blue: 18/255, alpha: 1)
+        label.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
+        label.textAlignment = .center
+        label.translatesAutoresizingMaskIntoConstraints = false
+
+        containerView.addSubview(label)
+        surchargeLabel = label
+
+        NSLayoutConstraint.activate([
+            label.topAnchor.constraint(equalTo: containerView.topAnchor, constant: 5),
+            label.bottomAnchor.constraint(equalTo: containerView.bottomAnchor, constant: -5),
+            label.leadingAnchor.constraint(equalTo: containerView.leadingAnchor, constant: 8),
+            label.trailingAnchor.constraint(equalTo: containerView.trailingAnchor, constant: -8),
+            containerView.heightAnchor.constraint(equalToConstant: 24)
+        ])
+
+        return containerView
     }
 
+    // Sets up the main vertical stack view
     private func setupVerticalStackView() {
         addSubview(verticalStackView)
         verticalStackView.alignment = .fill
         verticalStackView.axis = .vertical
     }
 
+    // Configures the top label for the placeholder text
     private func setupTopPlaceholderLabel() {
         topPlaceholderLabel.font = UIFont.systemFont(ofSize: 10.0, weight: .medium)
         topPlaceholderLabel.text = placeholderText
@@ -77,62 +170,184 @@ class PrimerCustomFieldView: UIView {
         verticalStackView.addArrangedSubview(topPlaceholderLabel)
     }
 
+    // Configures the text field stack view with the field view and right image view
     private func setupTextFieldStackView() {
-        let textFieldStackView = createTextFieldStackView()
+        textFieldStackView = UIStackView()
+        textFieldStackView.alignment = .fill
+        textFieldStackView.axis = .horizontal
+        textFieldStackView.spacing = 6
 
-        setupRightImageView2Container(in: textFieldStackView)
-        setupRightImageView1Container(in: textFieldStackView)
+        // Add the text field to the stack view
+        textFieldStackView.addArrangedSubview(fieldView)
+        fieldView.setContentHuggingPriority(.defaultLow, for: .horizontal)
+        fieldView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
 
+        // Adds the right image view container to the stack view
+        setupRightImageViewContainer(in: textFieldStackView)
         verticalStackView.addArrangedSubview(textFieldStackView)
     }
 
-    private func createTextFieldStackView() -> UIStackView {
-        let textFieldStackView = UIStackView()
-        textFieldStackView.alignment = .fill
-        textFieldStackView.axis = .horizontal
-        textFieldStackView.addArrangedSubview(fieldView)
-        textFieldStackView.spacing = 6
-        return textFieldStackView
+    // Configures the dropdown view to display available card networks
+    private func setupNetworksDropdownView() {
+        guard networksDropdownView == nil else { return }
+
+        let dropdownView = createDropdownView()
+        let iconAndChevronStack = createIconAndChevronStack()
+
+        // Add stack containing the icon and chevron to the dropdown view
+        dropdownView.addSubview(iconAndChevronStack)
+        activateConstraints(for: iconAndChevronStack, in: dropdownView)
+
+        // Sets up the hidden button used to present the dropdown options
+        setupPresentationButton(in: dropdownView)
+
+        networksDropdownView = dropdownView
+        textFieldStackView.addArrangedSubview(dropdownView)
+        setDropdownViewConstraints(dropdownView)
+    }
+
+    // MARK: - Helper Methods
+
+    // Creates the dropdown view container
+    private func createDropdownView() -> UIView {
+        let dropdownView = UIView()
+        dropdownView.isUserInteractionEnabled = true
+        return dropdownView
+    }
+
+    // Creates a horizontal stack view with the network icon and chevron for the dropdown
+    private func createIconAndChevronStack() -> UIStackView {
+        let iconAndChevronStack = UIStackView()
+        iconAndChevronStack.axis = .horizontal
+        iconAndChevronStack.alignment = .center
+        iconAndChevronStack.spacing = 4
+
+        // Creates and configures the network icon container
+        let networkIconContainer = UIView()
+        networkIconImageView = UIImageView(image: cardNetworks.first?.network.icon)
+        networkIconImageView?.contentMode = .scaleAspectFit
+
+        // Adds the network icon to the container
+        networkIconContainer.addSubview(networkIconImageView!)
+        networkIconImageView?.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            networkIconImageView!.topAnchor.constraint(equalTo: networkIconContainer.topAnchor, constant: 6),
+            networkIconImageView!.bottomAnchor.constraint(equalTo: networkIconContainer.bottomAnchor, constant: -6),
+            networkIconImageView!.leadingAnchor.constraint(equalTo: networkIconContainer.leadingAnchor),
+            networkIconImageView!.trailingAnchor.constraint(equalTo: networkIconContainer.trailingAnchor),
+            networkIconImageView!.widthAnchor.constraint(equalTo: networkIconContainer.heightAnchor)
+        ])
+
+        // Adds the network icon container to the stack
+        iconAndChevronStack.addArrangedSubview(networkIconContainer)
+
+        // Creates and configures the chevron icon
+        let chevronImageView = UIImageView(image: UIImage(systemName: "chevron.down", withConfiguration: UIImage.SymbolConfiguration(scale: .small)))
+        self.chevronImageView = chevronImageView
+        chevronImageView.contentMode = .scaleAspectFit
+        iconAndChevronStack.addArrangedSubview(chevronImageView)
+
+        return iconAndChevronStack
+    }
+
+    // Activates constraints to pin the stack view within its container
+    private func activateConstraints(for stackView: UIStackView, in containerView: UIView) {
+        stackView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            stackView.topAnchor.constraint(equalTo: containerView.topAnchor),
+            stackView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor),
+            stackView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
+            stackView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor)
+        ])
     }
 
-    private func setupRightImageView2Container(in stackView: UIStackView) {
-        rightImageView2.contentMode = .scaleAspectFit
+    // Configures the presentation button for triggering the dropdown options
+    private func setupPresentationButton(in dropdownView: UIView) {
+        presentationButton = UIButton(type: .system)
+        presentationButton.alpha = 0.1
+        presentationButton.translatesAutoresizingMaskIntoConstraints = false
+
+        if #available(iOS 15.0, *) {
+            setupUIMenuForButton()
+        } else {
+            presentationButton.addTarget(self, action: #selector(showCardNetworkSelectionAlert), for: .touchUpInside)
+        }
+
+        dropdownView.addSubview(presentationButton)
+    }
 
-        stackView.addArrangedSubview(rightImageView2Container)
-        rightImageView2Container.translatesAutoresizingMaskIntoConstraints = false
-        rightImageView2Container.addSubview(rightImageView2)
-        rightImageView2.translatesAutoresizingMaskIntoConstraints = false
+    // Configures the UIMenu for iOS 15 and above
+    @available(iOS 15.0, *)
+    private func setupUIMenuForButton() {
+        let uiActions = cardNetworks.map { network in
+            UIAction(title: network.displayName, image: network.network.icon) { _ in
+                self.selectedCardNetwork = network
+                self.networkIconImageView?.image = network.network.icon
+                self.onCardNetworkSelected?(network)
+            }
+        }
+
+        let menu = UIMenu(options: .singleSelection, children: uiActions)
+        presentationButton?.menu = menu
+        presentationButton?.showsMenuAsPrimaryAction = true
+    }
+
+    // Sets constraints for the dropdown view and presentation button
+    private func setDropdownViewConstraints(_ dropdownView: UIView) {
+        dropdownView.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
-            rightImageView2.topAnchor.constraint(equalTo: rightImageView2Container.topAnchor, constant: 6),
-            rightImageView2.bottomAnchor.constraint(equalTo: rightImageView2Container.bottomAnchor, constant: -6),
-            rightImageView2.leadingAnchor.constraint(equalTo: rightImageView2Container.leadingAnchor),
-            rightImageView2.trailingAnchor.constraint(equalTo: rightImageView2Container.trailingAnchor),
-            rightImageView2.widthAnchor.constraint(equalTo: rightImageView2Container.heightAnchor)
+            dropdownView.widthAnchor.constraint(equalToConstant: 44),
+            dropdownView.heightAnchor.constraint(equalToConstant: 36),
+            presentationButton.widthAnchor.constraint(equalToConstant: 44),
+            presentationButton.heightAnchor.constraint(equalToConstant: 36)
         ])
+        dropdownView.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        dropdownView.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
     }
 
-    private func setupRightImageView1Container(in stackView: UIStackView) {
-        rightImageView1.contentMode = .scaleAspectFit
+    // Updates dropdown visibility based on the number of card networks
+    private func updateNetworksDropdownViewVisibility() {
+
+        if #available(iOS 15.0, *) {
+            setupUIMenuForButton()
+        }
+
+        if cardNetworks.count > 1 {
+            if networksDropdownView == nil {
+                setupNetworksDropdownView()
+            }
+            networksDropdownView?.isHidden = false
+            rightImageViewContainer.isHidden = true
+        } else {
+            networksDropdownView?.isHidden = true
+            rightImageViewContainer.isHidden = false
+        }
+    }
 
-        stackView.addArrangedSubview(rightImageView1Container)
-        rightImageView1Container.translatesAutoresizingMaskIntoConstraints = false
-        rightImageView1Container.addSubview(rightImageView1)
-        rightImageView1.translatesAutoresizingMaskIntoConstraints = false
+    // Configures the right image view container in the text field stack view
+    private func setupRightImageViewContainer(in stackView: UIStackView) {
+        rightImageView.contentMode = .scaleAspectFit
+        stackView.addArrangedSubview(rightImageViewContainer)
+        rightImageViewContainer.translatesAutoresizingMaskIntoConstraints = false
+        rightImageViewContainer.addSubview(rightImageView)
+        rightImageView.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
-            rightImageView1.topAnchor.constraint(equalTo: rightImageView1Container.topAnchor, constant: 10),
-            rightImageView1.bottomAnchor.constraint(equalTo: rightImageView1Container.bottomAnchor, constant: -10),
-            rightImageView1.leadingAnchor.constraint(equalTo: rightImageView1Container.leadingAnchor),
-            rightImageView1.trailingAnchor.constraint(equalTo: rightImageView1Container.trailingAnchor),
-            rightImageView1.widthAnchor.constraint(equalTo: rightImageView1Container.heightAnchor)
+            rightImageView.topAnchor.constraint(equalTo: rightImageViewContainer.topAnchor, constant: 6),
+            rightImageView.bottomAnchor.constraint(equalTo: rightImageViewContainer.bottomAnchor, constant: -6),
+            rightImageView.leadingAnchor.constraint(equalTo: rightImageViewContainer.leadingAnchor),
+            rightImageView.trailingAnchor.constraint(equalTo: rightImageViewContainer.trailingAnchor),
+            rightImageView.widthAnchor.constraint(equalTo: rightImageViewContainer.heightAnchor)
         ])
     }
 
+    // Configures the bottom line beneath the text field
     private func setupBottomLine() {
         bottomLine.backgroundColor = theme.colors.primary
         bottomLine.heightAnchor.constraint(equalToConstant: 1).isActive = true
         verticalStackView.addArrangedSubview(bottomLine)
     }
 
+    // Configures the error label below the text field
     private func setupErrorLabel() {
         errorLabel.textColor = theme.text.error.color
         errorLabel.heightAnchor.constraint(equalToConstant: 12.0).isActive = true
@@ -141,6 +356,7 @@ class PrimerCustomFieldView: UIView {
         verticalStackView.addArrangedSubview(errorLabel)
     }
 
+    // Sets up constraints for the main vertical stack view
     private func constrainVerticalStackView() {
         verticalStackView.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
@@ -150,4 +366,27 @@ class PrimerCustomFieldView: UIView {
             verticalStackView.bottomAnchor.constraint(equalTo: bottomAnchor)
         ])
     }
+
+    // MARK: - Dropdown Actions
+
+    // Shows an alert for selecting a card network (for iOS < 15)
+    @objc private func showCardNetworkSelectionAlert() {
+        let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
+
+        cardNetworks.forEach { network in
+            let action = UIAlertAction(title: network.displayName, style: .default) { _ in
+                self.selectedCardNetwork = network
+                self.networkIconImageView?.image = network.network.icon
+                self.rightImageView.image = network.network.icon
+                self.onCardNetworkSelected?(network)
+            }
+            action.setValue(network.network.icon?.withRenderingMode(.alwaysOriginal), forKey: "image")
+            alertController.addAction(action)
+        }
+
+        if let viewController = UIApplication.shared.keyWindow?.rootViewController {
+            viewController.present(alertController, animated: true)
+        }
+    }
 }
+// swiftlint:enable type_body_length
diff --git a/Sources/PrimerSDK/Classes/Services/Network/WebAuthenticationService.swift b/Sources/PrimerSDK/Classes/Services/Network/WebAuthenticationService.swift
index 129a7b9302..2814061c24 100644
--- a/Sources/PrimerSDK/Classes/Services/Network/WebAuthenticationService.swift
+++ b/Sources/PrimerSDK/Classes/Services/Network/WebAuthenticationService.swift
@@ -52,7 +52,7 @@ extension DefaultWebAuthenticationService: ASWebAuthenticationPresentationContex
 
 }
 
-fileprivate extension UIApplication {
+extension UIApplication {
     var windows: [UIWindow] {
         let windowScene = self.connectedScenes.compactMap { $0 as? UIWindowScene }.first
         guard let windows = windowScene?.windows else {
diff --git a/Tests/Primer/Data Models/PrimerCardNetworkTests.swift b/Tests/Primer/Data Models/PrimerCardNetworkTests.swift
new file mode 100644
index 0000000000..477fafe208
--- /dev/null
+++ b/Tests/Primer/Data Models/PrimerCardNetworkTests.swift	
@@ -0,0 +1,45 @@
+//
+//  PrimerCardNetworkTests.swift
+//  PrimerSDK
+//
+//  Created by Boris on 9.12.24..
+//
+
+import XCTest
+@testable import PrimerSDK
+
+final class PrimerCardNetworkTests: XCTestCase {
+
+    func testInitWithDisplayNameAndNetwork() {
+        let cardNetwork = PrimerCardNetwork(displayName: "Custom DisplayName", network: .visa)
+        XCTAssertEqual(cardNetwork.displayName, "Custom DisplayName")
+        XCTAssertEqual(cardNetwork.network, .visa)
+    }
+
+    func testInitWithNetworkOnly() {
+        let cardNetwork = PrimerCardNetwork(network: .masterCard)
+        XCTAssertEqual(cardNetwork.displayName, "Mastercard")
+        XCTAssertEqual(cardNetwork.network, .masterCard)
+
+        let unknownNetwork = PrimerCardNetwork(network: .unknown)
+        XCTAssertEqual(unknownNetwork.displayName, "Unknown")
+        XCTAssertEqual(unknownNetwork.network, .unknown)
+        XCTAssertFalse(unknownNetwork.allowed, "Unknown should not be allowed")
+    }
+
+    func testFailableInitWithOptionalNetwork() {
+        let cardNetwork = PrimerCardNetwork(network: CardNetwork.visa)
+        XCTAssertNotNil(cardNetwork)
+        XCTAssertEqual(cardNetwork.network, .visa)
+
+        let nilCardNetwork = PrimerCardNetwork(network: nil)
+        XCTAssertNil(nilCardNetwork, "Initializer should return nil when given nil network")
+    }
+
+    func testDescription() {
+        let cardNetwork = PrimerCardNetwork(network: .masterCard)
+        let description = cardNetwork.description
+        XCTAssertTrue(description.contains("displayName: Mastercard"), "Description should contain displayName")
+        XCTAssertTrue(description.contains("network: masterCard"), "Description should contain network")
+    }
+}
diff --git a/Tests/Primer/Services/InternalCardComponentManagerTests.swift b/Tests/Primer/Services/InternalCardComponentManagerTests.swift
index 0e0f0c8981..1ba650ca76 100644
--- a/Tests/Primer/Services/InternalCardComponentManagerTests.swift
+++ b/Tests/Primer/Services/InternalCardComponentManagerTests.swift
@@ -137,6 +137,7 @@ class InternalCardComponentManagerTests: XCTestCase {
 }
 
 class MockCardComponentsManager: InternalCardComponentsManagerProtocol {
+    var selectedCardNetwork: PrimerSDK.CardNetwork?
 
     var cardnumberField: PrimerCardNumberFieldView
 
diff --git a/Tests/Primer/Tokenization/View Models/CardFormPaymentMethodTokenizationViewModelTests.swift b/Tests/Primer/Tokenization/View Models/CardFormPaymentMethodTokenizationViewModelTests.swift
index 051db8ea2a..476ca0dad3 100644
--- a/Tests/Primer/Tokenization/View Models/CardFormPaymentMethodTokenizationViewModelTests.swift	
+++ b/Tests/Primer/Tokenization/View Models/CardFormPaymentMethodTokenizationViewModelTests.swift	
@@ -202,6 +202,57 @@ final class CardFormPaymentMethodTokenizationViewModelTests: XCTestCase, Tokeniz
         XCTAssertNil(error2.checkoutData)
     }
 
+    func testCardNetworkDetection() throws {
+        SDKSessionHelper.setUp { mockAppState in
+            mockAppState.amount = 1234
+            mockAppState.currency = Currency(code: "GBP", decimalDigits: 2)
+        }
+
+        let expectWillShowPaymentMethod = self.expectation(description: "Did show payment method")
+        uiDelegate.onUIDidShowPaymentMethod = { type in
+            // Simulate entering a Visa card number
+            self.sut.cardNumberField.textField.internalText = "4111 1111 1111 1111"
+            self.sut.primerTextFieldView(self.sut.cardNumberField, didDetectCardNetwork: .visa)
+            expectWillShowPaymentMethod.fulfill()
+        }
+
+        sut.start()
+
+        waitForExpectations(timeout: 10.0)
+        
+        XCTAssertEqual(self.sut.defaultCardNetwork, .visa)
+        XCTAssertNil(self.sut.alternativelySelectedCardNetwork)
+    }
+
+    func testSubmitButtonDisabledWithInvalidFields() throws {
+        SDKSessionHelper.setUp { mockAppState in
+            mockAppState.amount = 1234
+            mockAppState.currency = Currency(code: "GBP", decimalDigits: 2)
+        }
+
+        let expectWillShowPaymentMethod = self.expectation(description: "Did show payment method")
+        uiDelegate.onUIDidShowPaymentMethod = { type in
+            // Fill in fields with invalid data
+            self.sut.cardNumberField.textField.internalText = "4111"  // Incomplete number
+            self.sut.expiryDateField.expiryYear = "30"
+            self.sut.expiryDateField.expiryMonth = "03"
+            self.sut.cvvField.textField.internalText = "12"  // Invalid CVV
+            
+            // Simulate validation of each field
+            self.sut.primerTextFieldView(self.sut.cardNumberField, isValid: false)
+            self.sut.primerTextFieldView(self.sut.expiryDateField, isValid: true)
+            self.sut.primerTextFieldView(self.sut.cvvField, isValid: false)
+            
+            expectWillShowPaymentMethod.fulfill()
+        }
+
+        sut.start()
+
+        waitForExpectations(timeout: 10.0)
+        
+        XCTAssertFalse(self.sut.uiModule.submitButton?.isEnabled == true)
+    }
+
     // MARK: Helpers
 
     private var checkoutModule: PrimerAPIConfiguration.CheckoutModule {