From 427b63854f0ce2ea1a954e84e5d57a0d045ba876 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Mon, 22 Apr 2024 09:43:33 +0700
Subject: [PATCH 01/19] Obsolete Citi Pay with Point

---
 ExampleApp/Resources/Main.storyboard          | 130 ++++++++----------
 .../PaymentSettingTableViewController.swift   |   5 -
 .../SourceType/SourceType+Collections.swift   |   1 -
 .../OmiseAPI/SourceType/SourceType.swift      |   2 -
 .../SourceType+ViewPresentable.swift          |   4 -
 .../PaymentChooserViewControllerTests.swift   |   1 -
 6 files changed, 56 insertions(+), 87 deletions(-)

diff --git a/ExampleApp/Resources/Main.storyboard b/ExampleApp/Resources/Main.storyboard
index df09a1f8..5d8a206a 100644
--- a/ExampleApp/Resources/Main.storyboard
+++ b/ExampleApp/Resources/Main.storyboard
@@ -498,8 +498,8 @@ You can see the code in the ExampleApp.</string>
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="TrueMoney Wallet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SaY-Ag-qCZ">
-                                                    <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="TrueMoney Wallet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SaY-Ag-qCZ">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -515,25 +515,8 @@ You can see the code in the ExampleApp.</string>
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="PromptPay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5vT-ay-4xe">
-                                                    <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="204-5J-Qdj" style="IBUITableViewCellStyleDefault" id="bRK-Ye-kiB">
-                                        <rect key="frame" x="0.0" y="1163.5" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bRK-Ye-kiB" id="2qM-Md-2k9">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Pay with Citi Rewards Points" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="204-5J-Qdj">
-                                                    <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="PromptPay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5vT-ay-4xe">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -543,13 +526,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="xtk-7g-WKV" style="IBUITableViewCellStyleDefault" id="Fgd-So-rQR">
-                                        <rect key="frame" x="0.0" y="1207" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1163.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Fgd-So-rQR" id="1Io-lP-VCs">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Alipay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xtk-7g-WKV">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Alipay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xtk-7g-WKV">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -560,13 +543,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="siq-ge-ALW" style="IBUITableViewCellStyleDefault" id="CLr-CD-qgO" userLabel="AlipayCN">
-                                        <rect key="frame" x="0.0" y="1250.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1207" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="CLr-CD-qgO" id="osn-dY-wKR">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="AlipayCN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="siq-ge-ALW">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="AlipayCN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="siq-ge-ALW">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -577,13 +560,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="EOj-ou-hnd" style="IBUITableViewCellStyleDefault" id="YeH-im-9Dq" userLabel="AlipayHK">
-                                        <rect key="frame" x="0.0" y="1294" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1250.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YeH-im-9Dq" id="Qsm-Ty-KAc">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="AlipayHK" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EOj-ou-hnd">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="AlipayHK" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EOj-ou-hnd">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -594,13 +577,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="xQg-Xr-tFl" style="IBUITableViewCellStyleDefault" id="0zY-Fb-Bpi" userLabel="Atome Payment Cell">
-                                        <rect key="frame" x="0.0" y="1337.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1294" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="0zY-Fb-Bpi" id="mwv-NR-dwY">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Atome" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xQg-Xr-tFl" userLabel="Atome">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Atome" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xQg-Xr-tFl" userLabel="Atome">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -611,13 +594,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="qax-Jx-kmi" style="IBUITableViewCellStyleDefault" id="Glc-g3-04w" userLabel="Dana">
-                                        <rect key="frame" x="0.0" y="1381" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1337.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Glc-g3-04w" id="9Nx-QM-w1s">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="DANA" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="qax-Jx-kmi">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="DANA" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="qax-Jx-kmi">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -628,13 +611,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Eg1-eb-NbF" style="IBUITableViewCellStyleDefault" id="7Ax-Du-Ioh" userLabel="GCash">
-                                        <rect key="frame" x="0.0" y="1424.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1381" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="7Ax-Du-Ioh" id="fNz-HZ-6NP">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="GCash" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Eg1-eb-NbF">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="GCash" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Eg1-eb-NbF">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -645,13 +628,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="f1r-nm-Nvz" style="IBUITableViewCellStyleDefault" id="tRh-Pq-hBQ" userLabel="KakaoPay">
-                                        <rect key="frame" x="0.0" y="1468" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1424.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tRh-Pq-hBQ" id="HD9-bB-4hq">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="KakaoPay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f1r-nm-Nvz">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="KakaoPay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f1r-nm-Nvz">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -662,13 +645,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Ped-8F-IMU" style="IBUITableViewCellStyleDefault" id="MK8-KY-eE6" userLabel="Touch N Go">
-                                        <rect key="frame" x="0.0" y="1511.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1468" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="MK8-KY-eE6" id="25f-3M-5xL">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Touch N Go" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ped-8F-IMU">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Touch N Go" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ped-8F-IMU">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -679,13 +662,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="fzJ-WU-gCe" style="IBUITableViewCellStyleDefault" id="9DX-Jg-2uE">
-                                        <rect key="frame" x="0.0" y="1555" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1511.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9DX-Jg-2uE" id="JzN-WL-DyR">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Internet Banking - BAY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fzJ-WU-gCe">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Internet Banking - BAY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fzJ-WU-gCe">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -696,13 +679,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="XJK-z0-VSM" style="IBUITableViewCellStyleDefault" id="UET-A5-nkj">
-                                        <rect key="frame" x="0.0" y="1598.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1555" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="UET-A5-nkj" id="QVq-nj-b6t">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Internet Banking - BBL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XJK-z0-VSM">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Internet Banking - BBL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XJK-z0-VSM">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -713,13 +696,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Ffu-Re-1ts" style="IBUITableViewCellStyleDefault" id="jRH-XR-QY6">
-                                        <rect key="frame" x="0.0" y="1642" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1598.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="jRH-XR-QY6" id="ZzT-dv-S4C">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Lotus's Bill Payment" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ffu-Re-1ts">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Lotus's Bill Payment" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ffu-Re-1ts">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -730,13 +713,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="R9z-v8-MDa" style="IBUITableViewCellStyleDefault" id="wvG-o9-5Gh">
-                                        <rect key="frame" x="0.0" y="1685.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1642" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="wvG-o9-5Gh" id="QxD-U6-kTt">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="PayNow" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="R9z-v8-MDa">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="PayNow" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="R9z-v8-MDa">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -747,13 +730,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="w29-zP-7fy" style="IBUITableViewCellStyleDefault" id="PQI-uw-2ge">
-                                        <rect key="frame" x="0.0" y="1729" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1685.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="PQI-uw-2ge" id="yTT-75-DW6">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="E-Context" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="w29-zP-7fy">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="E-Context" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="w29-zP-7fy">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -764,13 +747,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Sxy-gk-WGt" style="IBUITableViewCellStyleDefault" id="3Rt-5Z-P6m" userLabel="Mobile BankingBAY Payment Cell">
-                                        <rect key="frame" x="0.0" y="1772.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1729" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3Rt-5Z-P6m" id="19n-VR-U2D">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - BAY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Sxy-gk-WGt" userLabel="Mobile Banking - BAY">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - BAY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Sxy-gk-WGt" userLabel="Mobile Banking - BAY">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -781,13 +764,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="XkB-Jf-ZZi" style="IBUITableViewCellStyleDefault" id="aad-ON-p2Y" userLabel="Mobile BankingKTB Payment Cell">
-                                        <rect key="frame" x="0.0" y="1816" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1772.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="aad-ON-p2Y" id="21y-hx-0hz">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - KTB" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XkB-Jf-ZZi" userLabel="Mobile Banking - KTB">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - KTB" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XkB-Jf-ZZi" userLabel="Mobile Banking - KTB">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -798,13 +781,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="VoJ-UZ-DAl" style="IBUITableViewCellStyleDefault" id="w5B-PQ-EFM" userLabel="Mobile BankingBBL Payment Cell">
-                                        <rect key="frame" x="0.0" y="1859.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1816" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="w5B-PQ-EFM" id="69N-z4-DDV">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - BBL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VoJ-UZ-DAl" userLabel="Mobile Banking - BBL">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - BBL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VoJ-UZ-DAl" userLabel="Mobile Banking - BBL">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -815,13 +798,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="8bh-Ak-evA" style="IBUITableViewCellStyleDefault" id="H5a-2l-Q46" userLabel="Mobile BankingKBank Payment Cell">
-                                        <rect key="frame" x="0.0" y="1903" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1859.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="H5a-2l-Q46" id="Hkk-gT-zXW">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - KBank" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8bh-Ak-evA">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - KBank" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8bh-Ak-evA">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -832,13 +815,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Kt3-Rg-azs" style="IBUITableViewCellStyleDefault" id="3j3-aC-zYL">
-                                        <rect key="frame" x="0.0" y="1946.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1903" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3j3-aC-zYL" id="gSR-Mf-91P">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - SCB" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Kt3-Rg-azs">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Mobile Banking - SCB" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Kt3-Rg-azs">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -849,13 +832,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="p6k-BR-eXt" style="IBUITableViewCellStyleDefault" id="nsj-zP-Xij" userLabel="FPX Payment Cell">
-                                        <rect key="frame" x="0.0" y="1990" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1946.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nsj-zP-Xij" id="aXw-Ju-3pO">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="FPX" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="p6k-BR-eXt">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="FPX" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="p6k-BR-eXt">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -866,13 +849,13 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="w5b-OO-9nN" style="IBUITableViewCellStyleDefault" id="a6J-5c-ZRo" userLabel="Rabbit Line Pay Payment Cell">
-                                        <rect key="frame" x="0.0" y="2033.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="1990" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a6J-5c-ZRo" id="NLW-lU-44p">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Rabbit LINE Pay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="w5b-OO-9nN">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Rabbit LINE Pay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="w5b-OO-9nN">
                                                     <rect key="frame" x="8" y="0.0" width="398" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -883,7 +866,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="5Gd-jF-4TS" style="IBUITableViewCellStyleDefault" id="9lf-Mp-Agd" userLabel="OCBC Digital Payment Cell">
-                                        <rect key="frame" x="0.0" y="2077" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2033.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9lf-Mp-Agd" id="cm5-pJ-lyT">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -900,7 +883,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="3B9-Pb-8iH" style="IBUITableViewCellStyleDefault" id="5YI-09-ukf" userLabel="GrabPay Payment Cell">
-                                        <rect key="frame" x="0.0" y="2120.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2077" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5YI-09-ukf" id="pcv-3A-eki">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -917,7 +900,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="yMm-6L-WyW" style="IBUITableViewCellStyleDefault" id="RVV-m8-OQX" userLabel="Boost Payment Cell">
-                                        <rect key="frame" x="0.0" y="2164" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2120.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="RVV-m8-OQX" id="FmC-o9-ow3">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -934,7 +917,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="HQ5-ca-ZJY" style="IBUITableViewCellStyleDefault" id="vLV-i8-CUC" userLabel="ShopeePay Payment Cell">
-                                        <rect key="frame" x="0.0" y="2207.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2164" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vLV-i8-CUC" id="swa-rY-T6f">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -951,7 +934,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="wPw-Gw-KMW" style="IBUITableViewCellStyleDefault" id="gt3-2W-CDg" userLabel="Maybank QRPay Payment Cell">
-                                        <rect key="frame" x="0.0" y="2251" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2207.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="gt3-2W-CDg" id="lWW-gz-Uwg">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -968,7 +951,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="1aB-c6-KEc" style="IBUITableViewCellStyleDefault" id="gtO-Wg-j9m" userLabel="DuitNow QR Payment Cell">
-                                        <rect key="frame" x="0.0" y="2294.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2251" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="gtO-Wg-j9m" id="E1h-4C-Rmu">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -985,7 +968,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="2lL-53-rp7" style="IBUITableViewCellStyleDefault" id="cY7-Jc-ACe" userLabel="DuitNow OBW Payment Cell">
-                                        <rect key="frame" x="0.0" y="2338" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2294.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cY7-Jc-ACe" id="75m-WH-usx">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -1002,7 +985,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="eME-ZB-M7h" style="IBUITableViewCellStyleDefault" id="mR1-Ir-o0j" userLabel="PayPay Payment Cell">
-                                        <rect key="frame" x="0.0" y="2381.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2338" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mR1-Ir-o0j" id="JXK-3S-Fau">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -1019,7 +1002,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="wQi-5k-ode" style="IBUITableViewCellStyleDefault" id="gVk-pg-sWK">
-                                        <rect key="frame" x="0.0" y="2425" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2381.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="gVk-pg-sWK" id="X7S-3C-zBd">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -1036,7 +1019,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="J6s-Yu-Oyu" style="IBUITableViewCellStyleDefault" id="FdW-Ao-Vph">
-                                        <rect key="frame" x="0.0" y="2468.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2425" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FdW-Ao-Vph" id="zDH-ZK-krO">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -1053,7 +1036,7 @@ You can see the code in the ExampleApp.</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="juW-4D-AaW" style="IBUITableViewCellStyleDefault" id="9A9-dk-Jsm">
-                                        <rect key="frame" x="0.0" y="2512" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="2468.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9A9-dk-Jsm" id="2eW-Nx-rgy">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -1128,7 +1111,6 @@ You can see the code in the ExampleApp.</string>
                         <outlet property="myrCurrencyCell" destination="lxl-4L-74h" id="P3t-hj-KyD"/>
                         <outlet property="payPayPaymentCell" destination="mR1-Ir-o0j" id="VJ9-ny-w5I"/>
                         <outlet property="paynowPaymentCell" destination="wvG-o9-5Gh" id="pyK-wk-dMT"/>
-                        <outlet property="pointsCitiCell" destination="bRK-Ye-kiB" id="dMQ-hY-VLa"/>
                         <outlet property="promptpayPaymentCell" destination="U9s-UF-rSk" id="PoF-ou-CKy"/>
                         <outlet property="rabbitLinepayCell" destination="a6J-5c-ZRo" id="Abd-pi-Bbq"/>
                         <outlet property="sgdCurrencyCell" destination="cTx-rP-PCR" id="w16-VE-Ly1"/>
@@ -1206,7 +1188,7 @@ You can see the code in the ExampleApp.</string>
             <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="secondarySystemBackgroundColor">
-            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/ExampleApp/Views/PaymentSettingTableViewController.swift b/ExampleApp/Views/PaymentSettingTableViewController.swift
index e8a9319d..c7acaac5 100644
--- a/ExampleApp/Views/PaymentSettingTableViewController.swift
+++ b/ExampleApp/Views/PaymentSettingTableViewController.swift
@@ -121,7 +121,6 @@ class PaymentSettingTableViewController: UITableViewController {
     @IBOutlet private var paynowPaymentCell: UITableViewCell!
     @IBOutlet private var truemoneyPaymentCell: UITableViewCell!
     @IBOutlet private var truemoneyJumpAppPaymentCell: UITableViewCell!
-    @IBOutlet private var pointsCitiCell: UITableViewCell!
     @IBOutlet private var fpxCell: UITableViewCell!
     @IBOutlet private var rabbitLinepayCell: UITableViewCell!
     @IBOutlet private var OCBCDigitalPaymentCell: UITableViewCell!
@@ -347,8 +346,6 @@ extension PaymentSettingTableViewController {
             return .trueMoneyWallet
         case truemoneyJumpAppPaymentCell:
             return .trueMoneyJumpApp
-        case pointsCitiCell:
-            return .pointsCiti
         case fpxCell:
             return .fpx
         case rabbitLinepayCell:
@@ -443,8 +440,6 @@ extension PaymentSettingTableViewController {
             return truemoneyPaymentCell
         case .trueMoneyJumpApp:
             return truemoneyJumpAppPaymentCell
-        case .pointsCiti:
-            return pointsCitiCell
         case .fpx:
             return fpxCell
         case .rabbitLinepay:
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Collections.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Collections.swift
index 165c00b8..90f1c528 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Collections.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Collections.swift
@@ -22,7 +22,6 @@ extension SourceType {
         .installmentUOB,
         .promptPay,
         .trueMoneyWallet,
-        .pointsCiti,
         .shopeePayJumpApp
     ]
 
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
index 4985486f..c9e31b4a 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
@@ -75,8 +75,6 @@ public enum SourceType: String, Codable, CaseIterable {
     case payNow = "paynow"
     /// PayPay  https://docs.opn.ooo/paypay
     case payPay = "paypay"
-    /// Pay with Points https://docs.opn.ooo/pay-with-points
-    case pointsCiti = "points_citi"
     /// PromptPay   https://docs.opn.ooo/promptpay
     case promptPay = "promptpay"
     /// Rabbit LINE Pay https://docs.opn.ooo/rabbit-linepay
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift
index b209b36e..9183a50e 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
@@ -88,8 +88,6 @@ extension SourceType: ViewPresentable {
             return "PayNow"
         case .payPay:
             return "PayPay"
-        case .pointsCiti:
-            return "Pay with Citi Rewards Points"
         case .promptPay:
             return "PromptPay"
         case .rabbitLinepay:
@@ -185,8 +183,6 @@ extension SourceType: ViewPresentable {
             return "PayNow"
         case .payPay:
             return "PayPay"
-        case .pointsCiti:
-            return "CitiBank"
         case .promptPay:
             return "PromptPay"
         case .rabbitLinepay:
diff --git a/OmiseSDKTests/PaymentChooserViewControllerTests.swift b/OmiseSDKTests/PaymentChooserViewControllerTests.swift
index 93f28d30..f5deb0d8 100644
--- a/OmiseSDKTests/PaymentChooserViewControllerTests.swift
+++ b/OmiseSDKTests/PaymentChooserViewControllerTests.swift
@@ -34,7 +34,6 @@ class PaymentChooserViewControllerTests: XCTestCase {
         .touchNGoAlipayPlus,
         .trueMoneyWallet,
         .trueMoneyJumpApp,
-        .pointsCiti,
         .fpx,
         .mobileBankingKBank,
         .rabbitLinepay,

From 0ed8ce39701b08433a2d5c0a678e95edd8b2b8ef Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Mon, 22 Apr 2024 11:31:25 +0700
Subject: [PATCH 02/19] White-label installment KTC was added

---
 .../Views/ProductDetailViewController.swift   | 15 ++++++++
 .../Resources/en.lproj/Localizable.strings    |  1 +
 .../Resources/ja.lproj/Localizable.strings    |  1 +
 .../Resources/th.lproj/Localizable.strings    |  1 +
 .../Sources/ChoosePaymentMethodDelegate.swift | 10 +++++
 .../Source/Source.Payment.Installment.swift   |  2 +-
 .../SourceType/SourceType+Installments.swift  | 10 +++++
 .../OmiseAPI/SourceType/SourceType.swift      |  2 +
 OmiseSDK/Sources/OmiseSDK.swift               | 20 ----------
 .../ChoosePaymentCoordinator+Helpers.swift    | 30 +++++++++++++++
 .../ChoosePaymentCoordinator.swift            | 37 +++++++++++++++----
 .../SelectDuitNowOBWBankViewModel.swift       |  0
 .../SelectFPXBankViewModel.swift              |  0
 .../SelectInstallmentTermsViewModel.swift     |  0
 .../SelectPaymentMethodViewModel.swift        |  0
 .../SelectSourceTypePaymentViewModel.swift    |  0
 .../SourceType+ViewPresentable.swift          |  4 +-
 .../CreditCardPaymentDelegate.swift           |  2 +-
 .../CreditCardPaymentViewModel.swift          | 15 ++++++--
 dev.xcodeproj/project.pbxproj                 | 22 ++++++++---
 20 files changed, 133 insertions(+), 39 deletions(-)
 create mode 100644 OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift
 rename OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/{ => ViewModels}/SelectDuitNowOBWBankViewModel.swift (100%)
 rename OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/{ => ViewModels}/SelectFPXBankViewModel.swift (100%)
 rename OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/{ => ViewModels}/SelectInstallmentTermsViewModel.swift (100%)
 rename OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/{ => ViewModels}/SelectPaymentMethodViewModel.swift (100%)
 rename OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/{ => ViewModels}/SelectSourceTypePaymentViewModel.swift (100%)

diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
index 0c2e9d27..6714ed95 100644
--- a/ExampleApp/Views/ProductDetailViewController.swift
+++ b/ExampleApp/Views/ProductDetailViewController.swift
@@ -124,6 +124,21 @@ extension ProductDetailViewController: ChoosePaymentMethodDelegate {
     func choosePaymentMethodDidCancel() {
         omiseSDK.dismiss()
     }
+
+    func choosePaymentMethodDidComplete(with whiteLabelInstallmentSource: Source, token: Token) {
+        print("White-label installment payment Token is created with id '\(token.id)', Source id: '\(whiteLabelInstallmentSource.id)'")
+        omiseSDK.dismiss {
+            let alertController = UIAlertController(
+                title: "Token & Source Created",
+                message: "A token with id of \(token.id) and source with id of \(whiteLabelInstallmentSource.id) was successfully created. Please send this id to server to create a charge.",
+                preferredStyle: .alert
+            )
+            let okAction = UIAlertAction(title: "OK", style: .cancel, handler: nil)
+            alertController.addAction(okAction)
+            self.present(alertController, animated: true, completion: nil)
+        }
+
+    }
 }
 
 // MARK: - Custom Credit Card Form View Controller Delegate
diff --git a/OmiseSDK/Resources/en.lproj/Localizable.strings b/OmiseSDK/Resources/en.lproj/Localizable.strings
index 17ca2666..c7ac4e4d 100644
--- a/OmiseSDK/Resources/en.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/en.lproj/Localizable.strings
@@ -20,6 +20,7 @@
 "SourceType.installment_scb" = "Siam Commercial Bank";
 "SourceType.installment_ttb" = "TMBThanachart Bank";
 "SourceType.installment_uob" = "United Overseas Bank";
+"SourceType.installment_wlb_ktc" = "KTC";
 "SourceType.internet_banking_bay" = "Bank of Ayudhya";
 "SourceType.internet_banking_bbl" = "Bangkok Bank";
 "SourceType.paynow" = "PayNow";
diff --git a/OmiseSDK/Resources/ja.lproj/Localizable.strings b/OmiseSDK/Resources/ja.lproj/Localizable.strings
index d9980345..ec0913eb 100644
--- a/OmiseSDK/Resources/ja.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/ja.lproj/Localizable.strings
@@ -20,6 +20,7 @@
 "SourceType.installment_scb" = "サイアム・コマーシャル銀行";
 "SourceType.installment_ttb" = "TMBタナチャート銀行";
 "SourceType.installment_uob" = "ユナイテッド・オーバーシーズ銀行";
+"SourceType.installment_wlb_ktc" = "クルンタイカード";
 "SourceType.internet_banking_bay" = "アユタヤ銀行";
 "SourceType.internet_banking_bbl" = "バンコク銀行";
 "SourceType.paynow" = "PayNow";
diff --git a/OmiseSDK/Resources/th.lproj/Localizable.strings b/OmiseSDK/Resources/th.lproj/Localizable.strings
index dd24bd49..54efcc61 100644
--- a/OmiseSDK/Resources/th.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/th.lproj/Localizable.strings
@@ -20,6 +20,7 @@
 "SourceType.installment_scb" = "ธนาคารไทยพาณิชย์";
 "SourceType.installment_ttb" = "ธนาคารทีเอ็มบีธนชาต";
 "SourceType.installment_uob" = "ธนาคารยูโอบี";
+"SourceType.installment_wlb_ktc" = "เคทีซี";
 "SourceType.internet_banking_bay" = "ธนาคารกรุงศรีอยุธยา";
 "SourceType.internet_banking_bbl" = "ธนาคารกรุงเทพ";
 "SourceType.paynow" = "เพย์นาว";
diff --git a/OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift b/OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift
new file mode 100644
index 00000000..624a755d
--- /dev/null
+++ b/OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift
@@ -0,0 +1,10 @@
+import Foundation
+
+/// Omise Payment delegate protocol is required to process payment results
+public protocol ChoosePaymentMethodDelegate: AnyObject {
+    func choosePaymentMethodDidComplete(with source: Source)
+    func choosePaymentMethodDidComplete(with token: Token)
+    func choosePaymentMethodDidComplete(with whiteLabelInstallmentSource: Source, token: Token)
+    func choosePaymentMethodDidComplete(with error: Error)
+    func choosePaymentMethodDidCancel()
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift
index 91ba0a5c..9d6035da 100644
--- a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
@@ -50,7 +50,7 @@ extension Source.Payment.Installment {
             return [ 4, 6, 8, 9, 10 ]
         case .installmentMBB:
             return [ 6, 12, 18, 24 ]
-        case .installmentKTC:
+        case .installmentKTC, .installmentWhiteLabelKTC:
             return [ 3, 4, 5, 6, 7, 8, 9, 10 ]
         case .installmentKBank:
             return [ 3, 4, 6, 10 ]
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
index 74e3e886..2e64b15e 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
@@ -12,10 +12,20 @@ extension SourceType {
             .installmentSCB,
             .installmentTTB,
             .installmentUOB
+        ] + whiteLabelInstallments
+    }
+
+    public static var whiteLabelInstallments: [SourceType] {
+        [
+            .installmentWhiteLabelKTC
         ]
     }
 
     var isInstallment: Bool {
         Self.installments.contains(self)
     }
+
+    var isWhiteLabelInstallment: Bool {
+        Self.whiteLabelInstallments.contains(self)
+    }
 }
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
index 4985486f..a710d063 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
@@ -50,6 +50,8 @@ public enum SourceType: String, Codable, CaseIterable {
     case installmentTTB = "installment_ttb"
     /// United Overseas Bank (UOB)   https://docs.opn.ooo/installment-payments
     case installmentUOB = "installment_uob"
+    /// Krungthai Card (KTC)  https://docs.opn.ooo/installment-white-label-payments
+    case installmentWhiteLabelKTC = "installment_wlb_ktc"
     /// Bank of Ayudhya (Krungsri)   https://docs.opn.ooo/internet-banking
     case internetBankingBAY = "internet_banking_bay"
     /// Bangkok Bank   https://docs.opn.ooo/internet-banking
diff --git a/OmiseSDK/Sources/OmiseSDK.swift b/OmiseSDK/Sources/OmiseSDK.swift
index 63d80edd..c070f75e 100644
--- a/OmiseSDK/Sources/OmiseSDK.swift
+++ b/OmiseSDK/Sources/OmiseSDK.swift
@@ -1,26 +1,6 @@
 import Foundation
 import UIKit
 
-/// Omise Payment delegate protocol is required to process payment results
-public protocol ChoosePaymentMethodDelegate: AnyObject {
-    func choosePaymentMethodDidComplete(with source: Source)
-    func choosePaymentMethodDidComplete(with token: Token)
-    func choosePaymentMethodDidComplete(with error: Error)
-    func choosePaymentMethodDidCancel()
-}
-
-/// Payment Results
-public enum PaymentResult {
-    /// Payment completed with Card payment and contains Token object
-    case token(Token)
-    /// Payment completed with Source payment and contains Source object
-    case source(Source)
-    /// Payment completed with Error
-    case error(Error)
-    /// Payment was cancelled by user
-    case cancel
-}
-
 public class OmiseSDK {
     /// Static container that allows to assign a shared instance of OmiseSDK to be used as a Singleton object
     public static var shared = OmiseSDK(publicKey: "pkey_")
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift
index 7b667a60..8a1c8dfe 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift	
@@ -64,6 +64,36 @@ extension ChoosePaymentCoordinator {
             completion()
         }
     }
+
+    func processWhiteLabelInstallmentPayment(_ payment: Source.Payment, card: CreateTokenPayload.Card, completion: @escaping () -> Void) {
+
+        guard let delegate = choosePaymentMethodDelegate else { return }
+        let sourcePayload = CreateSourcePayload(
+            amount: amount,
+            currency: currency,
+            details: payment
+        )
+
+        let tokenPayload = CreateTokenPayload(card: card)
+
+        client.createSource(payload: sourcePayload) { [weak self, weak delegate, tokenPayload] result in
+            guard let self = self else { return }
+            switch result {
+            case .failure(let error):
+                self.processError(error)
+            case .success(let source):
+                self.client.createToken(payload: tokenPayload) { [weak self, weak delegate] result in
+                    switch result {
+                    case .success(let token):
+                        delegate?.choosePaymentMethodDidComplete(with: source, token: token)
+                    case .failure(let error):
+                        self?.processError(error)
+                    }
+                    completion()
+                }
+            }
+        }
+    }
 }
 
 extension ChoosePaymentCoordinator {
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift
index 72ccc8e8..0959bf50 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
@@ -69,8 +69,8 @@ class ChoosePaymentCoordinator: NSObject, ViewAttachable {
     }
 
     /// Creates Credit Carc Payment screen and attach current flow object inside created controller to be deallocated together
-    func createCreditCardPaymentController() -> CreditCardPaymentController {
-        let viewModel = CreditCardPaymentViewModel(currentCountry: currentCountry, delegate: self)
+    func createCreditCardPaymentController(paymentType: CreditCardPaymentOption = .card) -> CreditCardPaymentController {
+        let viewModel = CreditCardPaymentViewModel(currentCountry: currentCountry, paymentType: paymentType, delegate: self)
         let viewController = CreditCardPaymentController(nibName: nil, bundle: .omiseSDK)
         viewController.viewModel = viewModel
         viewController.title = PaymentMethod.creditCard.localizedTitle
@@ -105,10 +105,16 @@ class ChoosePaymentCoordinator: NSObject, ViewAttachable {
 
     /// Creates Installement screen and attach current flow object inside created controller to be deallocated together
     func createInstallmentController() -> SelectPaymentController {
-        let sourceTypes = client.latestLoadedCapability?.availableSourceTypes(SourceType.installments)
+        var sourceTypes = client.latestLoadedCapability?.availableSourceTypes(SourceType.installments) ?? []
+
+        // Remove .installmentKTC if .installmentWhiteLabelKTC is present
+        if sourceTypes.contains(.installmentWhiteLabelKTC) {
+            sourceTypes.removeAll { $0 == .installmentKTC }
+        }
+
         let viewModel = SelectSourceTypePaymentViewModel(
             title: PaymentMethod.installment.localizedTitle,
-            sourceTypes: sourceTypes ?? [],
+            sourceTypes: sourceTypes,
             delegate: self
         )
 
@@ -191,10 +197,19 @@ extension ChoosePaymentCoordinator: FPXPaymentFormControllerDelegate {
 }
 
 extension ChoosePaymentCoordinator: CreditCardPaymentDelegate {
-    func didSelectCardPayment(_ card: CreateTokenPayload.Card, completion: @escaping () -> Void) {
-        processPayment(card, completion: completion)
+    func didSelectCardPayment(
+        paymentType: CreditCardPaymentOption,
+        card: CreateTokenPayload.Card,
+        completion: @escaping () -> Void
+    ) {
+        switch paymentType {
+        case .card:
+            processPayment(card, completion: completion)
+        case .whiteLabelInstallment(let payment):
+            processWhiteLabelInstallmentPayment(payment, card: card, completion: completion)
+        }
     }
-
+    
     func didCancelCardPayment() {
         didCancelPayment()
     }
@@ -249,6 +264,12 @@ extension ChoosePaymentCoordinator: SelectSourceTypeDelegate {
 
 extension ChoosePaymentCoordinator: SelectSourcePaymentDelegate {
     func didSelectSourcePayment(_ payment: Source.Payment, completion: @escaping () -> Void) {
-        processPayment(payment, completion: completion)
+        if payment.sourceType.isWhiteLabelInstallment {
+            navigate(to: createCreditCardPaymentController(
+                paymentType: .whiteLabelInstallment(payment: payment)
+            ))
+        } else {
+            processPayment(payment, completion: completion)
+        }
     }
 }
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectDuitNowOBWBankViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectDuitNowOBWBankViewModel.swift
similarity index 100%
rename from OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectDuitNowOBWBankViewModel.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectDuitNowOBWBankViewModel.swift
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectFPXBankViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectFPXBankViewModel.swift
similarity index 100%
rename from OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectFPXBankViewModel.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectFPXBankViewModel.swift
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectInstallmentTermsViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectInstallmentTermsViewModel.swift
similarity index 100%
rename from OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectInstallmentTermsViewModel.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectInstallmentTermsViewModel.swift
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentMethodViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectPaymentMethodViewModel.swift
similarity index 100%
rename from OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentMethodViewModel.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectPaymentMethodViewModel.swift
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectSourceTypePaymentViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectSourceTypePaymentViewModel.swift
similarity index 100%
rename from OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectSourceTypePaymentViewModel.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectSourceTypePaymentViewModel.swift
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift
index b209b36e..5cc92f51 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
@@ -64,6 +64,8 @@ extension SourceType: ViewPresentable {
             return "TMBThanachart Bank"
         case .installmentUOB:
             return "United Overseas Bank"
+        case .installmentWhiteLabelKTC:
+            return "Krungthai Card (KTC)"
         case .internetBankingBAY:
             return "Bank of Ayudhya"
         case .internetBankingBBL:
@@ -151,7 +153,7 @@ extension SourceType: ViewPresentable {
             return "First Choice"
         case .installmentKBank:
             return "KBANK"
-        case .installmentKTC:
+        case .installmentKTC, .installmentWhiteLabelKTC:
             return "KTC"
         case .installmentMBB:
             return "FPX/maybank"
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentDelegate.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentDelegate.swift
index f05ef430..36f3f54e 100644
--- a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentDelegate.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentDelegate.swift	
@@ -1,6 +1,6 @@
 import Foundation
 
 protocol CreditCardPaymentDelegate: AnyObject {
-    func didSelectCardPayment(_ card: CreateTokenPayload.Card, completion: @escaping () -> Void)
+    func didSelectCardPayment(paymentType: CreditCardPaymentOption, card: CreateTokenPayload.Card, completion: @escaping () -> Void)
     func didCancelCardPayment()
 }
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModel.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModel.swift
index e1613ca0..78ab2a36 100644
--- a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModel.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModel.swift	
@@ -1,9 +1,17 @@
 import Foundation
 import os.log
 
+enum CreditCardPaymentOption {
+    case card
+    case whiteLabelInstallment(payment: Source.Payment)
+}
+
 class CreditCardPaymentViewModel: CreditCardPaymentViewModelProtocol, CountryListViewModelProtocol {
+
+    let paymentType: CreditCardPaymentOption
+
     var addressFields: [AddressField] = [.address, .city, .state, .postalCode]
-    
+
     var fieldForShippingAddressHeader: AddressField?
 
     var isAddressFieldsVisible: Bool {
@@ -18,9 +26,10 @@ class CreditCardPaymentViewModel: CreditCardPaymentViewModelProtocol, CountryLis
 
     private weak var delegate: CreditCardPaymentDelegate?
 
-    init(currentCountry: Country?, delegate: CreditCardPaymentDelegate?) {
+    init(currentCountry: Country?, paymentType: CreditCardPaymentOption, delegate: CreditCardPaymentDelegate?) {
         self.delegate = delegate
         self.selectedCountry = currentCountry
+        self.paymentType = paymentType
     }
 
     // MARK: CountryListViewModelProtocol
@@ -62,6 +71,6 @@ class CreditCardPaymentViewModel: CreditCardPaymentViewModelProtocol, CountryLis
             postalCode: viewContext[.postalCode]
         )
 
-        delegate?.didSelectCardPayment(card, completion: completion)
+        delegate?.didSelectCardPayment(paymentType: paymentType, card: card, completion: completion)
     }
 }
diff --git a/dev.xcodeproj/project.pbxproj b/dev.xcodeproj/project.pbxproj
index 97b51833..b873a4e1 100644
--- a/dev.xcodeproj/project.pbxproj
+++ b/dev.xcodeproj/project.pbxproj
@@ -87,6 +87,7 @@
 		756C8F262A40698600D53059 /* TextFieldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756C8F252A40698600D53059 /* TextFieldView.swift */; };
 		757B0A742AD71E3100DEAE8F /* OmiseUnitTestKit in Frameworks */ = {isa = PBXBuildFile; productRef = 757B0A732AD71E3100DEAE8F /* OmiseUnitTestKit */; };
 		757B0A752AD71E3100DEAE8F /* OmiseUnitTestKit in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 757B0A732AD71E3100DEAE8F /* OmiseUnitTestKit */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		757E14352BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757E14342BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift */; };
 		7588011E2BAAB37C00F02934 /* AppDeeplink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7588011D2BAAB37C00F02934 /* AppDeeplink.swift */; };
 		758801202BAAC70200F02934 /* URL+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7588011F2BAAC70200F02934 /* URL+Helpers.swift */; };
 		759856242A286C880087B605 /* UIScrollView+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759856232A286C880087B605 /* UIScrollView+Helpers.swift */; };
@@ -335,6 +336,7 @@
 		756C8F252A40698600D53059 /* TextFieldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldView.swift; sourceTree = "<group>"; };
 		757B0A712AD71D7B00DEAE8F /* OmiseSwiftUIKit */ = {isa = PBXFileReference; lastKnownFileType = text; name = OmiseSwiftUIKit; path = Helpers/OmiseSwiftUIKit; sourceTree = SOURCE_ROOT; };
 		757B0A722AD71DCD00DEAE8F /* OmiseUnitTestKit */ = {isa = PBXFileReference; lastKnownFileType = text; name = OmiseUnitTestKit; path = Helpers/OmiseUnitTestKit; sourceTree = SOURCE_ROOT; };
+		757E14342BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChoosePaymentMethodDelegate.swift; sourceTree = "<group>"; };
 		7588011D2BAAB37C00F02934 /* AppDeeplink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDeeplink.swift; sourceTree = "<group>"; };
 		7588011F2BAAC70200F02934 /* URL+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Helpers.swift"; sourceTree = "<group>"; };
 		759856232A286C880087B605 /* UIScrollView+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIScrollView+Helpers.swift"; sourceTree = "<group>"; };
@@ -693,6 +695,18 @@
 			path = "UI Extensions";
 			sourceTree = "<group>";
 		};
+		757E14332BD61DBB005F08AD /* ViewModels */ = {
+			isa = PBXGroup;
+			children = (
+				75D13DC02B8400610073A831 /* SelectPaymentMethodViewModel.swift */,
+				75D13DC82B8529790073A831 /* SelectSourceTypePaymentViewModel.swift */,
+				75D13DCC2B8536B10073A831 /* SelectInstallmentTermsViewModel.swift */,
+				7501266F2B8A490000ED5E14 /* SelectFPXBankViewModel.swift */,
+				750126732B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift */,
+			);
+			path = ViewModels;
+			sourceTree = "<group>";
+		};
 		75CFC4EF2B753AB900422A8F /* JSON Models */ = {
 			isa = PBXGroup;
 			children = (
@@ -857,13 +871,9 @@
 		75D13DF62B866C650073A831 /* Select Payment From Lists */ = {
 			isa = PBXGroup;
 			children = (
+				757E14332BD61DBB005F08AD /* ViewModels */,
 				75D13DDC2B8658660073A831 /* SelectPaymentPresentableProtocol.swift */,
 				75D13DBA2B83FB470073A831 /* SelectPaymentController.swift */,
-				75D13DC02B8400610073A831 /* SelectPaymentMethodViewModel.swift */,
-				75D13DC82B8529790073A831 /* SelectSourceTypePaymentViewModel.swift */,
-				75D13DCC2B8536B10073A831 /* SelectInstallmentTermsViewModel.swift */,
-				7501266F2B8A490000ED5E14 /* SelectFPXBankViewModel.swift */,
-				750126732B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift */,
 			);
 			path = "Select Payment From Lists";
 			sourceTree = "<group>";
@@ -972,6 +982,7 @@
 				75E0EBBF2B7D13D200E3198A /* OmiseAPI */,
 				75D13DEE2B866BCA0073A831 /* Views */,
 				75CFC4D12B73AFD500422A8F /* OmiseSDK.swift */,
+				757E14342BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift */,
 				755CD9222BA2000600E8FCDA /* ClientProtocol.swift */,
 			);
 			path = Sources;
@@ -1441,6 +1452,7 @@
 				75CFC4DD2B73F75C00422A8F /* OmiseAPI.swift in Sources */,
 				75348D4E29C3FCC70008C8A3 /* Bundle+OmiseSDK.swift in Sources */,
 				755CD9232BA2000600E8FCDA /* ClientProtocol.swift in Sources */,
+				757E14352BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift in Sources */,
 				75E0EB9D2B7BD00F00E3198A /* CardBrand.swift in Sources */,
 				75E0EB9A2B7BD00F00E3198A /* Currency.swift in Sources */,
 				75405A9C2A266F50008C21F6 /* AtomePaymentFormViewModel.swift in Sources */,

From e43588a01ca161bb78194b2d4ce172ef7c153eb6 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Mon, 22 Apr 2024 11:42:51 +0700
Subject: [PATCH 03/19] Customize accessory icon for Whilte-label installment
 terms screen

---
 ExampleApp.xcodeproj/project.pbxproj              |  2 +-
 .../xcshareddata/swiftpm/Package.resolved         |  4 ++--
 .../Source/Source.Payment.Installment.swift       | 15 ---------------
 .../JSON Models/Source/Source.Payment.swift       |  4 ++--
 .../SelectInstallmentTermsViewModel.swift         |  9 +++++++--
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/ExampleApp.xcodeproj/project.pbxproj b/ExampleApp.xcodeproj/project.pbxproj
index 3d42284b..9a83a935 100644
--- a/ExampleApp.xcodeproj/project.pbxproj
+++ b/ExampleApp.xcodeproj/project.pbxproj
@@ -457,7 +457,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/omise/omise-ios.git";
 			requirement = {
-				branch = feature/v5_refactoring;
+				branch = "feature/MIT-1904";
 				kind = branch;
 			};
 		};
diff --git a/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 7df1b24a..ebb6ef4b 100644
--- a/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/omise/omise-ios.git",
       "state" : {
-        "branch" : "feature/v5_refactoring",
-        "revision" : "a59269f3d734ebc17d8e717b5c03b17d5d67a679"
+        "branch" : "feature/MIT-1904",
+        "revision" : "0ed8ce39701b08433a2d5c0a678e95edd8b2b8ef"
       }
     }
   ],
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift
index 9d6035da..7e9ab986 100644
--- a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
@@ -24,21 +24,6 @@ extension Source.Payment.Installment: Codable {
 }
 
 extension Source.Payment.Installment {
-    /// List of sourceTypes belongs to Installment payment type
-    public static var sourceTypes: [SourceType] {
-        [
-            .installmentBAY,
-            .installmentBBL,
-            .installmentFirstChoice,
-            .installmentKBank,
-            .installmentKTC,
-            .installmentMBB,
-            .installmentSCB,
-            .installmentTTB,
-            .installmentUOB
-        ]
-    }
-
     /// Available Installments terms (months) for given sourceType
     public static func availableTerms(for sourceType: SourceType) -> [Int] {
         switch sourceType {
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.swift
index 1e7eda3c..08ac90f7 100644
--- a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.swift	
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.swift	
@@ -87,7 +87,7 @@ extension Source.Payment: Codable {
             self = try .trueMoneyWallet(TrueMoneyWallet(from: decoder))
         case FPX.sourceType:
             self = try .fpx(FPX(from: decoder))
-        case _ where Installment.sourceTypes.contains(sourceType):
+        case _ where sourceType.isInstallment:
             self = try .installment(Installment(from: decoder))
         default:
             self = .sourceType(sourceType)
@@ -104,7 +104,7 @@ extension Source.Payment {
             EContext.sourceType,
             TrueMoneyWallet.sourceType,
             FPX.sourceType
-        ] + Installment.sourceTypes
+        ] + SourceType.installments
 
         return requiresDetails.contains(sourceType)
     }
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectInstallmentTermsViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectInstallmentTermsViewModel.swift
index eaeda240..156f2fe7 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectInstallmentTermsViewModel.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/ViewModels/SelectInstallmentTermsViewModel.swift	
@@ -39,10 +39,11 @@ extension SelectInstallmentTermsViewModel: SelectPaymentPresentableProtocol {
     func viewContext(at index: Int) -> TableCellContext? {
         guard let value = values.at(index) else { return nil }
         let numberOfTermsTitleFormat = localized("installments.number-of-terms.text", "%d months")
+        let accessoryIcon = sourceType.isWhiteLabelInstallment ? Assets.Icon.next : Assets.Icon.redirect
         return TableCellContext(
             title: String.localizedStringWithFormat(numberOfTermsTitleFormat, value),
             icon: nil,
-            accessoryIcon: UIImage(Assets.Icon.redirect)
+            accessoryIcon: UIImage(accessoryIcon)
         )
     }
 
@@ -57,6 +58,10 @@ extension SelectInstallmentTermsViewModel: SelectPaymentPresentableProtocol {
     }
 
     func viewShouldAnimateSelectedCell(at index: Int) -> Bool {
-        true
+        if sourceType.isWhiteLabelInstallment {
+            return false
+        } else {
+            return true
+        }
     }
 }

From 2f430836a0c86330e7cf04dd55e4a7063fd1635d Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Thu, 2 May 2024 15:40:43 +0700
Subject: [PATCH 04/19] Clean up ChoosePaymentMethodDelegate param names

---
 ExampleApp/Views/ProductDetailViewController.swift | 6 +++---
 OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
index 6714ed95..c2938aa3 100644
--- a/ExampleApp/Views/ProductDetailViewController.swift
+++ b/ExampleApp/Views/ProductDetailViewController.swift
@@ -125,12 +125,12 @@ extension ProductDetailViewController: ChoosePaymentMethodDelegate {
         omiseSDK.dismiss()
     }
 
-    func choosePaymentMethodDidComplete(with whiteLabelInstallmentSource: Source, token: Token) {
-        print("White-label installment payment Token is created with id '\(token.id)', Source id: '\(whiteLabelInstallmentSource.id)'")
+    func choosePaymentMethodDidComplete(with source: Source, token: Token) {
+        print("White-label installment payment Token is created with id '\(token.id)', Source id: '\(source.id)'")
         omiseSDK.dismiss {
             let alertController = UIAlertController(
                 title: "Token & Source Created",
-                message: "A token with id of \(token.id) and source with id of \(whiteLabelInstallmentSource.id) was successfully created. Please send this id to server to create a charge.",
+                message: "A token with id of \(token.id) and source with id of \(source.id) was successfully created. Please send this id to server to create a charge.",
                 preferredStyle: .alert
             )
             let okAction = UIAlertAction(title: "OK", style: .cancel, handler: nil)
diff --git a/OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift b/OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift
index 624a755d..03cd504b 100644
--- a/OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift
+++ b/OmiseSDK/Sources/ChoosePaymentMethodDelegate.swift
@@ -4,7 +4,7 @@ import Foundation
 public protocol ChoosePaymentMethodDelegate: AnyObject {
     func choosePaymentMethodDidComplete(with source: Source)
     func choosePaymentMethodDidComplete(with token: Token)
-    func choosePaymentMethodDidComplete(with whiteLabelInstallmentSource: Source, token: Token)
+    func choosePaymentMethodDidComplete(with source: Source, token: Token)
     func choosePaymentMethodDidComplete(with error: Error)
     func choosePaymentMethodDidCancel()
 }

From 8dc89475480ee4480402ac7c094d74e40742bc60 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Tue, 7 May 2024 11:19:23 +0700
Subject: [PATCH 05/19] Add 3DS Netcetera implementation

---
 ExampleApp/Config.local.plist                 |  17 +-
 .../Views/ProductDetailViewController.swift   |  14 +-
 OmiseSDK/Sources/3DS/Crypto/CryptData.swift   |  98 +++++
 .../Sources/3DS/Crypto/String+PemCert.swift   |  10 +
 .../Sources/3DS/Crypto/String+sha512.swift    |  15 +
 OmiseSDK/Sources/3DS/NetceteraConfig.swift    |  24 ++
 .../3DS/NetceteraThreeDSController.swift      | 376 ++++++++++++++++++
 .../ThreeDSButtonCustomization.swift          |  70 ++++
 .../ThreeDSCustomization.swift                |  70 ++++
 .../ThreeDSLabelCustomization.swift           |  84 ++++
 .../ThreeDSTextBoxCustomization.swift         |  84 ++++
 .../ThreeDSToolbarCustomization.swift         |  84 ++++
 .../ThreeDSUICustomization.swift              |  77 ++++
 .../Sources/AuthorizingPaymentDelegate.swift  |   7 +
 .../OmiseAPI/Helpers/APIProtocol.swift        |   8 +-
 .../OmiseAPI/Helpers/Client+URLRequest.swift  |   8 +-
 .../OmiseAPI/Helpers/NetworkService.swift     |   7 +
 OmiseSDK/Sources/OmiseAPI/OmiseAPI.swift      |  20 +-
 OmiseSDK/Sources/OmiseSDK.swift               | 118 ++++--
 .../ToolKit/Extensions/URL+Helpers.swift      |  26 --
 ...AuthorizingPaymentWebViewController.swift} |  46 +--
 ...> AuthorizingPaymentWebViewController.xib} |   3 +-
 .../CreditCardPaymentController.swift         |   8 +
 .../ToolKit/Extensions/Array+Helpers.swift    |   0
 .../ToolKit/Extensions/Optional+Helpers.swift |   0
 .../ToolKit/Extensions/String+Helpers.swift   |   0
 OmiseSDK/ToolKit/Extensions/URL+Helpers.swift |  85 ++++
 .../Property Wrappers/ProxyProperty.swift     |   0
 OmiseSDK/ToolKit/Typedefs/Closures.swift      |   5 +
 .../UI Extensions/UIButton+Helpers.swift      |   0
 .../UI Extensions/UIColor+Helpers.swift       |   0
 .../UIControl.State+Hashable.swift            |   0
 .../UI Extensions/UIImage+Helpers.swift       |   0
 .../UI Extensions/UILabel+Helpers.swift       |   0
 .../UI Extensions/UIScrollView+Helpers.swift  |   0
 .../UI Extensions/UIStackView+Helpers.swift   |   0
 .../UI Extensions/UIView+Helpers.swift        |   0
 .../3DS/AuthorizingPaymentTests.swift         | 280 +++++++++++++
 .../3DS/NetceteraThreeDSControllerTests.swift |  40 ++
 OmiseSDKTests/3DS/SHA512Tests.swift           |  38 ++
 .../3DS/ThreeDSButtonCustomizationTests.swift |  64 +++
 OmiseSDKTests/3DS/UICustomizationTests.swift  |  29 ++
 OmiseSDKTests/URL+PathComponentsTests.swift   |  28 ++
 README.md                                     |   6 +-
 dev.xcodeproj/project.pbxproj                 | 162 +++++++-
 .../xcshareddata/swiftpm/Package.resolved     |  16 +
 46 files changed, 1913 insertions(+), 114 deletions(-)
 create mode 100644 OmiseSDK/Sources/3DS/Crypto/CryptData.swift
 create mode 100644 OmiseSDK/Sources/3DS/Crypto/String+PemCert.swift
 create mode 100644 OmiseSDK/Sources/3DS/Crypto/String+sha512.swift
 create mode 100644 OmiseSDK/Sources/3DS/NetceteraConfig.swift
 create mode 100644 OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
 create mode 100644 OmiseSDK/Sources/3DS/UICustomization/ThreeDSButtonCustomization.swift
 create mode 100644 OmiseSDK/Sources/3DS/UICustomization/ThreeDSCustomization.swift
 create mode 100644 OmiseSDK/Sources/3DS/UICustomization/ThreeDSLabelCustomization.swift
 create mode 100644 OmiseSDK/Sources/3DS/UICustomization/ThreeDSTextBoxCustomization.swift
 create mode 100644 OmiseSDK/Sources/3DS/UICustomization/ThreeDSToolbarCustomization.swift
 create mode 100644 OmiseSDK/Sources/3DS/UICustomization/ThreeDSUICustomization.swift
 create mode 100644 OmiseSDK/Sources/AuthorizingPaymentDelegate.swift
 delete mode 100644 OmiseSDK/Sources/ToolKit/Extensions/URL+Helpers.swift
 rename OmiseSDK/Sources/Views/Screens/Authorizing Payment/{AuthorizingPaymentViewController.swift => AuthorizingPaymentWebViewController.swift} (84%)
 rename OmiseSDK/Sources/Views/Screens/Authorizing Payment/{AuthorizingPaymentViewController.xib => AuthorizingPaymentWebViewController.xib} (91%)
 rename OmiseSDK/{Sources => }/ToolKit/Extensions/Array+Helpers.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/Extensions/Optional+Helpers.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/Extensions/String+Helpers.swift (100%)
 create mode 100644 OmiseSDK/ToolKit/Extensions/URL+Helpers.swift
 rename OmiseSDK/{Sources => }/ToolKit/Property Wrappers/ProxyProperty.swift (100%)
 create mode 100644 OmiseSDK/ToolKit/Typedefs/Closures.swift
 rename OmiseSDK/{Sources => }/ToolKit/UI Extensions/UIButton+Helpers.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/UI Extensions/UIColor+Helpers.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/UI Extensions/UIControl.State+Hashable.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/UI Extensions/UIImage+Helpers.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/UI Extensions/UILabel+Helpers.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/UI Extensions/UIScrollView+Helpers.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/UI Extensions/UIStackView+Helpers.swift (100%)
 rename OmiseSDK/{Sources => }/ToolKit/UI Extensions/UIView+Helpers.swift (100%)
 create mode 100644 OmiseSDKTests/3DS/AuthorizingPaymentTests.swift
 create mode 100644 OmiseSDKTests/3DS/NetceteraThreeDSControllerTests.swift
 create mode 100644 OmiseSDKTests/3DS/SHA512Tests.swift
 create mode 100644 OmiseSDKTests/3DS/ThreeDSButtonCustomizationTests.swift
 create mode 100644 OmiseSDKTests/3DS/UICustomizationTests.swift
 create mode 100644 OmiseSDKTests/URL+PathComponentsTests.swift
 create mode 100644 dev.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

diff --git a/ExampleApp/Config.local.plist b/ExampleApp/Config.local.plist
index db08d795..c8c0b8ee 100644
--- a/ExampleApp/Config.local.plist
+++ b/ExampleApp/Config.local.plist
@@ -3,10 +3,21 @@
 <plist version="1.0">
 <dict>
 	<key>publicKey</key>
-	<string>pkey_</string>
+	<string>pkey_5unb23qvo9l4x3onvym</string>
+	<key>devMode</key>
+	<true/>
 	<key>devVaultBaseURL</key>
-	<string></string>
+	<string>https://vault.staging-omise.co</string>
 	<key>devApiBaseURL</key>
-	<string></string>
+	<string>https://api.staging-omise.co</string>
+	<key>pk_anna</key>
+	<string>pkey_5unb23qvo9l4x3onvym</string>
+	<key>PKeys</key>
+	<dict>
+		<key>pkey_5unb23qvo9l4x3onvym</key>
+		<string>skey_5ushbvxvvcvkrfd2cnw</string>
+	</dict>
+	<key>netceteraAPIKey</key>
+	<string>9a607320-f11d-43ed-abb0-41a1557522cd</string>
 </dict>
 </plist>
diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
index c2938aa3..4c707374 100644
--- a/ExampleApp/Views/ProductDetailViewController.swift
+++ b/ExampleApp/Views/ProductDetailViewController.swift
@@ -56,12 +56,11 @@ class ProductDetailViewController: BaseViewController {
                   let text = textField.text,
                   let url = URL(string: text) else { return }
 
-            let deeplinkRedirectURLPattern = AppDeeplink.threeDSChallenge.urlString
-            let webRedirectURLPattern = "https://exampleapp.opn.ooo"
             self.omiseSDK.presentAuthorizingPayment(
                 from: self,
                 authorizeURL: url,
-                returnURLs: [deeplinkRedirectURLPattern, webRedirectURLPattern],
+                expectedReturnURLPatterns: ["https://omise.co"],
+                threeDSRequestorAppURLString: AppDeeplink.threeDSChallenge.urlString,
                 delegate: self
             )
         })
@@ -71,13 +70,12 @@ class ProductDetailViewController: BaseViewController {
 
 // MARK: - Authorizing Payment View Controller Delegate
 
-extension ProductDetailViewController: AuthorizingPaymentViewControllerDelegate {
-    func authorizingPaymentViewController(_ viewController: AuthorizingPaymentViewController, didCompleteAuthorizingPaymentWithRedirectedURL redirectedURL: URL) {
-        print("Payment is authorized with redirect url `\(redirectedURL)`")
+extension ProductDetailViewController: AuthorizingPaymentDelegate {
+    func authorizingPaymentDidComplete(with redirectedURL: URL?) {
+        print("Payment is authorized with redirect url `\(String(describing: redirectedURL))`")
         omiseSDK.dismiss()
     }
-    
-    func authorizingPaymentViewControllerDidCancel(_ viewController: AuthorizingPaymentViewController) {
+    func authorizingPaymentDidCancel() {
         omiseSDK.dismiss()
     }
 }
diff --git a/OmiseSDK/Sources/3DS/Crypto/CryptData.swift b/OmiseSDK/Sources/3DS/Crypto/CryptData.swift
new file mode 100644
index 00000000..bac2cadb
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/Crypto/CryptData.swift
@@ -0,0 +1,98 @@
+import Foundation
+import CommonCrypto
+
+enum CryptoError: Error {
+    case invalidKeyLength
+    case creationError(Int)
+    case updateError(Int)
+    case finalError(Int)
+}
+
+// swiftlint:disable:next function_parameter_count function_body_length
+func cryptData(
+    _ dataIn: Data,
+    operation: CCOperation, // kCCEncrypt, kCCDecrypt
+    mode: CCMode,          // kCCModeECB, kCCModeCBC, etc.
+    algorithm: CCAlgorithm, // kCCAlgorithmAES, kCCAlgorithmDES, etc.
+    padding: CCPadding,     // ccNoPadding, ccPKCS7Padding
+    keyLength: size_t,
+    iv: Data?,
+    key: Data
+) throws -> Data {
+    guard key.count == keyLength else {
+        throw CryptoError.invalidKeyLength
+    }
+
+    var cryptor: CCCryptorRef?
+    var status = CCCryptorCreateWithMode(operation,
+                                         mode,
+                                         algorithm,
+                                         padding,
+                                         iv?.withUnsafeBytes { $0.baseAddress },
+                                         key.withUnsafeBytes { $0.baseAddress },
+                                         keyLength,
+                                         nil,
+                                         0,
+                                         0,  // tweak XTS mode, numRounds
+                                         0,  // CCModeOptions
+                                         &cryptor)
+
+    if status != kCCSuccess {
+        throw CryptoError.creationError(Int(status))
+    }
+
+    guard let cryptor = cryptor else {
+        throw CryptoError.creationError(Int(status))
+    }
+
+    defer {
+        CCCryptorRelease(cryptor)
+    }
+
+    let dataOutLength = CCCryptorGetOutputLength(cryptor, dataIn.count, true)
+    var dataOut = Data(count: dataOutLength)
+    var dataOutMoved = 0
+
+    status = dataOut.withUnsafeMutableBytes { dataOutPointer in
+        dataIn.withUnsafeBytes { dataInPointer -> CCCryptorStatus in
+            guard let dataInPointerBaseAddress = dataInPointer.baseAddress,
+                  let dataOutPointerBaseAddress = dataOutPointer.baseAddress else {
+                return Int32(kCCParamError)
+            }
+            return CCCryptorUpdate(
+                cryptor,
+                dataInPointerBaseAddress,
+                dataIn.count,
+                dataOutPointerBaseAddress,
+                dataOutLength,
+                &dataOutMoved
+            )
+        }
+    }
+
+    if status != kCCSuccess {
+        throw CryptoError.updateError(Int(status))
+    }
+
+    var dataOutMovedFinal = 0
+    status = dataOut.withUnsafeMutableBytes { dataOutPointer in
+        guard let dataOutPointerBaseAddress = dataOutPointer.baseAddress else {
+            return Int32(kCCParamError)
+        }
+
+        return CCCryptorFinal(
+            cryptor,
+            dataOutPointerBaseAddress.advanced(by: dataOutMoved),
+            dataOutLength - dataOutMoved,
+            &dataOutMovedFinal
+        )
+    }
+
+    if status != kCCSuccess {
+        throw CryptoError.finalError(Int(status))
+    }
+
+    dataOut.count = dataOutMoved + dataOutMovedFinal
+
+    return dataOut
+}
diff --git a/OmiseSDK/Sources/3DS/Crypto/String+PemCert.swift b/OmiseSDK/Sources/3DS/Crypto/String+PemCert.swift
new file mode 100644
index 00000000..e65eb7d1
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/Crypto/String+PemCert.swift
@@ -0,0 +1,10 @@
+import Foundation
+
+extension String {
+    var pemCertificate: String {
+        self
+            .replacingOccurrences(of: "-----BEGIN CERTIFICATE-----", with: "")
+            .replacingOccurrences(of: "-----END CERTIFICATE-----", with: "")
+            .replacingOccurrences(of: "\r\n", with: "")
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/Crypto/String+sha512.swift b/OmiseSDK/Sources/3DS/Crypto/String+sha512.swift
new file mode 100644
index 00000000..6f569661
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/Crypto/String+sha512.swift
@@ -0,0 +1,15 @@
+import Foundation
+import CommonCrypto
+
+extension String {
+    public var sha512: Data {
+        let data = Data(self.utf8)
+        var hash = [UInt8](repeating: 0, count: Int(CC_SHA512_DIGEST_LENGTH))
+
+        data.withUnsafeBytes {
+            _ = CC_SHA512($0.baseAddress, CC_LONG(data.count), &hash)
+        }
+
+        return Data(hash)
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/NetceteraConfig.swift b/OmiseSDK/Sources/3DS/NetceteraConfig.swift
new file mode 100644
index 00000000..7fd6460a
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/NetceteraConfig.swift
@@ -0,0 +1,24 @@
+import Foundation
+
+public struct NetceteraConfig {
+    public let id: String
+    public let deviceInfoEncryptionAlg: String
+    public let deviceInfoEncryptionEnc: String
+    public let deviceInfoEncryptionCertPem: String
+    public let directoryServerId: String
+    public let key: String
+    public let messageVersion: String
+}
+
+extension NetceteraConfig: Decodable {
+    /// Mapping keys to encode/decode JSON string
+    private enum CodingKeys: String, CodingKey {
+        case id = "identifier"
+        case deviceInfoEncryptionAlg = "device_info_encryption_alg"
+        case deviceInfoEncryptionEnc = "device_info_encryption_enc"
+        case deviceInfoEncryptionCertPem = "device_info_encryption_cert_pem"
+        case directoryServerId = "directory_server_id"
+        case key
+        case messageVersion = "message_version"
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift b/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
new file mode 100644
index 00000000..01f70a1b
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
@@ -0,0 +1,376 @@
+import Foundation
+import ThreeDS_SDK
+import CommonCrypto
+
+struct AuthResponse: Codable {
+    var serverStatus: String
+    var ares: ARes?
+
+    private enum CodingKeys: String, CodingKey {
+        case serverStatus = "status"
+        case ares
+    }
+
+    enum Status {
+        case challenge
+        case failed
+        case success
+        case unknown
+    }
+
+    struct ARes: Codable {
+        var threeDSServerTransID: String
+        var acsTransID: String
+        var acsSignedContent: String?
+        var acsUIType: String?
+        var acsReferenceNumber: String?
+    }
+
+    var status: Status {
+        switch serverStatus {
+        case "success": return .success
+        case "challenge": return .challenge
+        case "failed": return .failed
+        default: return .unknown
+        }
+    }
+}
+
+protocol NetceteraThreeDSControllerProtocol: AnyObject {
+    typealias NetceteraThreeDSControllerResult = Result<Void, Error>
+    func appOpen3DSDeeplinkURL(_ url: URL) -> Bool
+    func processAuthorizedURL(
+        _ authorizeUrl: URL,
+        threeDSRequestorAppURL: String?,
+        uiCustomization: ThreeDSUICustomization?,
+        in viewController: UIViewController,
+        onComplete: @escaping (NetceteraThreeDSControllerResult) -> Void
+    )
+}
+
+class NetceteraThreeDSController {
+
+    enum Errors: Error {
+        case configInvalid
+        case apiKeyInvalid
+        case cancelled
+        case timedout
+        case presentChallenge(error: Error)
+        case protocolError(event: ThreeDS_SDK.ProtocolErrorEvent?)
+        case runtimeError(event: ThreeDS_SDK.RuntimeErrorEvent?)
+        case incomplete(event: ThreeDS_SDK.CompletionEvent?)
+
+        case authResInvalid
+        case authResStatusFailed
+        case authResStatusUnknown(_ status: String)
+    }
+
+    static var sharedController: NetceteraThreeDSControllerProtocol = NetceteraThreeDSController()
+    private static var uiCustomization: ThreeDSUICustomization?
+
+    private var network = NetworkService()
+    private var challengeParameters: ChallengeParameters?
+    private var receiver: OmiseChallengeStatusReceiver?
+    private var transaction: Transaction?
+
+    private func newScheme(config: NetceteraConfig) -> Scheme? {
+        let formattedCert = config.deviceInfoEncryptionCertPem.pemCertificate
+
+        let scheme = Scheme(name: config.id)
+        scheme.ids = [config.directoryServerId]
+        scheme.encryptionKeyValue = formattedCert
+        scheme.rootCertificateValues = [formattedCert]
+        return scheme
+    }
+
+func apiKey(config: NetceteraConfig) throws -> String {
+        let decryptionKey = config.directoryServerId.sha512.subdata(in: 0..<32)
+
+        guard let ciphertext = Data(base64Encoded: config.key) else {
+            throw Errors.configInvalid
+        }
+
+        let iv = ciphertext.subdata(in: 0..<16)
+        let ciphertextWithoutIV = ciphertext.subdata(in: 16..<ciphertext.count)
+
+        let encrypted = try cryptData(
+            ciphertextWithoutIV,
+            operation: CCOperation(kCCDecrypt),
+            mode: CCMode(kCCModeCTR),
+            algorithm: CCAlgorithm(kCCAlgorithmAES),
+            padding: CCPadding(ccNoPadding),
+            keyLength: kCCKeySizeAES256,
+            iv: iv,
+            key: decryptionKey
+        )
+
+        if let apiKey = String(data: encrypted, encoding: .utf8) {
+            return apiKey
+        } else {
+            throw Errors.apiKeyInvalid
+        }
+    }
+
+    func newService(config: NetceteraConfig) -> ThreeDS2ServiceSDK {
+        let threeDS2Service = ThreeDS2ServiceSDK()
+
+        let configBuilder = ConfigurationBuilder()
+        do {
+            if let scheme = self.newScheme(config: config) {
+                try configBuilder.add(scheme)
+            } else {
+                print("Scheme wasn't created")
+            }
+            let apiKey = try apiKey(config: config)
+            try configBuilder.api(key: apiKey)
+            try configBuilder.log(to: .info)
+            let configParameters = configBuilder.configParameters()
+
+            var netceteraUICustomization: UiCustomization?
+            if let uiCustomization = Self.uiCustomization {
+                netceteraUICustomization = try UiCustomization(uiCustomization)
+            }
+
+            try threeDS2Service.initialize(configParameters,
+                                           locale: nil,
+                                           uiCustomization: netceteraUICustomization)
+
+        } catch {
+            print(error)
+        }
+
+        return threeDS2Service
+    }
+}
+
+extension NetceteraThreeDSController: NetceteraThreeDSControllerProtocol {
+    public func appOpen3DSDeeplinkURL(_ url: URL) -> Bool {
+        ThreeDSSDKAppDelegate.shared.appOpened(url: url)
+    }
+
+    // swiftlint:disable:next function_body_length
+    func processAuthorizedURL(
+        _ authorizeUrl: URL,
+        threeDSRequestorAppURL: String?,
+        uiCustomization: ThreeDSUICustomization?,
+        in viewController: UIViewController,
+        onComplete: @escaping ((Result<Void, Error>) -> Void)
+    ) {
+        if let uiCustomization = uiCustomization {
+            Self.uiCustomization = uiCustomization
+        }
+
+        // swiftlint:disable:next closure_body_length
+        netceteraConfig(authUrl: authorizeUrl) { [weak self] result in
+            guard let self = self else { return }
+
+            switch result {
+            case .failure(let error):
+                onComplete(.failure(error))
+            case .success(let config):
+                do {
+                    let threeDS2Service = self.newService(config: config)
+                    let transaction = try threeDS2Service.createTransaction(
+                        directoryServerId: config.directoryServerId,
+                        messageVersion: config.messageVersion
+                    )
+                    
+                    let deviceInfo = try transaction.getAuthenticationRequestParameters().getDeviceData()
+
+                    try self.sendAuthenticationRequest(
+                        deviceInfo: deviceInfo,
+                        transaction: transaction,
+                        authorizeUrl: authorizeUrl) { response in
+                            guard let response = response else {
+                                onComplete(.failure(NetceteraThreeDSController.Errors.authResInvalid))
+                                return
+                            }
+
+                            switch response.status {
+                            case .success:
+                                onComplete(.success(()))
+                                return
+                            case .failed:
+                                onComplete(.failure(NetceteraThreeDSController.Errors.authResStatusFailed))
+                                return
+                            case .unknown:
+                                onComplete(.failure(NetceteraThreeDSController.Errors.authResStatusUnknown(response.serverStatus)))
+                                return
+                            case .challenge:
+                                break
+                            }
+
+                            DispatchQueue.main.async {
+                                do {
+                                    try self.presentChallenge(
+                                        authResponse: response,
+                                        threeDSRequestorAppURL: threeDSRequestorAppURL,
+                                        transaction: transaction,
+                                        from: viewController,
+                                        onComplete: onComplete
+                                    )
+                                } catch {
+                                    onComplete(.failure(error))
+                                }
+                            }
+                    }
+                } catch {
+                    onComplete(.failure(error))
+                }
+            }
+        }
+    }
+
+    func prepareChallengeParameters(
+        aRes: AuthResponse.ARes,
+        threeDSRequestorAppURL: String?
+    ) -> ChallengeParameters {
+        let serverTransactionID = aRes.threeDSServerTransID
+        let acsTransactionID = aRes.acsTransID
+        let acsSignedContent = aRes.acsSignedContent
+        let acsRefNumber = aRes.acsReferenceNumber
+
+        let challengeParameters = ChallengeParameters(
+            threeDSServerTransactionID: serverTransactionID,
+            acsTransactionID: acsTransactionID,
+            acsRefNumber: acsRefNumber,
+            acsSignedContent: acsSignedContent)
+
+        if let appUrl = updateAppURLString(threeDSRequestorAppURL, transactionID: serverTransactionID) {
+            challengeParameters.setThreeDSRequestorAppURL(threeDSRequestorAppURL: appUrl)
+        }
+
+        return challengeParameters
+    }
+}
+
+private extension NetceteraThreeDSController {
+    func sendAuthenticationRequest(deviceInfo: String, transaction: Transaction, authorizeUrl: URL, onAuthResponse: @escaping (AuthResponse?) -> Void ) throws {
+        let authParams = try transaction.getAuthenticationRequestParameters()
+        let body =
+"""
+            {
+              "areq": {
+                "sdkAppID": "\(authParams.getSDKAppID())",
+                "sdkEphemPubKey": \(authParams.getSDKEphemeralPublicKey()),
+                "sdkMaxTimeout": 5,
+                "sdkTransID": "\(authParams.getSDKTransactionId())"
+              },
+              "encrypted_device_info": "\(deviceInfo)",
+              "device_type": "iOS"
+            }
+"""
+        let bodyData = body.trimmingCharacters(in: .whitespacesAndNewlines).data(using: .utf8)
+
+        var request = URLRequest(url: authorizeUrl)
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.httpMethod = "POST"
+        request.httpBody = bodyData
+
+        let task = URLSession.shared.dataTask(with: request) {(data, _, error) in
+            guard let data = data else {
+                onAuthResponse(nil)
+                return
+            }
+
+            do {
+                let decoder = JSONDecoder()
+                let response = try decoder.decode(AuthResponse.self, from: data)
+                print(response)
+                onAuthResponse(response)
+
+            } catch {
+                onAuthResponse(nil)
+                print(error)
+            }
+
+        }
+
+        task.resume()
+    }
+
+    func presentChallenge(
+        authResponse: AuthResponse,
+        threeDSRequestorAppURL: String?,
+        transaction: Transaction,
+        from viewController: UIViewController,
+        onComplete: @escaping ((Result<Void, Error>) -> Void)
+    ) throws {
+        guard let aRes = authResponse.ares else { return }
+
+        let receiver = OmiseChallengeStatusReceiver()
+        receiver.onComplete = onComplete
+
+        let challengeParameters = prepareChallengeParameters(
+            aRes: aRes,
+            threeDSRequestorAppURL: threeDSRequestorAppURL
+        )
+
+        self.receiver = receiver
+        self.transaction = transaction
+        self.challengeParameters = challengeParameters
+
+        do {
+            try transaction.doChallenge(
+                challengeParameters: challengeParameters,
+                challengeStatusReceiver: receiver,
+                timeOut: 5,
+                inViewController: viewController
+            )
+        } catch {
+            onComplete(.failure(NetceteraThreeDSController.Errors.presentChallenge(error: error)))
+        }
+    }
+
+    func updateAppURLString(_ urlString: String?, transactionID: String) -> String? {
+        guard let urlString = urlString, let url = URL(string: urlString) else {
+            return nil
+        }
+
+        return url.appendQueryItem(name: "transID", value: transactionID)?.absoluteString
+    }
+}
+
+class OmiseChallengeStatusReceiver: ChallengeStatusReceiver {
+    var onComplete: ((Result<Void, Error>) -> Void)?
+
+    func completed(completionEvent: ThreeDS_SDK.CompletionEvent) {
+        if completionEvent.getTransactionStatus() == "Y" {
+            onComplete?(.success(()))
+        } else {
+            onComplete?(.failure(NetceteraThreeDSController.Errors.incomplete(event: completionEvent)))
+        }
+    }
+
+    func cancelled() {
+        onComplete?(.failure(NetceteraThreeDSController.Errors.cancelled))
+    }
+
+    func timedout() {
+        onComplete?(.failure(NetceteraThreeDSController.Errors.timedout))
+    }
+
+    func protocolError(protocolErrorEvent: ThreeDS_SDK.ProtocolErrorEvent) {
+        onComplete?(.failure(NetceteraThreeDSController.Errors.protocolError(event: protocolErrorEvent)))
+    }
+
+    func runtimeError(runtimeErrorEvent: ThreeDS_SDK.RuntimeErrorEvent) {
+        onComplete?(.failure(NetceteraThreeDSController.Errors.runtimeError(event: runtimeErrorEvent)))
+    }
+}
+
+extension NetceteraThreeDSController {
+    func netceteraConfig(authUrl: URL, completion: @escaping (Result<NetceteraConfig, Error>) -> Void) {
+        let api = OmiseAPI.netceteraConfig(baseUrl: authUrl.removeLastPathComponent)
+        var urlRequest = URLRequest(url: api.url)
+        urlRequest.httpMethod = api.method.rawValue
+        urlRequest.setValue(ContentType.json.rawValue, forHTTPHeaderField: HTTPHeaders.contentType.rawValue)
+        
+        network.send(
+            urlRequest: urlRequest,
+            dateFormatter: api.dateFormatter,
+            completion: completion
+        )
+
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/UICustomization/ThreeDSButtonCustomization.swift b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSButtonCustomization.swift
new file mode 100644
index 00000000..367227c1
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSButtonCustomization.swift
@@ -0,0 +1,70 @@
+import Foundation
+import ThreeDS_SDK
+
+public class ThreeDSButtonCustomization: ThreeDSCustomization {
+    /// Background color of the button in Hex format.
+    public var backgroundColorHex: String?
+
+    /// Dark background color of the button in Hex format.
+    public var darkBackgroundColorHex: String?
+
+    /// Radius of the button corners.
+    public var cornerRadius: Int?
+
+    public init(
+        backgroundColorHex: String? = nil,
+        darkBackgroundColorHex: String? = nil,
+        cornerRadius: Int? = nil,
+        textFontName: String? = nil,
+        textColorHex: String? = nil,
+        darkTextColorHex: String? = nil,
+        textFontSize: Int? = nil
+    ) {
+        super.init(textFontName: textFontName,
+                   textColorHex: textColorHex,
+                   darkTextColorHex: darkTextColorHex,
+                   textFontSize: textFontSize)
+        self.backgroundColorHex = backgroundColorHex
+        self.darkBackgroundColorHex = darkBackgroundColorHex
+        self.cornerRadius = cornerRadius
+    }
+
+    @discardableResult
+    public func backgroundColorHex(_ backgroundColorHex: String?) -> Self {
+        self.backgroundColorHex = backgroundColorHex
+        return self
+    }
+    @discardableResult
+    public func darkBackgroundColorHex(_ darkBackgroundColorHex: String?) -> Self {
+        self.darkBackgroundColorHex = darkBackgroundColorHex
+        return self
+    }
+    @discardableResult
+    public func cornerRadius(_ cornerRadius: Int?) -> Self {
+        self.cornerRadius = cornerRadius
+        return self
+    }
+}
+
+extension ThreeDS_SDK.ButtonCustomization {
+    convenience init(_ custom: ThreeDSButtonCustomization) throws {
+        self.init()
+        try customize(custom)
+    }
+
+    func customize(_ custom: ThreeDSButtonCustomization) throws {
+        try customize(omiseThreeDSCustomization: custom)
+
+        if let backgroundColorHex = custom.backgroundColorHex {
+            try setBackgroundColor(hexColorCode: backgroundColorHex)
+        }
+
+        if let darkBackgroundColorHex = custom.darkBackgroundColorHex {
+            try setDarkBackgroundColor(hexColorCode: darkBackgroundColorHex)
+        }
+
+        if let cornerRadius = custom.cornerRadius {
+            try setCornerRadius(cornerRadius: cornerRadius)
+        }
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/UICustomization/ThreeDSCustomization.swift b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSCustomization.swift
new file mode 100644
index 00000000..d45c92c8
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSCustomization.swift
@@ -0,0 +1,70 @@
+import Foundation
+import ThreeDS_SDK
+
+public class ThreeDSCustomization {
+    /// Text font name.
+    public var textFontName: String?
+
+    /// Text color in Hex format.
+    public var textColorHex: String?
+
+    /// Dark text color in Hex format.
+    public var darkTextColorHex: String?
+
+    /// Text font size.
+    public var textFontSize: Int?
+
+    public init(
+        textFontName: String? = nil,
+        textColorHex: String? = nil,
+        darkTextColorHex: String? = nil,
+        textFontSize: Int? = nil
+    ) {
+        self.textFontName = textFontName
+        self.textColorHex = textColorHex
+        self.darkTextColorHex = darkTextColorHex
+        self.textFontSize = textFontSize
+    }
+
+    @discardableResult
+    public func textFontName(_ textFontName: String?) -> Self {
+        self.textFontName = textFontName
+        return self
+    }
+    
+    @discardableResult
+    public func textColorHex(_ textColorHex: String?) -> Self {
+        self.textColorHex = textColorHex
+        return self
+    }
+    @discardableResult
+    public func darkTextColorHex(_ darkTextColorHex: String?) -> Self {
+        self.darkTextColorHex = darkTextColorHex
+        return self
+    }
+    @discardableResult
+    public func textFontSize(_ textFontSize: Int?) -> Self {
+        self.textFontSize = textFontSize
+        return self
+    }
+}
+
+extension ThreeDS_SDK.Customization {
+    func customize(omiseThreeDSCustomization custom: ThreeDSCustomization) throws {
+        if let textFontName = custom.textFontName {
+            try setTextFontName(fontName: textFontName)
+        }
+
+        if let textColorHex = custom.textColorHex {
+            try setTextColor(hexColorCode: textColorHex)
+        }
+
+        if let darkTextColorHex = custom.darkTextColorHex {
+            try setDarkTextColor(hexColorCode: darkTextColorHex)
+        }
+
+        if let textFontSize = custom.textFontSize {
+            try setTextFontSize(fontSize: textFontSize)
+        }
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/UICustomization/ThreeDSLabelCustomization.swift b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSLabelCustomization.swift
new file mode 100644
index 00000000..a2cca41e
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSLabelCustomization.swift
@@ -0,0 +1,84 @@
+import Foundation
+import ThreeDS_SDK
+
+public class ThreeDSLabelCustomization: ThreeDSCustomization {
+    /// Color of the heading label text in Hex format.
+    public var headingTextColorHex: String?
+
+    /// Dark color of the heading label text in Hex format.
+    public var headingDarkTextColorHex: String?
+
+    /// Font name of the heading label text.
+    public var headingTextFontName: String?
+
+    /// Font size of the heading label text.
+    public var headingTextFontSize: Int?
+
+    public init(
+        headingTextColorHex: String? = nil,
+        headingDarkTextColorHex: String? = nil,
+        headingTextFontName: String? = nil,
+        headingTextFontSize: Int? = nil,
+        textFontName: String? = nil,
+        textColorHex: String? = nil,
+        darkTextColorHex: String? = nil,
+        textFontSize: Int? = nil
+    ) {
+        super.init(textFontName: textFontName,
+                   textColorHex: textColorHex,
+                   darkTextColorHex: darkTextColorHex,
+                   textFontSize: textFontSize)
+        self.headingTextColorHex = headingTextColorHex
+        self.headingDarkTextColorHex = headingDarkTextColorHex
+        self.headingTextFontName = headingTextFontName
+        self.headingTextFontSize = headingTextFontSize
+    }
+
+    @discardableResult
+    public func headingTextColorHex(_ headingTextColorHex: String?) -> Self {
+        self.headingTextColorHex = headingTextColorHex
+        return self
+    }
+    @discardableResult
+    public func headingDarkTextColorHex(_ headingDarkTextColorHex: String?) -> Self {
+        self.headingDarkTextColorHex = headingDarkTextColorHex
+        return self
+    }
+    @discardableResult
+    public func headingTextFontName(_ headingTextFontName: String?) -> Self {
+        self.headingTextFontName = headingTextFontName
+        return self
+    }
+    @discardableResult
+    public func headingTextFontSize(_ headingTextFontSize: Int?) -> Self {
+        self.headingTextFontSize = headingTextFontSize
+        return self
+    }
+}
+
+extension ThreeDS_SDK.LabelCustomization {
+    convenience init(_ custom: ThreeDSLabelCustomization) throws {
+        self.init()
+        try customize(custom)
+    }
+
+    func customize(_ custom: ThreeDSLabelCustomization) throws {
+        try customize(omiseThreeDSCustomization: custom)
+
+        if let headingTextColorHex = custom.headingTextColorHex {
+            try setHeadingTextColor(hexColorCode: headingTextColorHex)
+        }
+
+        if let headingDarkTextColorHex = custom.headingDarkTextColorHex {
+            try setHeadingDarkTextColor(hexColorCode: headingDarkTextColorHex)
+        }
+
+        if let headingTextFontName = custom.headingTextFontName {
+            try setHeadingTextFontName(fontName: headingTextFontName)
+        }
+
+        if let headingTextFontSize = custom.headingTextFontSize {
+            try setHeadingTextFontSize(fontSize: headingTextFontSize)
+        }
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/UICustomization/ThreeDSTextBoxCustomization.swift b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSTextBoxCustomization.swift
new file mode 100644
index 00000000..1805986e
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSTextBoxCustomization.swift
@@ -0,0 +1,84 @@
+import Foundation
+import ThreeDS_SDK
+
+public class ThreeDSTextBoxCustomization: ThreeDSCustomization {
+    /// Width of the text box border.
+    public var borderWidth: Int?
+
+    /// Color of the text box border in Hex format.
+    public var borderColorHex: String?
+
+    /// Dark color of the text box border in Hex format.
+    public var darkBorderColorHex: String?
+
+    /// Corner radius of the text box corners.
+    public var cornerRadius: Int?
+
+    public init(
+        borderWidth: Int? = nil,
+        borderColorHex: String? = nil,
+        darkBorderColorHex: String? = nil,
+        cornerRadius: Int? = nil,
+        textFontName: String? = nil,
+        textColorHex: String? = nil,
+        darkTextColorHex: String? = nil,
+        textFontSize: Int? = nil
+    ) {
+        super.init(textFontName: textFontName,
+                   textColorHex: textColorHex,
+                   darkTextColorHex: darkTextColorHex,
+                   textFontSize: textFontSize)
+        self.borderWidth = borderWidth
+        self.borderColorHex = borderColorHex
+        self.darkBorderColorHex = darkBorderColorHex
+        self.cornerRadius = cornerRadius
+    }
+
+    @discardableResult
+    public func borderColorHex(_ borderColorHex: String?) -> Self {
+        self.borderColorHex = borderColorHex
+        return self
+    }
+    @discardableResult
+    public func darkBorderColorHex(_ darkBorderColorHex: String?) -> Self {
+        self.darkBorderColorHex = darkBorderColorHex
+        return self
+    }
+    @discardableResult
+    public func cornerRadius(_ cornerRadius: Int?) -> Self {
+        self.cornerRadius = cornerRadius
+        return self
+    }
+    @discardableResult
+    public func borderWidth(_ borderWidth: Int?) -> Self {
+        self.borderWidth = borderWidth
+        return self
+    }
+}
+
+extension ThreeDS_SDK.TextBoxCustomization {
+    convenience init(_ custom: ThreeDSTextBoxCustomization) throws {
+        self.init()
+        try customize(custom)
+    }
+
+    func customize(_ custom: ThreeDSTextBoxCustomization) throws {
+        try customize(omiseThreeDSCustomization: custom)
+
+        if let borderWidth = custom.borderWidth {
+            try setBorderWidth(borderWidth: borderWidth)
+        }
+
+        if let borderColorHex = custom.borderColorHex {
+            try setBorderColor(hexColorCode: borderColorHex)
+        }
+
+        if let darkBorderColorHex = custom.darkBorderColorHex {
+            try setDarkBorderColor(hexColorCode: darkBorderColorHex)
+        }
+
+        if let textFontSize = custom.textFontSize {
+            try setTextFontSize(fontSize: textFontSize)
+        }
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/UICustomization/ThreeDSToolbarCustomization.swift b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSToolbarCustomization.swift
new file mode 100644
index 00000000..be3c6855
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSToolbarCustomization.swift
@@ -0,0 +1,84 @@
+import Foundation
+import ThreeDS_SDK
+
+public class ThreeDSToolbarCustomization: ThreeDSCustomization {
+    /// Background color for the toolbar in Hex format.
+    public var backgroundColorHex: String?
+
+    /// Dark background color for the toolbar in Hex format.
+    public var darkBackgroundColorHex: String?
+
+    /// Header text of the toolbar.
+    public var headerText: String?
+
+    /// Button text of the toolbar. For example, “Cancel”.
+    public var buttonText: String?
+
+    public init(
+        backgroundColorHex: String? = nil,
+        darkBackgroundColorHex: String? = nil,
+        headerText: String? = nil,
+        buttonText: String? = nil,
+        textFontName: String? = nil,
+        textColorHex: String? = nil,
+        darkTextColorHex: String? = nil,
+        textFontSize: Int? = nil
+    ) {
+        super.init(textFontName: textFontName,
+                   textColorHex: textColorHex,
+                   darkTextColorHex: darkTextColorHex,
+                   textFontSize: textFontSize)
+        self.backgroundColorHex = backgroundColorHex
+        self.darkBackgroundColorHex = darkBackgroundColorHex
+        self.headerText = headerText
+        self.buttonText = buttonText
+    }
+
+    @discardableResult
+    public func backgroundColorHex(_ backgroundColorHex: String?) -> Self {
+        self.backgroundColorHex = backgroundColorHex
+        return self
+    }
+    @discardableResult
+    public func darkBackgroundColorHex(_ darkBackgroundColorHex: String?) -> Self {
+        self.darkBackgroundColorHex = darkBackgroundColorHex
+        return self
+    }
+    @discardableResult
+    public func headerText(_ headerText: String?) -> Self {
+        self.headerText = headerText
+        return self
+    }
+    @discardableResult
+    public func buttonText(_ buttonText: String?) -> Self {
+        self.buttonText = buttonText
+        return self
+    }
+}
+
+extension ThreeDS_SDK.ToolbarCustomization {
+    convenience init(_ custom: ThreeDSToolbarCustomization) throws {
+        self.init()
+        try customize(custom)
+    }
+
+    func customize(_ custom: ThreeDSToolbarCustomization) throws {
+        try customize(omiseThreeDSCustomization: custom)
+
+        if let backgroundColorHex = custom.backgroundColorHex {
+            try setBackgroundColor(hexColorCode: backgroundColorHex)
+        }
+
+        if let darkBackgroundColorHex = custom.darkBackgroundColorHex {
+            try setDarkBackgroundColor(hexColorCode: darkBackgroundColorHex)
+        }
+
+        if let headerText = custom.headerText {
+            try setHeaderText(headerText: headerText)
+        }
+
+        if let buttonText = custom.buttonText {
+            try setButtonText(buttonText: buttonText)
+        }
+    }
+}
diff --git a/OmiseSDK/Sources/3DS/UICustomization/ThreeDSUICustomization.swift b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSUICustomization.swift
new file mode 100644
index 00000000..b02f90c1
--- /dev/null
+++ b/OmiseSDK/Sources/3DS/UICustomization/ThreeDSUICustomization.swift
@@ -0,0 +1,77 @@
+import Foundation
+import ThreeDS_SDK
+
+public class ThreeDSUICustomization {
+
+    public static var shared: ThreeDSUICustomization?
+
+    /// Sets the attributes of a ButtonCustomization object for a particular button type.
+    public var buttonCustomization: [ThreeDS_SDK.UiCustomization.ButtonType: ThreeDSButtonCustomization]?
+
+    /// Sets the attributes of a ButtonCustomization object for an implementer-specific button type.
+    public var buttonCustomizationStrings: [String: ThreeDSButtonCustomization]?
+
+    /// Sets the attributes of a ToolbarCustomization object.
+    public var toolbarCustomization: ThreeDSToolbarCustomization?
+
+    /// Sets the attributes of a LabelCustomization object.
+    public var labelCustomization: ThreeDSLabelCustomization?
+
+    /// Sets the attributes of a TextBoxCustomization object.
+    public var textBoxCustomization: ThreeDSTextBoxCustomization?
+
+    public init(
+        buttonCustomization: [ThreeDS_SDK.UiCustomization.ButtonType: ThreeDSButtonCustomization]? = nil,
+        buttonCustomizationStrings: [String: ThreeDSButtonCustomization]? = nil,
+        toolbarCustomization: ThreeDSToolbarCustomization? = nil,
+        labelCustomization: ThreeDSLabelCustomization? = nil,
+        textBoxCustomization: ThreeDSTextBoxCustomization? = nil
+    ) {
+        self.buttonCustomization = buttonCustomization
+        self.buttonCustomizationStrings = buttonCustomizationStrings
+        self.toolbarCustomization = toolbarCustomization
+        self.labelCustomization = labelCustomization
+        self.textBoxCustomization = textBoxCustomization
+    }
+}
+
+extension ThreeDS_SDK.UiCustomization {
+    convenience init(_ custom: ThreeDSUICustomization) throws {
+        self.init()
+        try customize(custom)
+    }
+
+    func customize(_ custom: ThreeDSUICustomization) throws {
+        if let buttonCustomization = custom.buttonCustomization {
+            for (buttonType, style) in buttonCustomization {
+                let omiseButtonCustomization = try ThreeDS_SDK.ButtonCustomization(style)
+                setButtonCustomization(buttonCustomization: omiseButtonCustomization,
+                                       buttonType: buttonType)
+            }
+        }
+
+        if let buttonCustomization = custom.buttonCustomizationStrings {
+            for (buttonType, style) in buttonCustomization {
+                let omiseButtonCustomization = try ThreeDS_SDK.ButtonCustomization(style)
+                try setButtonCustomization(buttonCustomization: omiseButtonCustomization,
+                                           btnType: buttonType)
+            }
+        }
+
+        if let toolbarCustomization = custom.toolbarCustomization {
+            let omiseToolbarCustomization = try ThreeDS_SDK.ToolbarCustomization(toolbarCustomization)
+            setToolbarCustomization(toolbarCustomization: omiseToolbarCustomization)
+
+        }
+
+        if let labelCustomization = custom.labelCustomization {
+            let omiseLabelCustomization = try ThreeDS_SDK.LabelCustomization(labelCustomization)
+            setLabelCustomization(labelCustomization: omiseLabelCustomization)
+        }
+
+        if let textBoxCustomization = custom.textBoxCustomization {
+            let omiseTextBoxCustomization = try ThreeDS_SDK.TextBoxCustomization(textBoxCustomization)
+            setTextBoxCustomization(textBoxCustomization: omiseTextBoxCustomization)
+        }
+    }
+}
diff --git a/OmiseSDK/Sources/AuthorizingPaymentDelegate.swift b/OmiseSDK/Sources/AuthorizingPaymentDelegate.swift
new file mode 100644
index 00000000..4e8ee967
--- /dev/null
+++ b/OmiseSDK/Sources/AuthorizingPaymentDelegate.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+/// Omise Payment delegate protocol is required to process 3DS authorization
+public protocol AuthorizingPaymentDelegate: AnyObject {
+    func authorizingPaymentDidComplete(with redirectedURL: URL?)
+    func authorizingPaymentDidCancel()
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/Helpers/APIProtocol.swift b/OmiseSDK/Sources/OmiseAPI/Helpers/APIProtocol.swift
index d0226d1c..dc4e65b9 100644
--- a/OmiseSDK/Sources/OmiseAPI/Helpers/APIProtocol.swift
+++ b/OmiseSDK/Sources/OmiseAPI/Helpers/APIProtocol.swift
@@ -19,7 +19,9 @@ enum ContentType: String {
     case json = "application/json; charset=utf8"
 }
 
-enum OmiseServerType {
-    case api
-    case vault
+enum HTTPHeaders: String {
+    case authorization = "Authorization"
+    case userAgent = "User-Agent"
+    case contentType = "Content-Type"
+    case omiseVersion = "Omise-Version"
 }
diff --git a/OmiseSDK/Sources/OmiseAPI/Helpers/Client+URLRequest.swift b/OmiseSDK/Sources/OmiseAPI/Helpers/Client+URLRequest.swift
index c9b2a7ae..8c1c11f9 100644
--- a/OmiseSDK/Sources/OmiseAPI/Helpers/Client+URLRequest.swift
+++ b/OmiseSDK/Sources/OmiseAPI/Helpers/Client+URLRequest.swift
@@ -7,6 +7,7 @@ extension Client {
             switch api.server {
             case .api: return customApiURL
             case .vault: return customVaultURL
+            case .other(let baseURL): return baseURL
             }
         }()
 
@@ -47,13 +48,6 @@ extension Client {
 
 // MARK: HTTP Headers
 extension Client {
-    enum HTTPHeaders: String {
-        case authorization = "Authorization"
-        case userAgent = "User-Agent"
-        case contentType = "Content-Type"
-        case omiseVersion = "Omise-Version"
-    }
-
     func httpHeaders(
         publicKey: String,
         userAgent: String,
diff --git a/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift b/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift
index e464fa7b..50c9aef3 100644
--- a/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift
+++ b/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift
@@ -34,6 +34,13 @@ extension NetworkService: NetworkServiceProtocol {
         let dataTask = session.dataTask(with: urlRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
 
+            print("urlRequest: \(urlRequest)")
+            if let data = data {
+                print("data: \(String(data: data, encoding: .utf8))")
+            }
+            print("response: \(response)")
+            print("error: \(error)")
+
             var result: Result<T, Error>
             if let error = error {
                 result = .failure(error)
diff --git a/OmiseSDK/Sources/OmiseAPI/OmiseAPI.swift b/OmiseSDK/Sources/OmiseAPI/OmiseAPI.swift
index 95d53314..242c72e8 100644
--- a/OmiseSDK/Sources/OmiseAPI/OmiseAPI.swift
+++ b/OmiseSDK/Sources/OmiseAPI/OmiseAPI.swift
@@ -1,14 +1,21 @@
 import Foundation
 
+enum OmiseServerType {
+    case api
+    case vault
+    case other(baseURL: URL)
+}
+
 extension OmiseServerType {
     // swiftlint:disable force_unwrapping
     private var apiServerURL: String { "https://vault.omise.co" }
     private var vaultServerURL: String { "https://vault.omise.co" }
-
+    
     var url: URL {
         switch self {
         case .api: return URL(string: apiServerURL)!
         case .vault: return URL(string: vaultServerURL)!
+        case .other(let url): return url
         }
     }
     // swiftlint:enable force_unwrapping
@@ -19,6 +26,7 @@ enum OmiseAPI {
     case token(tokenID: String)
     case createToken(payload: CreateTokenPayload)
     case createSource(payload: CreateSourcePayload)
+    case netceteraConfig(baseUrl: URL)
 }
 
 extension OmiseAPI: APIProtocol {
@@ -32,6 +40,8 @@ extension OmiseAPI: APIProtocol {
             return .api
         case .token, .createToken:
             return .vault
+        case .netceteraConfig(let baseURL):
+            return .other(baseURL: baseURL)
         }
     }
 
@@ -45,15 +55,23 @@ extension OmiseAPI: APIProtocol {
             return "tokens"
         case .createSource:
             return "sources"
+        case .netceteraConfig:
+            return "config"
         }
     }
 
+    var url: URL {
+        server.url.appendingLastPathComponent(path)
+    }
+    
     var method: HTTPMethod {
         switch self {
         case .capability, .token:
             return .get
         case .createToken, .createSource:
             return .post
+        case .netceteraConfig:
+            return .get
         }
     }
 
diff --git a/OmiseSDK/Sources/OmiseSDK.swift b/OmiseSDK/Sources/OmiseSDK.swift
index c070f75e..50c9d24c 100644
--- a/OmiseSDK/Sources/OmiseSDK.swift
+++ b/OmiseSDK/Sources/OmiseSDK.swift
@@ -24,7 +24,7 @@ public class OmiseSDK {
 
     public private(set) weak var presentedViewController: UIViewController?
 
-    private var handleURLs: [String] = []
+    private var expectedReturnURLPatterns: [String] = []
 
     /// Creates a new instance of Omise SDK that provides interface to functionallity that SDK provides
     ///
@@ -140,40 +140,62 @@ public class OmiseSDK {
     ///    - from: ViewController is used to present Choose Payment Methods
     ///    - animated: Presents controller with animation if `true`
     ///    - authorizeURL: The authorize URL given in `Charge` object
-    ///    - expectedReturnURLPatterns: The expected return URL patterns.
+    ///    - expectedReturnURLPatterns: The expected return URL patterns for web view 3DS.
+    ///    - threeDSRequestorAppURLString: 3DS requestor app URL string (deeplink).
     ///    - delegate: A delegate object that will recieved authorizing payment events.
     @available(iOSApplicationExtension, unavailable)
     public func presentAuthorizingPayment(
         from topViewController: UIViewController,
         animated: Bool = true,
         authorizeURL: URL,
-        returnURLs: [String],
-        delegate: AuthorizingPaymentViewControllerDelegate
+        expectedReturnURLPatterns: [String],
+        threeDSRequestorAppURLString: String?,
+        threeDSUICustomization: ThreeDSUICustomization? = nil,
+        delegate: AuthorizingPaymentDelegate
     ) {
-        dismiss(animated: false)
-
-        handleURLs = returnURLs
-        let returnURLComponents = returnURLs.compactMap {
-            URLComponents(string: $0)
+        guard authorizeURL.absoluteString.contains("acs=true") else {
+            presentWebViewAuthorizingPayment(
+                from: topViewController,
+                animated: animated,
+                authorizeURL: authorizeURL,
+                expectedReturnURLPatterns: expectedReturnURLPatterns,
+                threeDSRequestorAppURLString: threeDSRequestorAppURLString,
+                delegate: delegate
+            )
+            return
         }
 
-        let viewController = AuthorizingPaymentViewController(nibName: nil, bundle: .omiseSDK)
-        viewController.authorizeURL = authorizeURL
-        viewController.expectedReturnURLPatterns = returnURLComponents
-        viewController.delegate = delegate
-        viewController.applyNavigationBarStyle()
-        viewController.title = "AuthorizingPayment.title".localized()
-        
-        let navigationController = UINavigationController(rootViewController: viewController)
-        navigationController.navigationBar.isTranslucent = false
-        navigationController.navigationBar.backgroundColor = .white
-
-        if #available(iOSApplicationExtension 11.0, *) {
-            navigationController.navigationBar.prefersLargeTitles = false
+        NetceteraThreeDSController.sharedController.processAuthorizedURL(
+            authorizeURL,
+            threeDSRequestorAppURL: threeDSRequestorAppURLString,
+            uiCustomization: threeDSUICustomization,
+            in: topViewController) { [weak self] result in
+                switch result {
+                case .success:
+                    delegate.authorizingPaymentDidComplete(with: nil)
+                case .failure(let error):
+                    typealias NetceteraFlowError = NetceteraThreeDSController.Errors
+                    switch error {
+                    case NetceteraFlowError.incomplete,
+                        NetceteraFlowError.cancelled,
+                        NetceteraFlowError.timedout,
+                        NetceteraFlowError.authResStatusFailed,
+                        NetceteraFlowError.authResStatusUnknown:
+                        delegate.authorizingPaymentDidCancel()
+                    default:
+                        DispatchQueue.main.async {
+                            self?.presentWebViewAuthorizingPayment(
+                                from: topViewController,
+                                animated: animated,
+                                authorizeURL: authorizeURL,
+                                expectedReturnURLPatterns: expectedReturnURLPatterns,
+                                threeDSRequestorAppURLString: threeDSRequestorAppURLString,
+                                delegate: delegate
+                            )
+                        }
+                    }
+                }
         }
-
-        topViewController.present(navigationController, animated: animated, completion: nil)
-        presentedViewController = navigationController
     }
 
     /// Dismiss any presented UI form by OmiseSDK
@@ -185,7 +207,7 @@ public class OmiseSDK {
     /// Handle URL Callback received by AppDelegate
     public func handleURLCallback(_ url: URL) -> Bool {
         // Will handle callback with 3ds library
-        let containsURL = handleURLs
+        let containsURL = expectedReturnURLPatterns
             .map {
                 url.match(string: $0)
             }
@@ -200,3 +222,47 @@ private extension OmiseSDK {
         client.capability { _ in }
     }
 }
+
+private extension OmiseSDK {
+    @available(iOSApplicationExtension, unavailable)
+    func presentWebViewAuthorizingPayment(
+        from topViewController: UIViewController,
+        animated: Bool = true,
+        authorizeURL: URL,
+        expectedReturnURLPatterns: [String],
+        threeDSRequestorAppURLString: String?,
+        delegate: AuthorizingPaymentDelegate
+    ) {
+        dismiss(animated: false)
+
+        let viewController = AuthorizingPaymentWebViewController(nibName: nil, bundle: .omiseSDK)
+        viewController.authorizeURL = authorizeURL
+        viewController.expectedReturnURLPatterns = expectedReturnURLPatterns.compactMap {
+            URLComponents(string: $0)
+        }
+        viewController.completion = { [weak delegate] result in
+            switch result {
+            case .cancel:
+                delegate?.authorizingPaymentDidCancel()
+            case .complete(let redirectedURL):
+                delegate?.authorizingPaymentDidComplete(with: redirectedURL)
+            }
+        }
+
+        viewController.applyNavigationBarStyle()
+        viewController.title = "AuthorizingPayment.title".localized()
+
+        let navigationController = UINavigationController(rootViewController: viewController)
+        navigationController.navigationBar.isTranslucent = false
+        navigationController.navigationBar.backgroundColor = .white
+
+        if #available(iOSApplicationExtension 11.0, *) {
+            navigationController.navigationBar.prefersLargeTitles = false
+        }
+
+        topViewController.present(navigationController, animated: animated, completion: nil)
+        presentedViewController = navigationController
+
+        self.expectedReturnURLPatterns = expectedReturnURLPatterns
+    }
+}
diff --git a/OmiseSDK/Sources/ToolKit/Extensions/URL+Helpers.swift b/OmiseSDK/Sources/ToolKit/Extensions/URL+Helpers.swift
deleted file mode 100644
index ab34e49d..00000000
--- a/OmiseSDK/Sources/ToolKit/Extensions/URL+Helpers.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-import Foundation
-
-extension URL {
-    func match(string: String) -> Bool {
-        guard
-            let expectedURLComponents = URLComponents(string: string),
-            let components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
-            return false
-        }
-
-        return expectedURLComponents.match(components: components)
-    }
-}
-
-extension URLComponents {
-    func match(string: String) -> Bool {
-        guard let expectedURLComponents = URLComponents(string: string) else { return false }
-        return match(components: expectedURLComponents)
-    }
-
-    func match(components expectedURLComponents: URLComponents) -> Bool {
-        return expectedURLComponents.scheme?.lowercased() == scheme?.lowercased()
-        && expectedURLComponents.host?.lowercased() == host?.lowercased()
-        && path.lowercased().hasPrefix(expectedURLComponents.path.lowercased())
-    }
-}
diff --git a/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.swift b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.swift
similarity index 84%
rename from OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.swift
rename to OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.swift
index e0016ac6..03e3882b 100644
--- a/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.swift	
@@ -2,17 +2,6 @@ import Foundation
 import WebKit
 import os
 
-@available(iOSApplicationExtension, unavailable)
-public protocol AuthorizingPaymentViewControllerDelegate: AnyObject {
-    /// A delegation method called when the authorizing payment process is completed.
-    /// - parameter viewController: The authorizing payment controller that call this method.
-    /// - parameter redirectedURL: A URL returned from the authorizing payment process.
-    func authorizingPaymentViewController(_ viewController: AuthorizingPaymentViewController, didCompleteAuthorizingPaymentWithRedirectedURL redirectedURL: URL)
-    
-    /// A delegation method called when user cancel the authorizing payment process.
-    func authorizingPaymentViewControllerDidCancel(_ viewController: AuthorizingPaymentViewController)
-}
-
 /*:
  Drop-in authorizing payment handler view controller that automatically display the authorizing payment verification form
  which supports `3DS`, `Internet Banking` and other offsite payment methods those need to be authorized via a web browser.
@@ -21,7 +10,7 @@ public protocol AuthorizingPaymentViewControllerDelegate: AnyObject {
    This is still an experimental API. If you encountered with any problem with this API, please feel free to report to Omise.
  */
 @available(iOSApplicationExtension, unavailable)
-public class AuthorizingPaymentViewController: UIViewController {
+class AuthorizingPaymentWebViewController: UIViewController {
     /// Authorize URL given from Omise in the created `Charge` object.
     var authorizeURL: URL? {
         didSet {
@@ -33,21 +22,25 @@ public class AuthorizingPaymentViewController: UIViewController {
         }
     }
     
+    enum CompletionState {
+        case complete(redirectedURL: URL?)
+        case cancel
+    }
+
     /// The expected return URL patterns described in the URLComponents object.
     ///
     /// The rule is the scheme and host must be matched and must have the path as a prefix.
     /// Example: if the return URL is `https://www.example.com/products/12345` the expected return URL should have a URLComponents with scheme of `https`, host of `www.example.com` and the path of `/products/`
     var expectedReturnURLPatterns: [URLComponents] = []
     
-    /// A delegate object that will recieved the authorizing payment events.
-    weak var delegate: AuthorizingPaymentViewControllerDelegate?
-    
+    var completion: ParamClosure<CompletionState>?
+
     let webView = WKWebView(frame: CGRect.zero, configuration: WKWebViewConfiguration())
     let okButtonTitle = NSLocalizedString("OK", comment: "OK button for JavaScript panel")
     let confirmButtonTitle = NSLocalizedString("Confirm", comment: "Confirm button for JavaScript panel")
     let cancelButtonTitle = NSLocalizedString("Cancel", comment: "Cancel button for JavaScript panel")
 
-    public override func viewDidLoad() {
+    override func viewDidLoad() {
         super.viewDidLoad()
         webView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(webView)
@@ -68,15 +61,16 @@ public class AuthorizingPaymentViewController: UIViewController {
         navigationItem.rightBarButtonItem = cancelButtonItem
     }
     
-    public override func viewDidAppear(_ animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         startAuthorizingPaymentProcess()
     }
     
     @IBAction private func cancelAuthorizingPaymentProcess(_ sender: UIBarButtonItem) {
         os_log("Authorization process was cancelled, trying to notify the delegate", log: uiLogObject, type: .info)
-        delegate?.authorizingPaymentViewControllerDidCancel(self)
-        if delegate == nil {
+        if let completion = completion {
+            completion(.cancel)
+        } else {
             os_log("Authorization process was cancelled but no delegate to be notified", log: uiLogObject, type: .default)
         }
     }
@@ -106,7 +100,7 @@ public class AuthorizingPaymentViewController: UIViewController {
 }
 
 @available(iOSApplicationExtension, unavailable)
-extension AuthorizingPaymentViewController: WKNavigationDelegate {
+extension AuthorizingPaymentWebViewController: WKNavigationDelegate {
     public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Swift.Void) {
         if let url = navigationAction.request.url, verifyPaymentURL(url) {
             os_log("Redirected to expected %{private}@ URL, trying to notify the delegate",
@@ -114,8 +108,8 @@ extension AuthorizingPaymentViewController: WKNavigationDelegate {
                    type: .info,
                    url.absoluteString)
             decisionHandler(.cancel)
-            delegate?.authorizingPaymentViewController(self, didCompleteAuthorizingPaymentWithRedirectedURL: url)
-            if delegate == nil {
+            completion?(.complete(redirectedURL: url))
+            if completion == nil {
                 os_log("Redirected to expected %{private}@ URL but no delegate to be notified",
                        log: uiLogObject,
                        type: .default,
@@ -140,7 +134,7 @@ extension AuthorizingPaymentViewController: WKNavigationDelegate {
 }
 
 @available(iOSApplicationExtension, unavailable)
-extension AuthorizingPaymentViewController: WKUIDelegate {
+extension AuthorizingPaymentWebViewController: WKUIDelegate {
     public func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
 
         let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)
@@ -151,7 +145,7 @@ extension AuthorizingPaymentViewController: WKUIDelegate {
         
         alertController.addAction(okAction)
         
-        // NOTE: Must present an UIAlertController on AuthorizingPaymentViewController
+        // NOTE: Must present an UIAlertController on AuthorizingPaymentWebViewController
         self.present(alertController, animated: true)
     }
     
@@ -168,7 +162,7 @@ extension AuthorizingPaymentViewController: WKUIDelegate {
         alertController.addAction(confirmAction)
         alertController.addAction(cancelAction)
 
-        // NOTE: Must present an UIAlertController on AuthorizingPaymentViewController
+        // NOTE: Must present an UIAlertController on AuthorizingPaymentWebViewController
         self.present(alertController, animated: true, completion: nil)
     }
     
@@ -191,7 +185,7 @@ extension AuthorizingPaymentViewController: WKUIDelegate {
         alertController.addAction(okAction)
         alertController.addAction(cancelAction)
         
-        // NOTE: Must present an UIAlertController on AuthorizingPaymentViewController
+        // NOTE: Must present an UIAlertController on AuthorizingPaymentWebViewController
         self.present(alertController, animated: true, completion: nil)
     }
 }
diff --git a/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.xib b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.xib
similarity index 91%
rename from OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.xib
rename to OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.xib
index 3ca6f73e..bc509d1e 100644
--- a/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.xib	
+++ b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.xib	
@@ -2,13 +2,12 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AuthorizingPaymentViewController" customModule="OmiseSDK">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AuthorizingPaymentWebViewController" customModule="OmiseSDK">
             <connections>
                 <outlet property="view" destination="rfP-X1-lzd" id="n3c-cC-3xG"/>
             </connections>
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift
index eccd459f..7547b725 100644
--- a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
@@ -171,6 +171,14 @@ class CreditCardPaymentController: UIViewController {
 
         contentView.adjustContentInsetOnKeyboardAppear()
 
+        // TODO: Remove
+        cardNumberTextField.text = "4761340000000076" // Challenge
+        //        cardNumberTextField.text = "5362684181065006" // Frictionless
+        //        cardNumberTextField.text = "4012000000001089" // Frictionless failed
+        cardNameTextField.text = "Omise Test"
+        expiryDateTextField.text = "05/24"
+        secureCodeTextField.text = "123"
+
         if let viewModel = viewModel {
             bind(to: viewModel)
         }
diff --git a/OmiseSDK/Sources/ToolKit/Extensions/Array+Helpers.swift b/OmiseSDK/ToolKit/Extensions/Array+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/Extensions/Array+Helpers.swift
rename to OmiseSDK/ToolKit/Extensions/Array+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/Extensions/Optional+Helpers.swift b/OmiseSDK/ToolKit/Extensions/Optional+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/Extensions/Optional+Helpers.swift
rename to OmiseSDK/ToolKit/Extensions/Optional+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/Extensions/String+Helpers.swift b/OmiseSDK/ToolKit/Extensions/String+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/Extensions/String+Helpers.swift
rename to OmiseSDK/ToolKit/Extensions/String+Helpers.swift
diff --git a/OmiseSDK/ToolKit/Extensions/URL+Helpers.swift b/OmiseSDK/ToolKit/Extensions/URL+Helpers.swift
new file mode 100644
index 00000000..5e92dce0
--- /dev/null
+++ b/OmiseSDK/ToolKit/Extensions/URL+Helpers.swift
@@ -0,0 +1,85 @@
+import Foundation
+
+extension URL {
+    func match(string: String) -> Bool {
+        guard
+            let expectedURLComponents = URLComponents(string: string),
+            let components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
+            return false
+        }
+
+        return expectedURLComponents.match(components: components)
+    }
+}
+
+extension URLComponents {
+    func match(string: String) -> Bool {
+        guard let expectedURLComponents = URLComponents(string: string) else { return false }
+        return match(components: expectedURLComponents)
+    }
+
+    func match(components expectedURLComponents: URLComponents) -> Bool {
+        return expectedURLComponents.scheme?.lowercased() == scheme?.lowercased()
+        && expectedURLComponents.host?.lowercased() == host?.lowercased()
+        && path.lowercased().hasPrefix(expectedURLComponents.path.lowercased())
+    }
+}
+
+extension URL {
+    var removeLastPathComponent: URL {
+        guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
+            return self
+        }
+
+        // Remove query items to eliminate GET parameters
+        components.queryItems = nil
+
+        // Split the path into components, replace the last one, and reassemble the path
+        var pathComponents = components.path.split(separator: "/").map(String.init)
+
+        if !pathComponents.isEmpty {
+            pathComponents.removeLast()
+            components.path = "/" + pathComponents.joined(separator: "/")
+        }
+
+        return components.url ?? self
+    }
+
+    func appendingLastPathComponent(_ lastPathComponent: String) -> URL {
+        guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
+            return self
+        }
+
+        var pathComponents = components.path.split(separator: "/").map(String.init)
+
+        if !pathComponents.isEmpty {
+            pathComponents.append(lastPathComponent)
+            components.path = "/" + pathComponents.joined(separator: "/")
+        } else {
+            // If there are no path components, just add the new endpoint
+            components.path = lastPathComponent
+        }
+
+        return components.url ?? self
+    }
+
+    func appendQueryItem(name: String, value: String?) -> URL? {
+
+        guard var urlComponents = URLComponents(string: absoluteString) else { return nil }
+
+        // Create array of existing query items
+        var queryItems: [URLQueryItem] = urlComponents.queryItems ?? []
+
+        // Create query item
+        let queryItem = URLQueryItem(name: name, value: value)
+
+        // Append the new query item in the existing query items array
+        queryItems.append(queryItem)
+
+        // Append updated query items array in the url component object
+        urlComponents.queryItems = queryItems
+
+        // Returns the url from new url components
+        return urlComponents.url
+    }
+}
diff --git a/OmiseSDK/Sources/ToolKit/Property Wrappers/ProxyProperty.swift b/OmiseSDK/ToolKit/Property Wrappers/ProxyProperty.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/Property Wrappers/ProxyProperty.swift
rename to OmiseSDK/ToolKit/Property Wrappers/ProxyProperty.swift
diff --git a/OmiseSDK/ToolKit/Typedefs/Closures.swift b/OmiseSDK/ToolKit/Typedefs/Closures.swift
new file mode 100644
index 00000000..eff9f19a
--- /dev/null
+++ b/OmiseSDK/ToolKit/Typedefs/Closures.swift
@@ -0,0 +1,5 @@
+import Foundation
+
+typealias VoidClosure = () -> Void
+typealias ParamClosure<T> = (T) -> Void
+
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UIButton+Helpers.swift b/OmiseSDK/ToolKit/UI Extensions/UIButton+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/UI Extensions/UIButton+Helpers.swift
rename to OmiseSDK/ToolKit/UI Extensions/UIButton+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UIColor+Helpers.swift b/OmiseSDK/ToolKit/UI Extensions/UIColor+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/UI Extensions/UIColor+Helpers.swift
rename to OmiseSDK/ToolKit/UI Extensions/UIColor+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UIControl.State+Hashable.swift b/OmiseSDK/ToolKit/UI Extensions/UIControl.State+Hashable.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/UI Extensions/UIControl.State+Hashable.swift
rename to OmiseSDK/ToolKit/UI Extensions/UIControl.State+Hashable.swift
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UIImage+Helpers.swift b/OmiseSDK/ToolKit/UI Extensions/UIImage+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/UI Extensions/UIImage+Helpers.swift
rename to OmiseSDK/ToolKit/UI Extensions/UIImage+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UILabel+Helpers.swift b/OmiseSDK/ToolKit/UI Extensions/UILabel+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/UI Extensions/UILabel+Helpers.swift
rename to OmiseSDK/ToolKit/UI Extensions/UILabel+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UIScrollView+Helpers.swift b/OmiseSDK/ToolKit/UI Extensions/UIScrollView+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/UI Extensions/UIScrollView+Helpers.swift
rename to OmiseSDK/ToolKit/UI Extensions/UIScrollView+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UIStackView+Helpers.swift b/OmiseSDK/ToolKit/UI Extensions/UIStackView+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/UI Extensions/UIStackView+Helpers.swift
rename to OmiseSDK/ToolKit/UI Extensions/UIStackView+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UIView+Helpers.swift b/OmiseSDK/ToolKit/UI Extensions/UIView+Helpers.swift
similarity index 100%
rename from OmiseSDK/Sources/ToolKit/UI Extensions/UIView+Helpers.swift
rename to OmiseSDK/ToolKit/UI Extensions/UIView+Helpers.swift
diff --git a/OmiseSDKTests/3DS/AuthorizingPaymentTests.swift b/OmiseSDKTests/3DS/AuthorizingPaymentTests.swift
new file mode 100644
index 00000000..593cdc2f
--- /dev/null
+++ b/OmiseSDKTests/3DS/AuthorizingPaymentTests.swift
@@ -0,0 +1,280 @@
+import XCTest
+@testable import OmiseSDK
+import ThreeDS_SDK
+
+class NetceteraThreeDSControllerMock: NetceteraThreeDSControllerProtocol {
+    func setAPIKey(_ apiKey: String) {
+    }
+
+    func appOpen3DSDeeplinkURL(_ url: URL) -> Bool {
+        return true
+    }
+    
+    var processAuthorizedURLResult = NetceteraThreeDSControllerResult.success(())
+    func processAuthorizedURL(
+        _ authorizeUrl: URL,
+        threeDSRequestorAppURL: String?,
+        uiCustomization: ThreeDSUICustomization?,
+        in viewController: UIViewController,
+        onComplete: @escaping (NetceteraThreeDSControllerResult) -> Void
+    ) {
+        onComplete(processAuthorizedURLResult)
+    }
+}
+
+class TopViewControllerMock: UIViewController {
+    var onPresentViewController: ((UIViewController) -> Void)?
+    override func present(_ viewControllerToPresent: UIViewController, animated flag: Bool, completion: (() -> Void)? = nil) {
+        onPresentViewController?(viewControllerToPresent)
+    }
+}
+
+class AuthorizingPaymentTests: XCTestCase {
+
+    struct AnyError: Error {
+        let message: String
+        init(_ message: String? = nil) {
+            self.message = message ?? ""
+        }
+    }
+
+    // swiftlint:disable force_unwrapping
+    let authorizeURL = URL(string: "https://co.omise.com/authorize")!
+    let expectedWebReturnURL = URL(string: "https://co.omise.com/callback")!
+    let deeplinkURL = URL(string: "omiseExampleApp://authorizePayment")!
+    // swiftlint:enable force_unwrapping
+
+    typealias NetceteraError = NetceteraThreeDSController.Errors
+    let netceteraMockController = NetceteraThreeDSControllerMock()
+    let authorizingPayment = AuthorizingPayment()
+    let topViewController = TopViewControllerMock()
+    let timeout: TimeInterval = 15.0
+
+    override func setUp() {
+        super.setUp()
+        NetceteraThreeDSController.sharedController = netceteraMockController
+    }
+
+    func test3DSUserFailedChallenge() {
+        let expectation = self.expectation(description: "callback")
+
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.incomplete(event: nil))
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { result in
+                defer { expectation.fulfill() }
+                XCTAssertEqual(result, AuthorizingPayment.Status.cancel)
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func test3DSUserCancelledChallenge() {
+        let expectation = self.expectation(description: "callback")
+
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.cancelled)
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { result in
+                defer { expectation.fulfill() }
+                XCTAssertEqual(result, AuthorizingPayment.Status.cancel)
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func test3DSUserTimedOutChallenge() {
+        let expectation = self.expectation(description: "callback")
+        
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.timedout)
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { result in
+                defer { expectation.fulfill() }
+                XCTAssertEqual(result, AuthorizingPayment.Status.cancel)
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func test3DSAuthResponseStatusFailed() {
+        let expectation = self.expectation(description: "callback")
+
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.authResStatusFailed)
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { result in
+                defer { expectation.fulfill() }
+                XCTAssertEqual(result, AuthorizingPayment.Status.cancel)
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func test3DSAuthResponseStatusUnknown() {
+        let expectation = self.expectation(description: "callback")
+
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.authResStatusUnknown("Some Unknown Status"))
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { result in
+                defer { expectation.fulfill() }
+                XCTAssertEqual(result, AuthorizingPayment.Status.cancel)
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func test3DSSuccess() {
+        let expectation = self.expectation(description: "callback")
+
+        netceteraMockController.processAuthorizedURLResult = .success(())
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { result in
+                defer { expectation.fulfill() }
+                XCTAssertEqual(result, AuthorizingPayment.Status.complete(redirectURL: nil))
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func testWebViewOn3DSAuthResponseInvalid() {
+        let expectation = self.expectation(description: "callback")
+
+        topViewController.onPresentViewController = { viewController in
+            defer { expectation.fulfill() }
+            let presentedVC = (viewController as? UINavigationController)?.topViewController
+            XCTAssertTrue(presentedVC is AuthorizingPaymentWebViewController)
+        }
+
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.authResInvalid)
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { _ in
+                XCTFail("Should open webview and don't call this callback")
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func testWebViewOn3DSProtocolError() {
+        let expectation = self.expectation(description: "callback")
+
+        topViewController.onPresentViewController = { viewController in
+            defer { expectation.fulfill() }
+            let presentedVC = (viewController as? UINavigationController)?.topViewController
+            XCTAssertTrue(presentedVC is AuthorizingPaymentWebViewController)
+        }
+
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.protocolError(event: nil))
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { _ in
+                XCTFail("Should open webview and don't call this callback")
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func testWebViewOn3DSRuntimeError() {
+        let expectation = self.expectation(description: "callback")
+
+        topViewController.onPresentViewController = { viewController in
+            defer { expectation.fulfill() }
+            let presentedVC = (viewController as? UINavigationController)?.topViewController
+            XCTAssertTrue(presentedVC is AuthorizingPaymentWebViewController)
+        }
+
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.runtimeError(event: nil))
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { _ in
+                XCTFail("Should open webview and don't call this callback")
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func testWebViewOn3DSPresentChallengeFailed() {
+        let expectation = self.expectation(description: "callback")
+
+        topViewController.onPresentViewController = { viewController in
+            defer { expectation.fulfill() }
+            let presentedVC = (viewController as? UINavigationController)?.topViewController
+            XCTAssertTrue(presentedVC is AuthorizingPaymentWebViewController)
+        }
+
+        let challengeError = AnyError("Any error on presenting Netcetera Challenge")
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.presentChallenge(error: challengeError))
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { _ in
+                XCTFail("Should open webview and don't call this callback")
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func testWebViewOn3DSApiKeyInvalid() {
+        let expectation = self.expectation(description: "callback")
+
+        topViewController.onPresentViewController = { viewController in
+            defer { expectation.fulfill() }
+            let presentedVC = (viewController as? UINavigationController)?.topViewController
+            XCTAssertTrue(presentedVC is AuthorizingPaymentWebViewController)
+        }
+
+        netceteraMockController.processAuthorizedURLResult = .failure(NetceteraError.apiKeyInvalid)
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { _ in
+                XCTFail("Should open webview and don't call this callback")
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+
+    func testWebViewOnInitializationFailed() {
+        let expectation = self.expectation(description: "callback")
+
+        topViewController.onPresentViewController = { viewController in
+            defer { expectation.fulfill() }
+            let presentedVC = (viewController as? UINavigationController)?.topViewController
+            XCTAssertTrue(presentedVC is AuthorizingPaymentWebViewController)
+        }
+
+        netceteraMockController.processAuthorizedURLResult = .failure(AnyError("Any error during initialization"))
+        authorizingPayment.presentAuthPaymentController(
+            from: topViewController,
+            url: authorizeURL,
+            expectedWebViewReturnURL: expectedWebReturnURL,
+            deeplinkURL: deeplinkURL) { _ in
+                XCTFail("Should open webview and don't call this callback")
+        }
+
+        waitForExpectations(timeout: timeout, handler: nil)
+    }
+}
diff --git a/OmiseSDKTests/3DS/NetceteraThreeDSControllerTests.swift b/OmiseSDKTests/3DS/NetceteraThreeDSControllerTests.swift
new file mode 100644
index 00000000..fee21426
--- /dev/null
+++ b/OmiseSDKTests/3DS/NetceteraThreeDSControllerTests.swift
@@ -0,0 +1,40 @@
+import XCTest
+@testable import OmiseSDK
+import ThreeDS_SDK
+
+class NetceteraThreeDSControllerTests: XCTestCase {
+
+    func testThreeDSRequestorAppURLTransaction() {
+        let transactionId = "1234-5678-9012-ABCD"
+
+        let aRes = AuthResponse.ARes(
+            threeDSServerTransID: transactionId,
+            acsTransID: "123",
+            acsSignedContent: nil,
+            acsUIType: nil
+        )
+
+        let netceteraController = NetceteraThreeDSController()
+
+        let tests = [
+            "": nil,
+
+            "someApp://":
+                "someApp://?transID=\(transactionId)",
+
+            "someApp://3DSChallenge":
+                "someApp://3DSChallenge?transID=\(transactionId)",
+
+            "someApp://3ds/challenge?source=omiseSDK":
+                "someApp://3ds/challenge?source=omiseSDK&transID=\(transactionId)"
+        ]
+
+        for (url, result) in tests {
+            let params = netceteraController.prepareChallengeParameters(
+                aRes: aRes,
+                threeDSRequestorAppURL: url
+            )
+            XCTAssertEqual(params.getThreeDSRequestorAppURL(), result)
+        }
+    }
+}
diff --git a/OmiseSDKTests/3DS/SHA512Tests.swift b/OmiseSDKTests/3DS/SHA512Tests.swift
new file mode 100644
index 00000000..5537188a
--- /dev/null
+++ b/OmiseSDKTests/3DS/SHA512Tests.swift
@@ -0,0 +1,38 @@
+import XCTest
+@testable import OmiseSDK
+import Foundation
+
+class SHA512Tests: XCTestCase {
+
+    func testSHA512EmptyString() {
+        let emptyString = ""
+        let expectedHash = Data(
+            // swiftlint:disable:next multiline_literal_brackets
+            [ // expected SHA-512 hash of empty string
+                0xcf, 0x83, 0xe1, 0x35, 0x7e, 0xef, 0xb8, 0xbd,
+                0xf1, 0x54, 0x28, 0x50, 0xd6, 0x6d, 0x80, 0x07,
+                0xd6, 0x20, 0xe4, 0x05, 0x0b, 0x57, 0x15, 0xdc,
+                0x83, 0xf4, 0xa9, 0x21, 0xd3, 0x6c, 0xe9, 0xce,
+                0x47, 0xd0, 0xd1, 0x3c, 0x5d, 0x85, 0xf2, 0xb0,
+                0xff, 0x83, 0x18, 0xd2, 0x87, 0x7e, 0xec, 0x2f,
+                0x63, 0xb9, 0x31, 0xbd, 0x47, 0x41, 0x7a, 0x81,
+                0xa5, 0x38, 0x32, 0x7a, 0xf9, 0x27, 0xda, 0x3e
+            ]
+        )
+        XCTAssertEqual(emptyString.sha512, expectedHash)
+    }
+
+    func testSHA512NonEmptyString() {
+        let testString = "Hello, World!"
+        // swiftlint:disable:next line_length
+        let expectedHexString = "374d794a95cdcfd8b35993185fef9ba368f160d8daf432d08ba9f1ed1e5abe6cc69291e0fa2fe0006a52570ef18c19def4e617c33ce52ef0a6e5fbe318cb0387"
+
+        XCTAssertEqual(testString.sha512.hexadecimalString, expectedHexString)
+    }
+}
+
+extension Data {
+    var hexadecimalString: String {
+        return map { String(format: "%02x", $0) }.joined()
+    }
+}
diff --git a/OmiseSDKTests/3DS/ThreeDSButtonCustomizationTests.swift b/OmiseSDKTests/3DS/ThreeDSButtonCustomizationTests.swift
new file mode 100644
index 00000000..1465a91c
--- /dev/null
+++ b/OmiseSDKTests/3DS/ThreeDSButtonCustomizationTests.swift
@@ -0,0 +1,64 @@
+import XCTest
+@testable import OmiseSDK
+import ThreeDS_SDK
+
+class ThreeDSButtonCustomizationTests: XCTestCase {
+    let backgroundColorHex = "#FFFFFF"
+    let darkBackgroundColorHex = "#000000"
+    let cornerRadius: Int = 12
+
+    let testTextFontName = "Arial-BoldItalicMT"
+    let testTextColorHex = "#C4A484"
+    let testDarkTextColorHex = "#964B00"
+    let testTextFontSize = 14
+
+    func testNetceteraInit() {
+        let uiCustomization = ThreeDSButtonCustomization(
+            backgroundColorHex: backgroundColorHex,
+            darkBackgroundColorHex: darkBackgroundColorHex,
+            cornerRadius: cornerRadius,
+            textFontName: testTextFontName,
+            textColorHex: testTextColorHex,
+            darkTextColorHex: testDarkTextColorHex,
+            textFontSize: testTextFontSize)
+
+        let netCustomization: ThreeDS_SDK.ButtonCustomization
+        do {
+            try netCustomization = ThreeDS_SDK.ButtonCustomization(uiCustomization)
+        } catch {
+            XCTAssert(false, error.localizedDescription)
+            return
+        }
+
+        XCTAssertEqual(netCustomization.getBackgroundColor(), backgroundColorHex)
+        XCTAssertEqual(netCustomization.getCornerRadius(), cornerRadius)
+
+        XCTAssertEqual(netCustomization.getTextFontName(), testTextFontName)
+        XCTAssertEqual(netCustomization.getTextColor(), testTextColorHex)
+        XCTAssertEqual(netCustomization.getTextFontSize(), testTextFontSize)
+    }
+
+    func testNetceteraCustomization() {
+        let uiCustomization = ThreeDSButtonCustomization(
+            backgroundColorHex: backgroundColorHex,
+            darkBackgroundColorHex: darkBackgroundColorHex,
+            cornerRadius: cornerRadius,
+            textFontName: testTextFontName,
+            textColorHex: testTextColorHex,
+            darkTextColorHex: testDarkTextColorHex,
+            textFontSize: testTextFontSize)
+
+        let netCustomization = ThreeDS_SDK.ButtonCustomization()
+        do {
+            try netCustomization.customize(uiCustomization)
+        } catch {
+            XCTAssert(false, error.localizedDescription)
+        }
+
+        XCTAssertEqual(netCustomization.getBackgroundColor(), backgroundColorHex)
+        XCTAssertEqual(netCustomization.getCornerRadius(), cornerRadius)
+        XCTAssertEqual(netCustomization.getTextFontName(), testTextFontName)
+        XCTAssertEqual(netCustomization.getTextColor(), testTextColorHex)
+        XCTAssertEqual(netCustomization.getTextFontSize(), testTextFontSize)
+    }
+}
diff --git a/OmiseSDKTests/3DS/UICustomizationTests.swift b/OmiseSDKTests/3DS/UICustomizationTests.swift
new file mode 100644
index 00000000..abb2cd76
--- /dev/null
+++ b/OmiseSDKTests/3DS/UICustomizationTests.swift
@@ -0,0 +1,29 @@
+import XCTest
+@testable import OmiseSDK
+import ThreeDS_SDK
+
+class ThreeDSCustomizationTests: XCTestCase {
+    let testTextFontName = "Arial-BoldItalicMT"
+    let testTextColorHex = "#C4A484"
+    let testDarkTextColorHex = "#964B00"
+    let testTextFontSize = 14
+
+    func testNetceteraCustomization() {
+        let uiCustomization = ThreeDSCustomization(
+            textFontName: testTextFontName,
+            textColorHex: testTextColorHex,
+            darkTextColorHex: testDarkTextColorHex,
+            textFontSize: testTextFontSize)
+
+        let netCustomization = ThreeDS_SDK.Customization()
+        do {
+            try netCustomization.customize(omiseThreeDSCustomization: uiCustomization)
+        } catch {
+            XCTAssert(false, error.localizedDescription)
+        }
+
+        XCTAssertEqual(netCustomization.getTextFontName(), testTextFontName)
+        XCTAssertEqual(netCustomization.getTextColor(), testTextColorHex)
+        XCTAssertEqual(netCustomization.getTextFontSize(), testTextFontSize)
+    }
+}
diff --git a/OmiseSDKTests/URL+PathComponentsTests.swift b/OmiseSDKTests/URL+PathComponentsTests.swift
new file mode 100644
index 00000000..0e7f1a09
--- /dev/null
+++ b/OmiseSDKTests/URL+PathComponentsTests.swift
@@ -0,0 +1,28 @@
+import XCTest
+@testable import OmiseSDK
+
+private let timeout: TimeInterval = 15.0
+
+class URLPathComponentsTests: XCTestCase {
+
+    func testRemoveLastPathComponent() {
+        let tests = [
+            "https://test.com": "https://test.com/test",
+            "https://test.com/endpoint": "https://test.com/test",
+            "https://test.com/path/endpoint": "https://test.com/path/test",
+            "https://test.com/path/endpoint?test=2": "https://test.com/path/test"
+        ]
+
+        for (urlString, expectedResult) in tests {
+            guard let url = URL(string: urlString) else {
+                XCTFail("Can't resolve test URL")
+                return
+            }
+
+            let result = url.removeLastPathComponent
+                .appendingPathComponent("test", isDirectory: false)
+
+            XCTAssertEqual(result.absoluteString, expectedResult)
+        }
+    }
+}
diff --git a/README.md b/README.md
index ee226795..db76cde6 100644
--- a/README.md
+++ b/README.md
@@ -352,13 +352,13 @@ omiseSDK.presentAuthorizingPayment(
 Then implement the delegate to receive the `Source` or `Token` object after the user has selected:
 
 ```swift
-extension ViewController: AuthorizingPaymentViewControllerDelegate {
-  func authorizingPaymentViewController(_ viewController: AuthorizingPaymentViewController, didCompleteAuthorizingPaymentWithRedirectedURL redirectedURL: URL) {
+extension ViewController: AuthorizingPaymentWebViewDelegate {
+  func authorizingPaymentViewController(_ viewController: AuthorizingPaymentWebViewController, didCompleteAuthorizingPaymentWithRedirectedURL redirectedURL: URL) {
       // Handle the `redirected URL` here
       omiseSDK.dismiss()
   }
   
-  func authorizingPaymentViewControllerDidCancel(_ viewController: AuthorizingPaymentViewController) {
+  func authorizingPaymentViewControllerDidCancel(_ viewController: AuthorizingPaymentWebViewController) {
     // Handle the case that the user taps cancel.
     omiseSDK.dismiss()
   }
diff --git a/dev.xcodeproj/project.pbxproj b/dev.xcodeproj/project.pbxproj
index b873a4e1..d4d62c77 100644
--- a/dev.xcodeproj/project.pbxproj
+++ b/dev.xcodeproj/project.pbxproj
@@ -25,7 +25,7 @@
 		750126722B8A49BC00ED5E14 /* FPX.Bank+ViewPresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750126712B8A49BC00ED5E14 /* FPX.Bank+ViewPresentable.swift */; };
 		750126742B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750126732B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift */; };
 		750126772B95971A00ED5E14 /* ChoosePaymentCoordinator+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750126762B95971A00ED5E14 /* ChoosePaymentCoordinator+Helpers.swift */; };
-		750126792B95A34000ED5E14 /* AuthorizingPaymentViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 750126782B95A34000ED5E14 /* AuthorizingPaymentViewController.xib */; };
+		750126792B95A34000ED5E14 /* AuthorizingPaymentWebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 750126782B95A34000ED5E14 /* AuthorizingPaymentWebViewController.xib */; };
 		7502CA532A3011A900766E7D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7502CA562A3011A900766E7D /* LaunchScreen.storyboard */; };
 		7502CA5F2A31A7D600766E7D /* CountryListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502CA5E2A31A7D600766E7D /* CountryListViewController.swift */; };
 		7502CA602A31A7D600766E7D /* CountryListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502CA5E2A31A7D600766E7D /* CountryListViewController.swift */; };
@@ -90,6 +90,26 @@
 		757E14352BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757E14342BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift */; };
 		7588011E2BAAB37C00F02934 /* AppDeeplink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7588011D2BAAB37C00F02934 /* AppDeeplink.swift */; };
 		758801202BAAC70200F02934 /* URL+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7588011F2BAAC70200F02934 /* URL+Helpers.swift */; };
+		758A4E6E2BE38A5F005E7B5A /* CryptData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E6B2BE38A5E005E7B5A /* CryptData.swift */; };
+		758A4E6F2BE38A5F005E7B5A /* String+sha512.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E6C2BE38A5E005E7B5A /* String+sha512.swift */; };
+		758A4E702BE38A5F005E7B5A /* String+PemCert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E6D2BE38A5E005E7B5A /* String+PemCert.swift */; };
+		758A4E732BE38A7E005E7B5A /* NetceteraThreeDSController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E712BE38A7E005E7B5A /* NetceteraThreeDSController.swift */; };
+		758A4E742BE38A7E005E7B5A /* NetceteraConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E722BE38A7E005E7B5A /* NetceteraConfig.swift */; };
+		758A4E7C2BE38A89005E7B5A /* ThreeDSButtonCustomization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E762BE38A88005E7B5A /* ThreeDSButtonCustomization.swift */; };
+		758A4E7D2BE38A89005E7B5A /* ThreeDSLabelCustomization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E772BE38A89005E7B5A /* ThreeDSLabelCustomization.swift */; };
+		758A4E7E2BE38A89005E7B5A /* ThreeDSToolbarCustomization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E782BE38A89005E7B5A /* ThreeDSToolbarCustomization.swift */; };
+		758A4E7F2BE38A89005E7B5A /* ThreeDSCustomization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E792BE38A89005E7B5A /* ThreeDSCustomization.swift */; };
+		758A4E802BE38A89005E7B5A /* ThreeDSUICustomization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E7A2BE38A89005E7B5A /* ThreeDSUICustomization.swift */; };
+		758A4E812BE38A89005E7B5A /* ThreeDSTextBoxCustomization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E7B2BE38A89005E7B5A /* ThreeDSTextBoxCustomization.swift */; };
+		758A4E842BE38AC3005E7B5A /* ThreeDS_SDK in Frameworks */ = {isa = PBXBuildFile; productRef = 758A4E832BE38AC3005E7B5A /* ThreeDS_SDK */; };
+		758A4E862BE38AD0005E7B5A /* ThreeDS_SDK in Frameworks */ = {isa = PBXBuildFile; productRef = 758A4E852BE38AD0005E7B5A /* ThreeDS_SDK */; };
+		758A4E902BE38AFD005E7B5A /* NetceteraThreeDSControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E882BE38AFD005E7B5A /* NetceteraThreeDSControllerTests.swift */; };
+		758A4E922BE38AFD005E7B5A /* UICustomizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E8A2BE38AFD005E7B5A /* UICustomizationTests.swift */; };
+		758A4E962BE38AFD005E7B5A /* ThreeDSButtonCustomizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E8E2BE38AFD005E7B5A /* ThreeDSButtonCustomizationTests.swift */; };
+		758A4E972BE38AFD005E7B5A /* SHA512Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E8F2BE38AFD005E7B5A /* SHA512Tests.swift */; };
+		758A4E9F2BE3DFDF005E7B5A /* URL+PathComponentsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4E9E2BE3DFDF005E7B5A /* URL+PathComponentsTests.swift */; };
+		758A4EA62BE9D5C0005E7B5A /* Closures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4EA52BE9D5C0005E7B5A /* Closures.swift */; };
+		758A4EA82BE9D722005E7B5A /* AuthorizingPaymentDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 758A4EA72BE9D722005E7B5A /* AuthorizingPaymentDelegate.swift */; };
 		759856242A286C880087B605 /* UIScrollView+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759856232A286C880087B605 /* UIScrollView+Helpers.swift */; };
 		759C7EC02B7DC7F50029D555 /* SourceType+MobileBanking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759C7EBF2B7DC7F50029D555 /* SourceType+MobileBanking.swift */; };
 		759C7EC22B7DC80A0029D555 /* SourceType+InternetBanking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759C7EC12B7DC80A0029D555 /* SourceType+InternetBanking.swift */; };
@@ -176,7 +196,7 @@
 		75F2A0BB2A1A60630038FA54 /* AtomePaymentFormViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B52A1A5F020038FA54 /* AtomePaymentFormViewContext.swift */; };
 		75F2A0C12A1A84900038FA54 /* UIColor+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0C02A1A84900038FA54 /* UIColor+Helpers.swift */; };
 		75F2A0C22A1A87AE0038FA54 /* UIColor+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0C02A1A84900038FA54 /* UIColor+Helpers.swift */; };
-		8A188BB01D951E3C00FFF467 /* AuthorizingPaymentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A188BAF1D951E3C00FFF467 /* AuthorizingPaymentViewController.swift */; };
+		8A188BB01D951E3C00FFF467 /* AuthorizingPaymentWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A188BAF1D951E3C00FFF467 /* AuthorizingPaymentWebViewController.swift */; };
 		8A2C451920ECC7A60033E2EB /* OmiseSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 225931181CE3210700841B86 /* OmiseSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		8A40DA29216B441E00749F45 /* PaymentSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A9EBC2166160300F12D86 /* PaymentSettingTableViewController.swift */; };
 		8A40DA2B216B53E900749F45 /* Tools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A40DA2A216B53E900749F45 /* Tools.swift */; };
@@ -287,7 +307,7 @@
 		750126712B8A49BC00ED5E14 /* FPX.Bank+ViewPresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FPX.Bank+ViewPresentable.swift"; sourceTree = "<group>"; };
 		750126732B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectDuitNowOBWBankViewModel.swift; sourceTree = "<group>"; };
 		750126762B95971A00ED5E14 /* ChoosePaymentCoordinator+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ChoosePaymentCoordinator+Helpers.swift"; sourceTree = "<group>"; };
-		750126782B95A34000ED5E14 /* AuthorizingPaymentViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AuthorizingPaymentViewController.xib; sourceTree = "<group>"; };
+		750126782B95A34000ED5E14 /* AuthorizingPaymentWebViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AuthorizingPaymentWebViewController.xib; sourceTree = "<group>"; };
 		7502CA552A3011A900766E7D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		7502CA582A3011B000766E7D /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		7502CA5A2A3011B100766E7D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
@@ -339,6 +359,25 @@
 		757E14342BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChoosePaymentMethodDelegate.swift; sourceTree = "<group>"; };
 		7588011D2BAAB37C00F02934 /* AppDeeplink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDeeplink.swift; sourceTree = "<group>"; };
 		7588011F2BAAC70200F02934 /* URL+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Helpers.swift"; sourceTree = "<group>"; };
+		758A4E6B2BE38A5E005E7B5A /* CryptData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CryptData.swift; sourceTree = "<group>"; };
+		758A4E6C2BE38A5E005E7B5A /* String+sha512.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+sha512.swift"; sourceTree = "<group>"; };
+		758A4E6D2BE38A5E005E7B5A /* String+PemCert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+PemCert.swift"; sourceTree = "<group>"; };
+		758A4E712BE38A7E005E7B5A /* NetceteraThreeDSController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetceteraThreeDSController.swift; sourceTree = "<group>"; };
+		758A4E722BE38A7E005E7B5A /* NetceteraConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetceteraConfig.swift; sourceTree = "<group>"; };
+		758A4E762BE38A88005E7B5A /* ThreeDSButtonCustomization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreeDSButtonCustomization.swift; sourceTree = "<group>"; };
+		758A4E772BE38A89005E7B5A /* ThreeDSLabelCustomization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreeDSLabelCustomization.swift; sourceTree = "<group>"; };
+		758A4E782BE38A89005E7B5A /* ThreeDSToolbarCustomization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreeDSToolbarCustomization.swift; sourceTree = "<group>"; };
+		758A4E792BE38A89005E7B5A /* ThreeDSCustomization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreeDSCustomization.swift; sourceTree = "<group>"; };
+		758A4E7A2BE38A89005E7B5A /* ThreeDSUICustomization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreeDSUICustomization.swift; sourceTree = "<group>"; };
+		758A4E7B2BE38A89005E7B5A /* ThreeDSTextBoxCustomization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreeDSTextBoxCustomization.swift; sourceTree = "<group>"; };
+		758A4E882BE38AFD005E7B5A /* NetceteraThreeDSControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetceteraThreeDSControllerTests.swift; sourceTree = "<group>"; };
+		758A4E8A2BE38AFD005E7B5A /* UICustomizationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UICustomizationTests.swift; sourceTree = "<group>"; };
+		758A4E8B2BE38AFD005E7B5A /* AuthorizingPaymentTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthorizingPaymentTests.swift; sourceTree = "<group>"; };
+		758A4E8E2BE38AFD005E7B5A /* ThreeDSButtonCustomizationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreeDSButtonCustomizationTests.swift; sourceTree = "<group>"; };
+		758A4E8F2BE38AFD005E7B5A /* SHA512Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SHA512Tests.swift; sourceTree = "<group>"; };
+		758A4E9E2BE3DFDF005E7B5A /* URL+PathComponentsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL+PathComponentsTests.swift"; sourceTree = "<group>"; };
+		758A4EA52BE9D5C0005E7B5A /* Closures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Closures.swift; sourceTree = "<group>"; };
+		758A4EA72BE9D722005E7B5A /* AuthorizingPaymentDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorizingPaymentDelegate.swift; sourceTree = "<group>"; };
 		759856232A286C880087B605 /* UIScrollView+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIScrollView+Helpers.swift"; sourceTree = "<group>"; };
 		759C7EBF2B7DC7F50029D555 /* SourceType+MobileBanking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceType+MobileBanking.swift"; sourceTree = "<group>"; };
 		759C7EC12B7DC80A0029D555 /* SourceType+InternetBanking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceType+InternetBanking.swift"; sourceTree = "<group>"; };
@@ -421,7 +460,7 @@
 		75F2A0C02A1A84900038FA54 /* UIColor+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Helpers.swift"; sourceTree = "<group>"; };
 		75F8C0B62B1F78E300AE78D9 /* PaymentChooserViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentChooserViewControllerTests.swift; sourceTree = "<group>"; };
 		8A00FEC21F1DE88600246078 /* README.md */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; tabWidth = 2; };
-		8A188BAF1D951E3C00FFF467 /* AuthorizingPaymentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthorizingPaymentViewController.swift; sourceTree = "<group>"; };
+		8A188BAF1D951E3C00FFF467 /* AuthorizingPaymentWebViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthorizingPaymentWebViewController.swift; sourceTree = "<group>"; };
 		8A25E929213CF6F300D48252 /* EContextPaymentFormController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EContextPaymentFormController.swift; sourceTree = "<group>"; };
 		8A275CBB21241E4500C5716F /* MainActionButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainActionButton.swift; sourceTree = "<group>"; };
 		8A30FB7C214929C900DC09DC /* PaymentCreatorController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentCreatorController.swift; sourceTree = "<group>"; };
@@ -461,6 +500,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				758A4E842BE38AC3005E7B5A /* ThreeDS_SDK in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -486,6 +526,7 @@
 			files = (
 				987A02CE1CE35D5E0035417A /* OmiseSDK.framework in Frameworks */,
 				757B0A742AD71E3100DEAE8F /* OmiseUnitTestKit in Frameworks */,
+				758A4E862BE38AD0005E7B5A /* ThreeDS_SDK in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -521,6 +562,7 @@
 		2259311A1CE3210700841B86 /* OmiseSDK */ = {
 			isa = PBXGroup;
 			children = (
+				75348D4C29C3FC8F0008C8A3 /* ToolKit */,
 				75E0EB872B7BCEA000E3198A /* Sources */,
 				8A00FEC21F1DE88600246078 /* README.md */,
 				2259311D1CE3210700841B86 /* Info.plist */,
@@ -662,6 +704,7 @@
 		75348D4C29C3FC8F0008C8A3 /* ToolKit */ = {
 			isa = PBXGroup;
 			children = (
+				758A4EA42BE9D599005E7B5A /* Typedefs */,
 				75F2A0AE2A1A5BE30038FA54 /* Property Wrappers */,
 				75405A852A26340E008C21F6 /* UI Extensions */,
 				75405A7E2A262B14008C21F6 /* Extensions */,
@@ -707,6 +750,60 @@
 			path = ViewModels;
 			sourceTree = "<group>";
 		};
+		758A4E682BE389B2005E7B5A /* 3DS */ = {
+			isa = PBXGroup;
+			children = (
+				758A4E752BE38A84005E7B5A /* UICustomization */,
+				758A4E722BE38A7E005E7B5A /* NetceteraConfig.swift */,
+				758A4E712BE38A7E005E7B5A /* NetceteraThreeDSController.swift */,
+				758A4E6A2BE38A49005E7B5A /* Crypto */,
+			);
+			path = 3DS;
+			sourceTree = "<group>";
+		};
+		758A4E6A2BE38A49005E7B5A /* Crypto */ = {
+			isa = PBXGroup;
+			children = (
+				758A4E6B2BE38A5E005E7B5A /* CryptData.swift */,
+				758A4E6D2BE38A5E005E7B5A /* String+PemCert.swift */,
+				758A4E6C2BE38A5E005E7B5A /* String+sha512.swift */,
+			);
+			path = Crypto;
+			sourceTree = "<group>";
+		};
+		758A4E752BE38A84005E7B5A /* UICustomization */ = {
+			isa = PBXGroup;
+			children = (
+				758A4E762BE38A88005E7B5A /* ThreeDSButtonCustomization.swift */,
+				758A4E792BE38A89005E7B5A /* ThreeDSCustomization.swift */,
+				758A4E772BE38A89005E7B5A /* ThreeDSLabelCustomization.swift */,
+				758A4E7B2BE38A89005E7B5A /* ThreeDSTextBoxCustomization.swift */,
+				758A4E782BE38A89005E7B5A /* ThreeDSToolbarCustomization.swift */,
+				758A4E7A2BE38A89005E7B5A /* ThreeDSUICustomization.swift */,
+			);
+			path = UICustomization;
+			sourceTree = "<group>";
+		};
+		758A4E872BE38AE8005E7B5A /* 3DS */ = {
+			isa = PBXGroup;
+			children = (
+				758A4E8B2BE38AFD005E7B5A /* AuthorizingPaymentTests.swift */,
+				758A4E882BE38AFD005E7B5A /* NetceteraThreeDSControllerTests.swift */,
+				758A4E8F2BE38AFD005E7B5A /* SHA512Tests.swift */,
+				758A4E8E2BE38AFD005E7B5A /* ThreeDSButtonCustomizationTests.swift */,
+				758A4E8A2BE38AFD005E7B5A /* UICustomizationTests.swift */,
+			);
+			path = 3DS;
+			sourceTree = "<group>";
+		};
+		758A4EA42BE9D599005E7B5A /* Typedefs */ = {
+			isa = PBXGroup;
+			children = (
+				758A4EA52BE9D5C0005E7B5A /* Closures.swift */,
+			);
+			path = Typedefs;
+			sourceTree = "<group>";
+		};
 		75CFC4EF2B753AB900422A8F /* JSON Models */ = {
 			isa = PBXGroup;
 			children = (
@@ -893,8 +990,8 @@
 		75D13DFA2B866CF40073A831 /* Authorizing Payment */ = {
 			isa = PBXGroup;
 			children = (
-				8A188BAF1D951E3C00FFF467 /* AuthorizingPaymentViewController.swift */,
-				750126782B95A34000ED5E14 /* AuthorizingPaymentViewController.xib */,
+				8A188BAF1D951E3C00FFF467 /* AuthorizingPaymentWebViewController.swift */,
+				750126782B95A34000ED5E14 /* AuthorizingPaymentWebViewController.xib */,
 			);
 			path = "Authorizing Payment";
 			sourceTree = "<group>";
@@ -976,13 +1073,14 @@
 		75E0EB872B7BCEA000E3198A /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				75348D4C29C3FC8F0008C8A3 /* ToolKit */,
+				758A4E682BE389B2005E7B5A /* 3DS */,
 				75E0EBBD2B7D0DB600E3198A /* Components */,
 				75E0EB942B7BD00F00E3198A /* Models */,
 				75E0EBBF2B7D13D200E3198A /* OmiseAPI */,
 				75D13DEE2B866BCA0073A831 /* Views */,
 				75CFC4D12B73AFD500422A8F /* OmiseSDK.swift */,
 				757E14342BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift */,
+				758A4EA72BE9D722005E7B5A /* AuthorizingPaymentDelegate.swift */,
 				755CD9222BA2000600E8FCDA /* ClientProtocol.swift */,
 			);
 			path = Sources;
@@ -1103,6 +1201,8 @@
 		987A02CA1CE35D5E0035417A /* OmiseSDKTests */ = {
 			isa = PBXGroup;
 			children = (
+				758A4E9E2BE3DFDF005E7B5A /* URL+PathComponentsTests.swift */,
+				758A4E872BE38AE8005E7B5A /* 3DS */,
 				757B0A722AD71DCD00DEAE8F /* OmiseUnitTestKit */,
 				987A02CD1CE35D5E0035417A /* Info.plist */,
 				987A03AC1CE5CD450035417A /* Fixtures */,
@@ -1167,6 +1267,7 @@
 			);
 			name = OmiseSDK;
 			packageProductDependencies = (
+				758A4E832BE38AC3005E7B5A /* ThreeDS_SDK */,
 			);
 			productName = OmiseSDK;
 			productReference = 225931181CE3210700841B86 /* OmiseSDK.framework */;
@@ -1232,6 +1333,7 @@
 			name = OmiseSDKTests;
 			packageProductDependencies = (
 				757B0A732AD71E3100DEAE8F /* OmiseUnitTestKit */,
+				758A4E852BE38AD0005E7B5A /* ThreeDS_SDK */,
 			);
 			productName = OmiseSDKTests;
 			productReference = 987A02C91CE35D5E0035417A /* OmiseSDKTests.xctest */;
@@ -1279,6 +1381,9 @@
 				Base,
 			);
 			mainGroup = 2259310E1CE3210700841B86;
+			packageReferences = (
+				758A4E822BE38AC3005E7B5A /* XCRemoteSwiftPackageReference "SPM" */,
+			);
 			productRefGroup = 225931191CE3210700841B86 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -1301,7 +1406,7 @@
 				75D13E1B2B86FD2D0073A831 /* CCVInfoController.xib in Resources */,
 				75405AA82A27F97E008C21F6 /* Localizable.strings in Resources */,
 				7501266E2B8A411C00ED5E14 /* FPXPaymentFormController.xib in Resources */,
-				750126792B95A34000ED5E14 /* AuthorizingPaymentViewController.xib in Resources */,
+				750126792B95A34000ED5E14 /* AuthorizingPaymentWebViewController.xib in Resources */,
 				8A776647214A5FC60029D166 /* NoticeView.xib in Resources */,
 				2225B3541D0FDD63003EB396 /* Assets.xcassets in Resources */,
 				8AF5517A213D4C0100D61C98 /* Localizable.stringsdict in Resources */,
@@ -1384,6 +1489,7 @@
 				73F9BA4B25E6053700F55CA8 /* FPXPaymentFormController.swift in Sources */,
 				98FF99BB2577789800476487 /* Configuration.swift in Sources */,
 				759C7EC02B7DC7F50029D555 /* SourceType+MobileBanking.swift in Sources */,
+				758A4EA82BE9D722005E7B5A /* AuthorizingPaymentDelegate.swift in Sources */,
 				75B420612B776D8A0036134D /* APIProtocol.swift in Sources */,
 				75CFC4D22B73AFD500422A8F /* OmiseSDK.swift in Sources */,
 				75131F862AC2BD9D008BCB17 /* UIViewController+NavigationBarStyle.swift in Sources */,
@@ -1406,6 +1512,7 @@
 				75CFC4EE2B7537BC00422A8F /* Client+URLRequest.swift in Sources */,
 				75D13DAC2B83B58B0073A831 /* Source.Payment.EContext.swift in Sources */,
 				75D13D8C2B8385820073A831 /* UIBarButtonItem+Helpers.swift in Sources */,
+				758A4E7C2BE38A89005E7B5A /* ThreeDSButtonCustomization.swift in Sources */,
 				75E0EBA22B7BD02200E3198A /* Token.Card.swift in Sources */,
 				75405A8B2A26340E008C21F6 /* UIStackView+Helpers.swift in Sources */,
 				75D13DA82B83B58B0073A831 /* Source.Payment.DuitNowOBW.swift in Sources */,
@@ -1419,9 +1526,10 @@
 				8AF9857121479F38007E18ED /* CCVInfoController.swift in Sources */,
 				75E0EB7C2B7B410600E3198A /* Client+NetworkService.swift in Sources */,
 				75D13D602B807AC90073A831 /* ChoosePaymentCoordinator.swift in Sources */,
+				758A4E7D2BE38A89005E7B5A /* ThreeDSLabelCustomization.swift in Sources */,
 				75D13DB42B83B71D0073A831 /* DuitNowOBW.Bank+ViewPresentable.swift in Sources */,
 				75405A7C2A25EC88008C21F6 /* Array+Helpers.swift in Sources */,
-				8A188BB01D951E3C00FFF467 /* AuthorizingPaymentViewController.swift in Sources */,
+				8A188BB01D951E3C00FFF467 /* AuthorizingPaymentWebViewController.swift in Sources */,
 				75D13DFC2B866DFE0073A831 /* PaymentCreatorController.swift in Sources */,
 				14ACEF831D02D641001C5319 /* CardExpiryDatePicker.swift in Sources */,
 				75CFC4F32B753BCD00422A8F /* Capability.PaymentMethod.swift in Sources */,
@@ -1439,29 +1547,37 @@
 				986406301CFEA7E4004BCF51 /* CardCVVTextField.swift in Sources */,
 				75D13DAA2B83B58B0073A831 /* Source.Payment.Installment.swift in Sources */,
 				75D13DD62B8653360073A831 /* UIControl.State+Hashable.swift in Sources */,
+				758A4E7F2BE38A89005E7B5A /* ThreeDSCustomization.swift in Sources */,
 				751E7BEC2B7F7CE50031B4A2 /* ViewPresentable.swift in Sources */,
 				751E7BEA2B7F77120031B4A2 /* Localized+Omise.swift in Sources */,
 				75D13DA52B83B58B0073A831 /* Source.swift in Sources */,
 				22445FFC1CF41DD300801D0F /* Globals.swift in Sources */,
+				758A4E702BE38A5F005E7B5A /* String+PemCert.swift in Sources */,
 				7501265F2B8893C900ED5E14 /* PaymentFormController.swift in Sources */,
 				756C8F222A40694F00D53059 /* CreditCardPaymentViewContext.swift in Sources */,
 				751E7BF02B7FBA760031B4A2 /* UIColor+Omise.swift in Sources */,
 				751E7BF22B7FC90C0031B4A2 /* SourceType+Collections.swift in Sources */,
 				750126722B8A49BC00ED5E14 /* FPX.Bank+ViewPresentable.swift in Sources */,
+				758A4E812BE38A89005E7B5A /* ThreeDSTextBoxCustomization.swift in Sources */,
 				75D13DE42B8666CC0073A831 /* SelectSourceTypeDelegate.swift in Sources */,
 				75CFC4DD2B73F75C00422A8F /* OmiseAPI.swift in Sources */,
 				75348D4E29C3FCC70008C8A3 /* Bundle+OmiseSDK.swift in Sources */,
 				755CD9232BA2000600E8FCDA /* ClientProtocol.swift in Sources */,
 				757E14352BD61DFE005F08AD /* ChoosePaymentMethodDelegate.swift in Sources */,
+				758A4E802BE38A89005E7B5A /* ThreeDSUICustomization.swift in Sources */,
 				75E0EB9D2B7BD00F00E3198A /* CardBrand.swift in Sources */,
+				758A4EA62BE9D5C0005E7B5A /* Closures.swift in Sources */,
+				758A4E6E2BE38A5F005E7B5A /* CryptData.swift in Sources */,
 				75E0EB9A2B7BD00F00E3198A /* Currency.swift in Sources */,
 				75405A9C2A266F50008C21F6 /* AtomePaymentFormViewModel.swift in Sources */,
 				75D13DA72B83B58B0073A831 /* Source.Payment.BarcodeAlipay.swift in Sources */,
 				75CFC4DB2B73F5AF00422A8F /* NetworkService.swift in Sources */,
+				758A4E6F2BE38A5F005E7B5A /* String+sha512.swift in Sources */,
 				75E0EBA32B7BD02200E3198A /* Token.swift in Sources */,
 				75405A932A26340E008C21F6 /* UIButton+Helpers.swift in Sources */,
 				751E7BD92B7E5D130031B4A2 /* PaymentMethod.swift in Sources */,
 				754B78182B8741CD00973B71 /* TapGestureHandler.swift in Sources */,
+				758A4E742BE38A7E005E7B5A /* NetceteraConfig.swift in Sources */,
 				75D13DCB2B8531D20073A831 /* Assets.swift in Sources */,
 				986406321CFEA7E4004BCF51 /* CardNumberTextField.swift in Sources */,
 				750126742B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift in Sources */,
@@ -1482,6 +1598,7 @@
 				75E0EBBB2B7BD02F00E3198A /* SourceType.swift in Sources */,
 				75D13DAF2B83B58B0073A831 /* Source.Payment.Atome.swift in Sources */,
 				75CFC4F12B753B0F00422A8F /* Capability.swift in Sources */,
+				758A4E7E2BE38A89005E7B5A /* ThreeDSToolbarCustomization.swift in Sources */,
 				75CFC4CE2B73AF0E00422A8F /* Client.swift in Sources */,
 				7502CA622A31A7E100766E7D /* CountryListViewModelProtocol.swift in Sources */,
 				75D13DC12B8400610073A831 /* SelectPaymentMethodViewModel.swift in Sources */,
@@ -1491,6 +1608,7 @@
 				755CD9212BA1C81600E8FCDA /* UIViewController+KeyboardAppearance.swift in Sources */,
 				8AEF7804224CABF800787470 /* EContextPaymentFormController.swift in Sources */,
 				75D13DC92B8529790073A831 /* SelectSourceTypePaymentViewModel.swift in Sources */,
+				758A4E732BE38A7E005E7B5A /* NetceteraThreeDSController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1539,18 +1657,23 @@
 			buildActionMask = 2147483647;
 			files = (
 				7509D4E02A1AA1450050AB38 /* AtomeFormViewControllerTests.swift in Sources */,
+				758A4E962BE38AFD005E7B5A /* ThreeDSButtonCustomizationTests.swift in Sources */,
+				758A4E902BE38AFD005E7B5A /* NetceteraThreeDSControllerTests.swift in Sources */,
 				7509D4E42A1C89F10050AB38 /* AtomeFormViewModelMockup.swift in Sources */,
 				750708F42B7A765500A48DD0 /* OmiseSDKTests.swift in Sources */,
 				75E0EB7E2B7B5EE400E3198A /* CreateTokenPayloadTests.swift in Sources */,
 				75E0EB712B7A904100E3198A /* SourceFlowTests.swift in Sources */,
 				75E0EB832B7B79E700E3198A /* CapabilityTests.swift in Sources */,
 				F615CBF8261565D600E1A2D9 /* CardExpiryDatePickerTests.swift in Sources */,
+				758A4E9F2BE3DFDF005E7B5A /* URL+PathComponentsTests.swift in Sources */,
+				758A4E922BE38AFD005E7B5A /* UICustomizationTests.swift in Sources */,
 				75E0EB722B7A962600E3198A /* CreateSourcePayloadTests.swift in Sources */,
 				753279382A31B40F008048AD /* CountryListViewModelMockup.swift in Sources */,
 				7509D4E72A1C8E3D0050AB38 /* AtomeFormViewModelTests.swift in Sources */,
 				7509D4E22A1C876B0050AB38 /* AtomeFormViewContextMockup.swift in Sources */,
 				750708E32B790B8300A48DD0 /* String+JSON.swift in Sources */,
 				750708E52B790BD600A48DD0 /* SampleData.swift in Sources */,
+				758A4E972BE38AFD005E7B5A /* SHA512Tests.swift in Sources */,
 				750708E02B7909BB00A48DD0 /* SourceTests.swift in Sources */,
 				75CFC4D42B73B21100422A8F /* ClientTests.swift in Sources */,
 			);
@@ -2049,6 +2172,17 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCRemoteSwiftPackageReference section */
+		758A4E822BE38AC3005E7B5A /* XCRemoteSwiftPackageReference "SPM" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/ios-3ds-sdk/SPM.git";
+			requirement = {
+				kind = exactVersion;
+				version = 2.4.12;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
 		7509D4ED2A1D1F9F0050AB38 /* OmiseTestSDK */ = {
 			isa = XCSwiftPackageProductDependency;
@@ -2058,6 +2192,16 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = OmiseUnitTestKit;
 		};
+		758A4E832BE38AC3005E7B5A /* ThreeDS_SDK */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 758A4E822BE38AC3005E7B5A /* XCRemoteSwiftPackageReference "SPM" */;
+			productName = ThreeDS_SDK;
+		};
+		758A4E852BE38AD0005E7B5A /* ThreeDS_SDK */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 758A4E822BE38AC3005E7B5A /* XCRemoteSwiftPackageReference "SPM" */;
+			productName = ThreeDS_SDK;
+		};
 		75D13E0E2B8678530073A831 /* OmiseSwiftUIKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = OmiseSwiftUIKit;
diff --git a/dev.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/dev.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..7076d741
--- /dev/null
+++ b/dev.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "ThreeDS_SDK",
+        "repositoryURL": "https://github.com/ios-3ds-sdk/SPM.git",
+        "state": {
+          "branch": null,
+          "revision": "39a95346b6fdc4cec79f8a541201347bbcbabf9d",
+          "version": "2.4.12"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

From 4f331bbed35b85c29416d4fcbad2e515ea2e2ff7 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Tue, 7 May 2024 11:25:52 +0700
Subject: [PATCH 06/19] Remove debug output

---
 OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift b/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
index 01f70a1b..e2fa7723 100644
--- a/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
+++ b/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
@@ -276,12 +276,10 @@ private extension NetceteraThreeDSController {
             do {
                 let decoder = JSONDecoder()
                 let response = try decoder.decode(AuthResponse.self, from: data)
-                print(response)
                 onAuthResponse(response)
 
             } catch {
                 onAuthResponse(nil)
-                print(error)
             }
 
         }

From 6e56f1443349e53db82c2b9f400032bdfe62b187 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Tue, 7 May 2024 11:28:23 +0700
Subject: [PATCH 07/19] Remove debug config data

---
 ExampleApp/Config.local.plist | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/ExampleApp/Config.local.plist b/ExampleApp/Config.local.plist
index c8c0b8ee..5538ecee 100644
--- a/ExampleApp/Config.local.plist
+++ b/ExampleApp/Config.local.plist
@@ -3,21 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>publicKey</key>
-	<string>pkey_5unb23qvo9l4x3onvym</string>
-	<key>devMode</key>
-	<true/>
-	<key>devVaultBaseURL</key>
-	<string>https://vault.staging-omise.co</string>
-	<key>devApiBaseURL</key>
-	<string>https://api.staging-omise.co</string>
-	<key>pk_anna</key>
-	<string>pkey_5unb23qvo9l4x3onvym</string>
-	<key>PKeys</key>
-	<dict>
-		<key>pkey_5unb23qvo9l4x3onvym</key>
-		<string>skey_5ushbvxvvcvkrfd2cnw</string>
-	</dict>
-	<key>netceteraAPIKey</key>
-	<string>9a607320-f11d-43ed-abb0-41a1557522cd</string>
+	<string>pkey_</string>
 </dict>
 </plist>

From 22d5bfbaf9ca7a1756d5d36bbcdc54290b442ae3 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Fri, 10 May 2024 09:29:44 +0700
Subject: [PATCH 08/19] Add installmentWhiteLabelKBank,
 installmentWhiteLabelSCB and installmentWhiteLabelBBL payments

---
 OmiseSDK/Resources/en.lproj/Localizable.strings     |  3 +++
 OmiseSDK/Resources/ja.lproj/Localizable.strings     |  3 +++
 OmiseSDK/Resources/th.lproj/Localizable.strings     |  3 +++
 .../Source/Source.Payment.Installment.swift         |  6 +++---
 .../SourceType/SourceType+Installments.swift        |  5 ++++-
 .../Sources/OmiseAPI/SourceType/SourceType.swift    |  6 ++++++
 .../ChoosePaymentCoordinator.swift                  | 13 ++++++++++---
 .../SourceType+ViewPresentable.swift                | 12 ++++++------
 8 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/OmiseSDK/Resources/en.lproj/Localizable.strings b/OmiseSDK/Resources/en.lproj/Localizable.strings
index c7ac4e4d..df971010 100644
--- a/OmiseSDK/Resources/en.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/en.lproj/Localizable.strings
@@ -21,6 +21,9 @@
 "SourceType.installment_ttb" = "TMBThanachart Bank";
 "SourceType.installment_uob" = "United Overseas Bank";
 "SourceType.installment_wlb_ktc" = "KTC";
+"SourceType.installment_wlb_kbank" = "Kasikorn Bank";
+"SourceType.installment_wlb_scb" = "Siam Commercial Bank";
+"SourceType.installment_wlb_bbl" = "Bangkok Bank";
 "SourceType.internet_banking_bay" = "Bank of Ayudhya";
 "SourceType.internet_banking_bbl" = "Bangkok Bank";
 "SourceType.paynow" = "PayNow";
diff --git a/OmiseSDK/Resources/ja.lproj/Localizable.strings b/OmiseSDK/Resources/ja.lproj/Localizable.strings
index ec0913eb..f7f02067 100644
--- a/OmiseSDK/Resources/ja.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/ja.lproj/Localizable.strings
@@ -21,6 +21,9 @@
 "SourceType.installment_ttb" = "TMBタナチャート銀行";
 "SourceType.installment_uob" = "ユナイテッド・オーバーシーズ銀行";
 "SourceType.installment_wlb_ktc" = "クルンタイカード";
+"SourceType.installment_wlb_kbank" = "カシコン銀行";
+"SourceType.installment_wlb_scb" = "サイアム・コマーシャル銀行";
+"SourceType.installment_wlb_bbl" = "バンコク銀行";
 "SourceType.internet_banking_bay" = "アユタヤ銀行";
 "SourceType.internet_banking_bbl" = "バンコク銀行";
 "SourceType.paynow" = "PayNow";
diff --git a/OmiseSDK/Resources/th.lproj/Localizable.strings b/OmiseSDK/Resources/th.lproj/Localizable.strings
index 54efcc61..8f862170 100644
--- a/OmiseSDK/Resources/th.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/th.lproj/Localizable.strings
@@ -21,6 +21,9 @@
 "SourceType.installment_ttb" = "ธนาคารทีเอ็มบีธนชาต";
 "SourceType.installment_uob" = "ธนาคารยูโอบี";
 "SourceType.installment_wlb_ktc" = "เคทีซี";
+"SourceType.installment_wlb_kbank" = "ธนาคารกสิกรไทย";
+"SourceType.installment_wlb_scb" = "ธนาคารไทยพาณิชย์";
+"SourceType.installment_wlb_bbl" = "ธนาคารกรุงเทพ";
 "SourceType.internet_banking_bay" = "ธนาคารกรุงศรีอยุธยา";
 "SourceType.internet_banking_bbl" = "ธนาคารกรุงเทพ";
 "SourceType.paynow" = "เพย์นาว";
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift
index 7e9ab986..c08800a5 100644
--- a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
@@ -31,15 +31,15 @@ extension Source.Payment.Installment {
             return [ 3, 4, 6, 9, 10 ]
         case .installmentFirstChoice:
             return [ 3, 4, 6, 9, 10, 12, 18, 24, 36 ]
-        case .installmentBBL:
+        case .installmentBBL, .installmentWhiteLabelBBL:
             return [ 4, 6, 8, 9, 10 ]
         case .installmentMBB:
             return [ 6, 12, 18, 24 ]
         case .installmentKTC, .installmentWhiteLabelKTC:
             return [ 3, 4, 5, 6, 7, 8, 9, 10 ]
-        case .installmentKBank:
+        case .installmentKBank, .installmentWhiteLabelKBank:
             return [ 3, 4, 6, 10 ]
-        case .installmentSCB:
+        case .installmentSCB, .installmentWhiteLabelSCB:
             return [ 3, 4, 6, 9, 10 ]
         case .installmentTTB:
             return [ 3, 4, 6, 10, 12 ]
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
index 2e64b15e..7e25b8da 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
@@ -17,7 +17,10 @@ extension SourceType {
 
     public static var whiteLabelInstallments: [SourceType] {
         [
-            .installmentWhiteLabelKTC
+            .installmentWhiteLabelKTC,
+            .installmentWhiteLabelKBank,
+            .installmentWhiteLabelSCB,
+            .installmentWhiteLabelBBL
         ]
     }
 
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
index 76bec895..90f53565 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
@@ -52,6 +52,12 @@ public enum SourceType: String, Codable, CaseIterable {
     case installmentUOB = "installment_uob"
     /// Krungthai Card (KTC)  https://docs.opn.ooo/installment-white-label-payments
     case installmentWhiteLabelKTC = "installment_wlb_ktc"
+    /// Kasikorn Bank  https://docs.opn.ooo/installment-white-label-payments
+    case installmentWhiteLabelKBank = "installment_wlb_kbank"
+    /// Siam Commercial Bank  https://docs.opn.ooo/installment-white-label-payments
+    case installmentWhiteLabelSCB = "installment_wlb_scb"
+    /// Bangkok Bank https://docs.opn.ooo/installment-white-label-payments
+    case installmentWhiteLabelBBL = "installment_wlb_bbl"
     /// Bank of Ayudhya (Krungsri)   https://docs.opn.ooo/internet-banking
     case internetBankingBAY = "internet_banking_bay"
     /// Bangkok Bank   https://docs.opn.ooo/internet-banking
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift
index 0959bf50..14ce8881 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
@@ -107,9 +107,16 @@ class ChoosePaymentCoordinator: NSObject, ViewAttachable {
     func createInstallmentController() -> SelectPaymentController {
         var sourceTypes = client.latestLoadedCapability?.availableSourceTypes(SourceType.installments) ?? []
 
-        // Remove .installmentKTC if .installmentWhiteLabelKTC is present
-        if sourceTypes.contains(.installmentWhiteLabelKTC) {
-            sourceTypes.removeAll { $0 == .installmentKTC }
+        let filter: [SourceType: SourceType] = [
+            .installmentWhiteLabelKTC: .installmentKTC,
+            .installmentWhiteLabelKBank: .installmentKBank,
+            .installmentWhiteLabelSCB: .installmentSCB,
+            .installmentWhiteLabelBBL: .installmentBBL
+        ]
+        
+        for (keepingSourceType, removingSourceType) in filter 
+            where sourceTypes.contains(keepingSourceType) {
+            sourceTypes.removeAll { $0 == removingSourceType }
         }
 
         let viewModel = SelectSourceTypePaymentViewModel(
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift
index bd0a6df3..0fb67c0f 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
@@ -48,17 +48,17 @@ extension SourceType: ViewPresentable {
             return "GrabPay"
         case .installmentBAY:
             return "Krungsri"
-        case .installmentBBL:
+        case .installmentBBL, .installmentWhiteLabelBBL:
             return "Bangkok Bank"
         case .installmentFirstChoice:
             return "Krungsri First Choice"
-        case .installmentKBank:
+        case .installmentKBank, .installmentWhiteLabelKBank:
             return "Kasikorn"
         case .installmentKTC:
             return "KTC"
         case .installmentMBB:
             return "MayBank"
-        case .installmentSCB:
+        case .installmentSCB, .installmentWhiteLabelSCB:
             return "Siam Commercial Bank"
         case .installmentTTB:
             return "TMBThanachart Bank"
@@ -145,17 +145,17 @@ extension SourceType: ViewPresentable {
             return "Grab"
         case .installmentBAY:
             return "BAY"
-        case .installmentBBL:
+        case .installmentBBL, .installmentWhiteLabelBBL:
             return "BBL"
         case .installmentFirstChoice:
             return "First Choice"
-        case .installmentKBank:
+        case .installmentKBank, .installmentWhiteLabelKBank:
             return "KBANK"
         case .installmentKTC, .installmentWhiteLabelKTC:
             return "KTC"
         case .installmentMBB:
             return "FPX/maybank"
-        case .installmentSCB:
+        case .installmentSCB, .installmentWhiteLabelSCB:
             return "SCB"
         case .installmentTTB:
             return "ttb"

From 366bac991795f29555a294763907d1bc6ddb8781 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Mon, 13 May 2024 16:41:56 +0700
Subject: [PATCH 09/19] By default payment method provided are verified by
 presence in capability

---
 ExampleApp/Views/ProductDetailViewController.swift | 1 -
 OmiseSDK/Sources/OmiseSDK.swift                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
index c2938aa3..351f9d58 100644
--- a/ExampleApp/Views/ProductDetailViewController.swift
+++ b/ExampleApp/Views/ProductDetailViewController.swift
@@ -31,7 +31,6 @@ class ProductDetailViewController: BaseViewController {
             amount: paymentAmount,
             currency: paymentCurrencyCode,
             allowedPaymentMethods: usesCapabilityDataForPaymentMethods ? nil : allowedPaymentMethods,
-            skipCapabilityValidation: true,
             isCardPaymentAllowed: true,
             handleErrors: true,
             delegate: self
diff --git a/OmiseSDK/Sources/OmiseSDK.swift b/OmiseSDK/Sources/OmiseSDK.swift
index c070f75e..3ea86ba8 100644
--- a/OmiseSDK/Sources/OmiseSDK.swift
+++ b/OmiseSDK/Sources/OmiseSDK.swift
@@ -62,7 +62,7 @@ public class OmiseSDK {
         amount: Int64,
         currency: String,
         allowedPaymentMethods: [SourceType]? = nil,
-        skipCapabilityValidation: Bool = true,
+        skipCapabilityValidation: Bool = false,
         isCardPaymentAllowed: Bool = true,
         handleErrors: Bool = true,
         delegate: ChoosePaymentMethodDelegate

From 312e1371429b90d05fa81bdced0419456b74a996 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Tue, 14 May 2024 10:12:15 +0700
Subject: [PATCH 10/19] Update simulator version for unit tests in github
 actions

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b12eb09a..31b0e5a2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Run xcodebuild with tests
-      run: xcodebuild -project dev.xcodeproj/ -scheme OmiseSDK -derivedDataPath Build/ -destination 'platform=iOS Simulator,name=iPhone 11,OS=16.2' -enableCodeCoverage YES clean build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+      run: xcodebuild -project dev.xcodeproj/ -scheme OmiseSDK -derivedDataPath Build/ -destination 'platform=iOS Simulator,name=iPhone 14,OS=17.5' -enableCodeCoverage YES clean build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
 
     - name: Convert Xcode coverage to SonarCloud format
       run: bash xccov-to-sonarqube-generic.sh build/Logs/Test/*.xcresult/ > sonarqube-generic-coverage.xml

From 2a29c75039396c37c79b5fb7a42087f35f43e5c4 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Tue, 14 May 2024 10:28:02 +0700
Subject: [PATCH 11/19] Clean swiftlint warning

---
 .../Choose Payment Methods/ChoosePaymentCoordinator.swift       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift
index 14ce8881..80e139e9 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
@@ -114,7 +114,7 @@ class ChoosePaymentCoordinator: NSObject, ViewAttachable {
             .installmentWhiteLabelBBL: .installmentBBL
         ]
         
-        for (keepingSourceType, removingSourceType) in filter 
+        for (keepingSourceType, removingSourceType) in filter
             where sourceTypes.contains(keepingSourceType) {
             sourceTypes.removeAll { $0 == removingSourceType }
         }

From f8e93b09e10689b6614204369e6d7d20bc916cfe Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Tue, 14 May 2024 15:35:07 +0700
Subject: [PATCH 12/19] Add white-label installments: BAY, FirstChoice, TTB

---
 .../Views/ProductDetailViewController.swift   |   2 +-
 .../Resources/en.lproj/Localizable.strings    |   3 +
 .../Resources/ja.lproj/Localizable.strings    |   3 +
 .../Source/Source.Payment.Installment.swift   |  24 +++-
 .../SourceType/SourceType+Installments.swift  |   5 +-
 .../OmiseAPI/SourceType/SourceType.swift      |   6 +
 .../ChoosePaymentCoordinator+Helpers.swift    |   6 +-
 .../ChoosePaymentCoordinator.swift            |   5 +-
 .../SourceType+ViewPresentable.swift          | 105 +-----------------
 .../CreditCardPaymentController.swift         |   1 +
 10 files changed, 50 insertions(+), 110 deletions(-)

diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
index 351f9d58..112707c1 100644
--- a/ExampleApp/Views/ProductDetailViewController.swift
+++ b/ExampleApp/Views/ProductDetailViewController.swift
@@ -128,7 +128,7 @@ extension ProductDetailViewController: ChoosePaymentMethodDelegate {
         print("White-label installment payment Token is created with id '\(token.id)', Source id: '\(source.id)'")
         omiseSDK.dismiss {
             let alertController = UIAlertController(
-                title: "Token & Source Created",
+                title: "Token & Source Created\n(\(source.paymentInformation.sourceType.rawValue))",
                 message: "A token with id of \(token.id) and source with id of \(source.id) was successfully created. Please send this id to server to create a charge.",
                 preferredStyle: .alert
             )
diff --git a/OmiseSDK/Resources/en.lproj/Localizable.strings b/OmiseSDK/Resources/en.lproj/Localizable.strings
index df971010..c28e3cae 100644
--- a/OmiseSDK/Resources/en.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/en.lproj/Localizable.strings
@@ -24,6 +24,9 @@
 "SourceType.installment_wlb_kbank" = "Kasikorn Bank";
 "SourceType.installment_wlb_scb" = "Siam Commercial Bank";
 "SourceType.installment_wlb_bbl" = "Bangkok Bank";
+"SourceType.installment_wlb_bay" = "Krungsri";
+"SourceType.installment_wlb_first_choice" = "Krungsri First Choice";
+"SourceType.installment_wlb_ttb" = "TMBThanachart Bank";
 "SourceType.internet_banking_bay" = "Bank of Ayudhya";
 "SourceType.internet_banking_bbl" = "Bangkok Bank";
 "SourceType.paynow" = "PayNow";
diff --git a/OmiseSDK/Resources/ja.lproj/Localizable.strings b/OmiseSDK/Resources/ja.lproj/Localizable.strings
index f7f02067..85ab2bf8 100644
--- a/OmiseSDK/Resources/ja.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/ja.lproj/Localizable.strings
@@ -24,6 +24,9 @@
 "SourceType.installment_wlb_kbank" = "カシコン銀行";
 "SourceType.installment_wlb_scb" = "サイアム・コマーシャル銀行";
 "SourceType.installment_wlb_bbl" = "バンコク銀行";
+"SourceType.installment_wlb_bay" = "クルンシィ";
+"SourceType.installment_wlb_first_choice" = "クルンシィ・ファーストチョイス";
+"SourceType.installment_wlb_ttb" = "TMBタナチャート銀行";
 "SourceType.internet_banking_bay" = "アユタヤ銀行";
 "SourceType.internet_banking_bbl" = "バンコク銀行";
 "SourceType.paynow" = "PayNow";
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift
index c08800a5..367d69db 100644
--- a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
@@ -28,21 +28,35 @@ extension Source.Payment.Installment {
     public static func availableTerms(for sourceType: SourceType) -> [Int] {
         switch sourceType {
         case .installmentBAY:
+            return [ 3, 4, 6, 10 ]
+        case .installmentWhiteLabelBAY:
             return [ 3, 4, 6, 9, 10 ]
         case .installmentFirstChoice:
+            return [ 3, 4, 6, 10, 12, 18, 24, 36 ]
+        case .installmentWhiteLabelFirstChoice:
             return [ 3, 4, 6, 9, 10, 12, 18, 24, 36 ]
-        case .installmentBBL, .installmentWhiteLabelBBL:
-            return [ 4, 6, 8, 9, 10 ]
+        case .installmentBBL:
+            return [ 4, 6, 8, 10 ]
+        case .installmentWhiteLabelBBL:
+            return [ 4, 6, 8, 10 ]
         case .installmentMBB:
             return [ 6, 12, 18, 24 ]
-        case .installmentKTC, .installmentWhiteLabelKTC:
+        case .installmentKTC:
+            return [ 3, 4, 5, 6, 7, 8, 9, 10 ]
+        case .installmentWhiteLabelKTC:
             return [ 3, 4, 5, 6, 7, 8, 9, 10 ]
-        case .installmentKBank, .installmentWhiteLabelKBank:
+        case .installmentKBank:
             return [ 3, 4, 6, 10 ]
-        case .installmentSCB, .installmentWhiteLabelSCB:
+        case .installmentWhiteLabelKBank:
+            return [ 3, 6, 10 ]
+        case .installmentSCB:
+            return [ 3, 4, 6, 9, 10 ]
+        case .installmentWhiteLabelSCB:
             return [ 3, 4, 6, 9, 10 ]
         case .installmentTTB:
             return [ 3, 4, 6, 10, 12 ]
+        case .installmentWhiteLabelTTB:
+            return [ 4, 6, 10 ]
         case .installmentUOB:
             return [ 3, 4, 6, 10 ]
         default:
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
index 7e25b8da..4c1598ab 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
@@ -20,7 +20,10 @@ extension SourceType {
             .installmentWhiteLabelKTC,
             .installmentWhiteLabelKBank,
             .installmentWhiteLabelSCB,
-            .installmentWhiteLabelBBL
+            .installmentWhiteLabelBBL,
+            .installmentWhiteLabelBAY,
+            .installmentWhiteLabelFirstChoice,
+            .installmentWhiteLabelTTB
         ]
     }
 
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
index 90f53565..3f043a5e 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
@@ -58,6 +58,12 @@ public enum SourceType: String, Codable, CaseIterable {
     case installmentWhiteLabelSCB = "installment_wlb_scb"
     /// Bangkok Bank https://docs.opn.ooo/installment-white-label-payments
     case installmentWhiteLabelBBL = "installment_wlb_bbl"
+    /// Krungsri https://docs.opn.ooo/installment-white-label-payments
+    case installmentWhiteLabelBAY = "installment_wlb_bay"
+    /// Krungsri First Choice https://docs.opn.ooo/installment-white-label-payments
+    case installmentWhiteLabelFirstChoice = "installment_wlb_first_choice"
+    /// TMBThanachart Bank https://docs.opn.ooo/installment-white-label-payments
+    case installmentWhiteLabelTTB = "installment_wlb_ttb"
     /// Bank of Ayudhya (Krungsri)   https://docs.opn.ooo/internet-banking
     case internetBankingBAY = "internet_banking_bay"
     /// Bangkok Bank   https://docs.opn.ooo/internet-banking
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift
index 8a1c8dfe..2d26f257 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift	
@@ -89,9 +89,13 @@ extension ChoosePaymentCoordinator {
                     case .failure(let error):
                         self?.processError(error)
                     }
-                    completion()
                 }
             }
+            
+            DispatchQueue.main.async {
+                completion()
+            }
+
         }
     }
 }
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift
index 80e139e9..28aaf377 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
@@ -111,7 +111,10 @@ class ChoosePaymentCoordinator: NSObject, ViewAttachable {
             .installmentWhiteLabelKTC: .installmentKTC,
             .installmentWhiteLabelKBank: .installmentKBank,
             .installmentWhiteLabelSCB: .installmentSCB,
-            .installmentWhiteLabelBBL: .installmentBBL
+            .installmentWhiteLabelBBL: .installmentBBL,
+            .installmentWhiteLabelBAY: .installmentBAY,
+            .installmentWhiteLabelFirstChoice: .installmentFirstChoice,
+            .installmentWhiteLabelTTB: .installmentTTB
         ]
         
         for (keepingSourceType, removingSourceType) in filter
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift
index 0fb67c0f..a839ba24 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
@@ -6,7 +6,7 @@ extension SourceType: CustomStringConvertible {
 
 extension SourceType: ViewPresentable {
     public var localizedTitle: String {
-        localized("SourceType.\(self.rawValue)", text: title)
+        localized("SourceType.\(self.rawValue)")
     }
 
     public var localizedSubtitle: String? {
@@ -14,103 +14,6 @@ extension SourceType: ViewPresentable {
         return localized("SourceType.\(self.rawValue).subtitle", text: subtitle)
     }
 
-    public var title: String {
-        switch self {
-        case .alipay:
-            return "Alipay"
-        case .alipayCN:
-            return "Alipay CN"
-        case .alipayHK:
-            return "Alipay HK"
-        case .atome:
-            return "Atome"
-        case .barcodeAlipay:
-            return "Alipay In-Store"
-        case .billPaymentTescoLotus:
-            return "Tesco Lotus"
-        case .boost:
-            return "Boost"
-        case .dana:
-            return "DANA"
-        case .duitNowOBW:
-            return "DuitNow Online Banking/Wallets"
-        case .duitNowQR:
-            return "DuitNow QR"
-        case .eContext:
-            return "" // Doesn't have specific title
-        case .fpx:
-            return "FPX"
-        case .gcash:
-            return "GCash"
-        case .grabPay:
-            return "Grab"
-        case .grabPayRms:
-            return "GrabPay"
-        case .installmentBAY:
-            return "Krungsri"
-        case .installmentBBL, .installmentWhiteLabelBBL:
-            return "Bangkok Bank"
-        case .installmentFirstChoice:
-            return "Krungsri First Choice"
-        case .installmentKBank, .installmentWhiteLabelKBank:
-            return "Kasikorn"
-        case .installmentKTC:
-            return "KTC"
-        case .installmentMBB:
-            return "MayBank"
-        case .installmentSCB, .installmentWhiteLabelSCB:
-            return "Siam Commercial Bank"
-        case .installmentTTB:
-            return "TMBThanachart Bank"
-        case .installmentUOB:
-            return "United Overseas Bank"
-        case .installmentWhiteLabelKTC:
-            return "Krungthai Card (KTC)"
-        case .internetBankingBAY:
-            return "Bank of Ayudhya"
-        case .internetBankingBBL:
-            return "Bangkok Bank"
-        case .kakaoPay:
-            return "Kakao Pay"
-        case .maybankQRPay:
-            return "Maybank QRPay"
-        case .mobileBankingBAY:
-            return "KMA"
-        case .mobileBankingBBL:
-            return "Bualuang mBanking"
-        case .mobileBankingKBank:
-            return "K PLUS"
-        case .mobileBankingKTB:
-            return "Krungthai Next"
-        case .mobileBankingSCB:
-            return "SCB EASY"
-        case .ocbcDigital:
-            return "OCBC Digital"
-        case .payNow:
-            return "PayNow"
-        case .payPay:
-            return "PayPay"
-        case .promptPay:
-            return "PromptPay"
-        case .rabbitLinepay:
-            return "Rabbit LINE Pay"
-        case .shopeePay:
-            return "ShopeePay"
-        case .shopeePayJumpApp:
-            return "ShopeePay"
-        case .touchNGo:
-            return "Touch 'n Go"
-        case .touchNGoAlipayPlus:
-            return "TNG eWallet"
-        case .trueMoneyWallet:
-            return "TrueMoney Wallet"
-        case .trueMoneyJumpApp:
-            return "TrueMoney"
-        case .weChat:
-            return "WeChat Pay"
-        }
-    }
-
     public var iconName: String {
         switch self {
         case .alipay:
@@ -143,11 +46,11 @@ extension SourceType: ViewPresentable {
             return "Grab"
         case .grabPayRms:
             return "Grab"
-        case .installmentBAY:
+        case .installmentBAY, .installmentWhiteLabelBAY:
             return "BAY"
         case .installmentBBL, .installmentWhiteLabelBBL:
             return "BBL"
-        case .installmentFirstChoice:
+        case .installmentFirstChoice, .installmentWhiteLabelFirstChoice:
             return "First Choice"
         case .installmentKBank, .installmentWhiteLabelKBank:
             return "KBANK"
@@ -157,7 +60,7 @@ extension SourceType: ViewPresentable {
             return "FPX/maybank"
         case .installmentSCB, .installmentWhiteLabelSCB:
             return "SCB"
-        case .installmentTTB:
+        case .installmentTTB, .installmentWhiteLabelTTB:
             return "ttb"
         case .installmentUOB:
             return "uob"
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift
index eccd459f..fab1dcbb 100644
--- a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
@@ -462,6 +462,7 @@ class CreditCardPaymentController: UIViewController {
 //        delegate?.creditCardFormViewController(self, didFailWithError: error)
         displayError(error)
         hasErrorMessage = true
+        stopActivityIndicator()
     }
 
     func displayError(_ error: Error) {

From 4e703826180411904147c7e87b2977d1b46a2a1e Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Wed, 15 May 2024 10:21:37 +0700
Subject: [PATCH 13/19] Remove debug data and update github action simulator
 version

---
 .github/workflows/main.yml                                | 2 +-
 .../Credit Card Payment/CreditCardPaymentController.swift | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b12eb09a..31b0e5a2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Run xcodebuild with tests
-      run: xcodebuild -project dev.xcodeproj/ -scheme OmiseSDK -derivedDataPath Build/ -destination 'platform=iOS Simulator,name=iPhone 11,OS=16.2' -enableCodeCoverage YES clean build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+      run: xcodebuild -project dev.xcodeproj/ -scheme OmiseSDK -derivedDataPath Build/ -destination 'platform=iOS Simulator,name=iPhone 14,OS=17.5' -enableCodeCoverage YES clean build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
 
     - name: Convert Xcode coverage to SonarCloud format
       run: bash xccov-to-sonarqube-generic.sh build/Logs/Test/*.xcresult/ > sonarqube-generic-coverage.xml
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift
index 7547b725..eccd459f 100644
--- a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
@@ -171,14 +171,6 @@ class CreditCardPaymentController: UIViewController {
 
         contentView.adjustContentInsetOnKeyboardAppear()
 
-        // TODO: Remove
-        cardNumberTextField.text = "4761340000000076" // Challenge
-        //        cardNumberTextField.text = "5362684181065006" // Frictionless
-        //        cardNumberTextField.text = "4012000000001089" // Frictionless failed
-        cardNameTextField.text = "Omise Test"
-        expiryDateTextField.text = "05/24"
-        secureCodeTextField.text = "123"
-
         if let viewModel = viewModel {
             bind(to: viewModel)
         }

From 124cfa2e75a6ea4fcf8dea471cd64f87237e5396 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Wed, 15 May 2024 10:25:10 +0700
Subject: [PATCH 14/19] clean up swiftlint warnings

---
 OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift  | 2 +-
 OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift | 7 -------
 OmiseSDK/ToolKit/Typedefs/Closures.swift               | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift b/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
index e2fa7723..3db9fc89 100644
--- a/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
+++ b/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
@@ -267,7 +267,7 @@ private extension NetceteraThreeDSController {
         request.httpMethod = "POST"
         request.httpBody = bodyData
 
-        let task = URLSession.shared.dataTask(with: request) {(data, _, error) in
+        let task = URLSession.shared.dataTask(with: request) {(data, _, _) in
             guard let data = data else {
                 onAuthResponse(nil)
                 return
diff --git a/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift b/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift
index 50c9aef3..e464fa7b 100644
--- a/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift
+++ b/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift
@@ -34,13 +34,6 @@ extension NetworkService: NetworkServiceProtocol {
         let dataTask = session.dataTask(with: urlRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
 
-            print("urlRequest: \(urlRequest)")
-            if let data = data {
-                print("data: \(String(data: data, encoding: .utf8))")
-            }
-            print("response: \(response)")
-            print("error: \(error)")
-
             var result: Result<T, Error>
             if let error = error {
                 result = .failure(error)
diff --git a/OmiseSDK/ToolKit/Typedefs/Closures.swift b/OmiseSDK/ToolKit/Typedefs/Closures.swift
index eff9f19a..5d3a83df 100644
--- a/OmiseSDK/ToolKit/Typedefs/Closures.swift
+++ b/OmiseSDK/ToolKit/Typedefs/Closures.swift
@@ -2,4 +2,3 @@ import Foundation
 
 typealias VoidClosure = () -> Void
 typealias ParamClosure<T> = (T) -> Void
-

From 267cb343182539c300aba3629d19eca25f2c41a9 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Wed, 15 May 2024 10:53:52 +0700
Subject: [PATCH 15/19] Set threeDSRequestorAppURLString as required

---
 .../Views/ProductDetailViewController.swift   |  2 +-
 OmiseSDK/Sources/OmiseSDK.swift               | 23 ++++++++-----------
 .../AuthorizingPaymentWebViewController.swift |  6 ++---
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
index 4c707374..fad6c6f4 100644
--- a/ExampleApp/Views/ProductDetailViewController.swift
+++ b/ExampleApp/Views/ProductDetailViewController.swift
@@ -59,7 +59,7 @@ class ProductDetailViewController: BaseViewController {
             self.omiseSDK.presentAuthorizingPayment(
                 from: self,
                 authorizeURL: url,
-                expectedReturnURLPatterns: ["https://omise.co"],
+                expectedReturnURLStrings: ["https://omise.co"],
                 threeDSRequestorAppURLString: AppDeeplink.threeDSChallenge.urlString,
                 delegate: self
             )
diff --git a/OmiseSDK/Sources/OmiseSDK.swift b/OmiseSDK/Sources/OmiseSDK.swift
index 50c9d24c..b4bdac55 100644
--- a/OmiseSDK/Sources/OmiseSDK.swift
+++ b/OmiseSDK/Sources/OmiseSDK.swift
@@ -24,7 +24,7 @@ public class OmiseSDK {
 
     public private(set) weak var presentedViewController: UIViewController?
 
-    private var expectedReturnURLPatterns: [String] = []
+    private var expectedReturnURLStrings: [String] = []
 
     /// Creates a new instance of Omise SDK that provides interface to functionallity that SDK provides
     ///
@@ -140,7 +140,7 @@ public class OmiseSDK {
     ///    - from: ViewController is used to present Choose Payment Methods
     ///    - animated: Presents controller with animation if `true`
     ///    - authorizeURL: The authorize URL given in `Charge` object
-    ///    - expectedReturnURLPatterns: The expected return URL patterns for web view 3DS.
+    ///    - expectedReturnURLStrings: The expected return URL patterns for web view 3DS.
     ///    - threeDSRequestorAppURLString: 3DS requestor app URL string (deeplink).
     ///    - delegate: A delegate object that will recieved authorizing payment events.
     @available(iOSApplicationExtension, unavailable)
@@ -148,8 +148,8 @@ public class OmiseSDK {
         from topViewController: UIViewController,
         animated: Bool = true,
         authorizeURL: URL,
-        expectedReturnURLPatterns: [String],
-        threeDSRequestorAppURLString: String?,
+        expectedReturnURLStrings: [String],
+        threeDSRequestorAppURLString: String,
         threeDSUICustomization: ThreeDSUICustomization? = nil,
         delegate: AuthorizingPaymentDelegate
     ) {
@@ -158,8 +158,7 @@ public class OmiseSDK {
                 from: topViewController,
                 animated: animated,
                 authorizeURL: authorizeURL,
-                expectedReturnURLPatterns: expectedReturnURLPatterns,
-                threeDSRequestorAppURLString: threeDSRequestorAppURLString,
+                expectedReturnURLStrings: expectedReturnURLStrings,
                 delegate: delegate
             )
             return
@@ -188,8 +187,7 @@ public class OmiseSDK {
                                 from: topViewController,
                                 animated: animated,
                                 authorizeURL: authorizeURL,
-                                expectedReturnURLPatterns: expectedReturnURLPatterns,
-                                threeDSRequestorAppURLString: threeDSRequestorAppURLString,
+                                expectedReturnURLStrings: expectedReturnURLStrings,
                                 delegate: delegate
                             )
                         }
@@ -207,7 +205,7 @@ public class OmiseSDK {
     /// Handle URL Callback received by AppDelegate
     public func handleURLCallback(_ url: URL) -> Bool {
         // Will handle callback with 3ds library
-        let containsURL = expectedReturnURLPatterns
+        let containsURL = expectedReturnURLStrings
             .map {
                 url.match(string: $0)
             }
@@ -229,15 +227,14 @@ private extension OmiseSDK {
         from topViewController: UIViewController,
         animated: Bool = true,
         authorizeURL: URL,
-        expectedReturnURLPatterns: [String],
-        threeDSRequestorAppURLString: String?,
+        expectedReturnURLStrings: [String],
         delegate: AuthorizingPaymentDelegate
     ) {
         dismiss(animated: false)
 
         let viewController = AuthorizingPaymentWebViewController(nibName: nil, bundle: .omiseSDK)
         viewController.authorizeURL = authorizeURL
-        viewController.expectedReturnURLPatterns = expectedReturnURLPatterns.compactMap {
+        viewController.expectedReturnURLStrings = expectedReturnURLStrings.compactMap {
             URLComponents(string: $0)
         }
         viewController.completion = { [weak delegate] result in
@@ -263,6 +260,6 @@ private extension OmiseSDK {
         topViewController.present(navigationController, animated: animated, completion: nil)
         presentedViewController = navigationController
 
-        self.expectedReturnURLPatterns = expectedReturnURLPatterns
+        self.expectedReturnURLStrings = expectedReturnURLStrings
     }
 }
diff --git a/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.swift b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.swift
index 03e3882b..02600c78 100644
--- a/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentWebViewController.swift	
@@ -31,7 +31,7 @@ class AuthorizingPaymentWebViewController: UIViewController {
     ///
     /// The rule is the scheme and host must be matched and must have the path as a prefix.
     /// Example: if the return URL is `https://www.example.com/products/12345` the expected return URL should have a URLComponents with scheme of `https`, host of `www.example.com` and the path of `/products/`
-    var expectedReturnURLPatterns: [URLComponents] = []
+    var expectedReturnURLStrings: [URLComponents] = []
     
     var completion: ParamClosure<CompletionState>?
 
@@ -76,7 +76,7 @@ class AuthorizingPaymentWebViewController: UIViewController {
     }
     
     private func startAuthorizingPaymentProcess() {
-        guard let authorizeURL = authorizeURL, !expectedReturnURLPatterns.isEmpty else {
+        guard let authorizeURL = authorizeURL, !expectedReturnURLStrings.isEmpty else {
             assertionFailure("Insufficient authorizing payment information")
             os_log("Refusing to initialize sdk client with a non-public key: %{private}@", log: uiLogObject, type: .error)
             return
@@ -92,7 +92,7 @@ class AuthorizingPaymentWebViewController: UIViewController {
             return false
         }
         
-        return expectedReturnURLPatterns.contains { expectedURLComponents -> Bool in
+        return expectedReturnURLStrings.contains { expectedURLComponents -> Bool in
             components.match(components: expectedURLComponents)
         }
     }

From 4f1bbf9a0f0828c7531664276fc244fd8433a869 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Wed, 15 May 2024 15:40:10 +0700
Subject: [PATCH 16/19] Set Netcetera version to 4.2.0

---
 .../Views/ProductDetailViewController.swift   |  1 +
 .../3DS/NetceteraThreeDSController.swift      |  4 ++--
 OmiseSDK/Sources/OmiseSDK.swift               |  4 +++-
 .../CreditCardPaymentController.swift         |  8 +++++++
 Package.resolved                              | 16 ++++++++++++++
 Package.swift                                 |  7 ++++++-
 dev.xcodeproj/project.pbxproj                 | 21 ++++++++++++++++++-
 .../xcshareddata/swiftpm/Package.resolved     |  4 ++--
 8 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 Package.resolved

diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
index fad6c6f4..0476479e 100644
--- a/ExampleApp/Views/ProductDetailViewController.swift
+++ b/ExampleApp/Views/ProductDetailViewController.swift
@@ -76,6 +76,7 @@ extension ProductDetailViewController: AuthorizingPaymentDelegate {
         omiseSDK.dismiss()
     }
     func authorizingPaymentDidCancel() {
+        print("Payment is not authorized")
         omiseSDK.dismiss()
     }
 }
diff --git a/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift b/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
index 3db9fc89..459daf7a 100644
--- a/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
+++ b/OmiseSDK/Sources/3DS/NetceteraThreeDSController.swift
@@ -65,7 +65,7 @@ class NetceteraThreeDSController {
         case authResStatusUnknown(_ status: String)
     }
 
-    static var sharedController: NetceteraThreeDSControllerProtocol = NetceteraThreeDSController()
+//    static var sharedController: NetceteraThreeDSControllerProtocol = NetceteraThreeDSController()
     private static var uiCustomization: ThreeDSUICustomization?
 
     private var network = NetworkService()
@@ -79,7 +79,7 @@ class NetceteraThreeDSController {
         let scheme = Scheme(name: config.id)
         scheme.ids = [config.directoryServerId]
         scheme.encryptionKeyValue = formattedCert
-        scheme.rootCertificateValues = [formattedCert]
+        scheme.rootCertificateValue = formattedCert
         return scheme
     }
 
diff --git a/OmiseSDK/Sources/OmiseSDK.swift b/OmiseSDK/Sources/OmiseSDK.swift
index b4bdac55..307e88d1 100644
--- a/OmiseSDK/Sources/OmiseSDK.swift
+++ b/OmiseSDK/Sources/OmiseSDK.swift
@@ -25,6 +25,7 @@ public class OmiseSDK {
     public private(set) weak var presentedViewController: UIViewController?
 
     private var expectedReturnURLStrings: [String] = []
+    private var netceteraThreeDSController: NetceteraThreeDSController?
 
     /// Creates a new instance of Omise SDK that provides interface to functionallity that SDK provides
     ///
@@ -164,7 +165,8 @@ public class OmiseSDK {
             return
         }
 
-        NetceteraThreeDSController.sharedController.processAuthorizedURL(
+        netceteraThreeDSController = NetceteraThreeDSController()
+        netceteraThreeDSController?.processAuthorizedURL(
             authorizeURL,
             threeDSRequestorAppURL: threeDSRequestorAppURLString,
             uiCustomization: threeDSUICustomization,
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift
index eccd459f..7547b725 100644
--- a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
@@ -171,6 +171,14 @@ class CreditCardPaymentController: UIViewController {
 
         contentView.adjustContentInsetOnKeyboardAppear()
 
+        // TODO: Remove
+        cardNumberTextField.text = "4761340000000076" // Challenge
+        //        cardNumberTextField.text = "5362684181065006" // Frictionless
+        //        cardNumberTextField.text = "4012000000001089" // Frictionless failed
+        cardNameTextField.text = "Omise Test"
+        expiryDateTextField.text = "05/24"
+        secureCodeTextField.text = "123"
+
         if let viewModel = viewModel {
             bind(to: viewModel)
         }
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 00000000..b8079cd0
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "ThreeDS_SDK",
+        "repositoryURL": "https://github.com/ios-3ds-sdk/SPM",
+        "state": {
+          "branch": null,
+          "revision": "a4e55d7f10294ea81abd1db393ae05606a5efa46",
+          "version": "2.4.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
index 41fcedb4..83238631 100644
--- a/Package.swift
+++ b/Package.swift
@@ -15,10 +15,15 @@ let package = Package(
             targets: ["OmiseSDK"]
         )
     ],
+    dependencies: [
+        .package(url: "https://github.com/ios-3ds-sdk/SPM", .exact("2.4.0"))
+    ],
     targets: [
         .target(
             name: "OmiseSDK",
-            dependencies: [],
+            dependencies: [
+                .product(name: "ThreeDS_SDK", package: "SPM")
+            ],
             path: "OmiseSDK",
             exclude: ["Info.plist"],
             resources: [.process("Resources")]
diff --git a/dev.xcodeproj/project.pbxproj b/dev.xcodeproj/project.pbxproj
index d4d62c77..bce17807 100644
--- a/dev.xcodeproj/project.pbxproj
+++ b/dev.xcodeproj/project.pbxproj
@@ -1281,6 +1281,7 @@
 				22D480991D0EB29C00544CE1 /* Sources */,
 				22D4809A1D0EB29C00544CE1 /* Frameworks */,
 				8A0928211D545455008D393F /* Embed Frameworks */,
+				752970442BF4A8F100DE1AA5 /* Skip Config file changes */,
 			);
 			buildRules = (
 			);
@@ -1447,6 +1448,24 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		752970442BF4A8F100DE1AA5 /* Skip Config file changes */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Skip Config file changes";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if git --version >/dev/null 2>&1; then\n    git update-index --assume-unchanged ExampleApp/Config.local.plist\nelse\n    echo \"Git is not installed, skipping command.\"\nfi\n";
+		};
 		75341FF329A716FD003027E6 /* Swiftlint */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -2178,7 +2197,7 @@
 			repositoryURL = "https://github.com/ios-3ds-sdk/SPM.git";
 			requirement = {
 				kind = exactVersion;
-				version = 2.4.12;
+				version = 2.4.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/dev.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/dev.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 7076d741..2d52cade 100644
--- a/dev.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/dev.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ios-3ds-sdk/SPM.git",
         "state": {
           "branch": null,
-          "revision": "39a95346b6fdc4cec79f8a541201347bbcbabf9d",
-          "version": "2.4.12"
+          "revision": "a4e55d7f10294ea81abd1db393ae05606a5efa46",
+          "version": "2.4.0"
         }
       }
     ]

From c313ce6c50b6d6305cdfe459dd7260578e6f38be Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Wed, 15 May 2024 16:15:19 +0700
Subject: [PATCH 17/19] Update spm depencency branch for example app. Remove
 debug card info from credit card payment screen

---
 ExampleApp.xcodeproj/project.pbxproj                |  2 +-
 .../xcshareddata/swiftpm/Package.resolved           | 13 +++++++++++--
 .../CreditCardPaymentController.swift               |  8 --------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ExampleApp.xcodeproj/project.pbxproj b/ExampleApp.xcodeproj/project.pbxproj
index 9a83a935..214d052a 100644
--- a/ExampleApp.xcodeproj/project.pbxproj
+++ b/ExampleApp.xcodeproj/project.pbxproj
@@ -457,7 +457,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/omise/omise-ios.git";
 			requirement = {
-				branch = "feature/MIT-1904";
+				branch = "feature/MIT-2470";
 				kind = branch;
 			};
 		};
diff --git a/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index ebb6ef4b..ebd97824 100644
--- a/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/omise/omise-ios.git",
       "state" : {
-        "branch" : "feature/MIT-1904",
-        "revision" : "0ed8ce39701b08433a2d5c0a678e95edd8b2b8ef"
+        "branch" : "feature/MIT-2470",
+        "revision" : "4f1bbf9a0f0828c7531664276fc244fd8433a869"
+      }
+    },
+    {
+      "identity" : "spm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ios-3ds-sdk/SPM",
+      "state" : {
+        "revision" : "a4e55d7f10294ea81abd1db393ae05606a5efa46",
+        "version" : "2.4.0"
       }
     }
   ],
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift
index 7547b725..eccd459f 100644
--- a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift	
@@ -171,14 +171,6 @@ class CreditCardPaymentController: UIViewController {
 
         contentView.adjustContentInsetOnKeyboardAppear()
 
-        // TODO: Remove
-        cardNumberTextField.text = "4761340000000076" // Challenge
-        //        cardNumberTextField.text = "5362684181065006" // Frictionless
-        //        cardNumberTextField.text = "4012000000001089" // Frictionless failed
-        cardNameTextField.text = "Omise Test"
-        expiryDateTextField.text = "05/24"
-        secureCodeTextField.text = "123"
-
         if let viewModel = viewModel {
             bind(to: viewModel)
         }

From 8177974e3892be82be979d2046dd7039f9b654d7 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Wed, 15 May 2024 16:22:38 +0700
Subject: [PATCH 18/19] Update sonar cloud project filename

---
 sonar-project.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonar-project.properties b/sonar-project.properties
index d4e62d10..eab5e4e5 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -10,7 +10,7 @@ sonar.tests=OmiseSDKTests
 
 sonar.swift.simulator=platform=iOS Simulator,name=iPhone 12,OS=latest
 sonar.swift.excludedPathsFromCoverage=.*Tests.*
-sonar.swift.project=OmiseSDK.xcodeproj
+sonar.swift.project=dev.xcodeproj
 sonar.swift.appScheme=OmiseSDK
 
 sonar.language=swift

From 170268972f95c72b9e394352a54f482b89fbc752 Mon Sep 17 00:00:00 2001
From: Andrei Solovev <andrei@opn.ooo>
Date: Wed, 15 May 2024 16:41:29 +0700
Subject: [PATCH 19/19] Disable white-label for Netcetera release

---
 .../Source/Source.Payment.Installment.swift   | 32 +++++++++----------
 .../SourceType/SourceType+Installments.swift  | 14 ++++----
 .../OmiseAPI/SourceType/SourceType.swift      | 28 ++++++++--------
 .../ChoosePaymentCoordinator.swift            | 26 +++++++--------
 .../SourceType+ViewPresentable.swift          | 14 ++++----
 5 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift
index 367d69db..cedd0175 100644
--- a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift	
@@ -29,36 +29,36 @@ extension Source.Payment.Installment {
         switch sourceType {
         case .installmentBAY:
             return [ 3, 4, 6, 10 ]
-        case .installmentWhiteLabelBAY:
-            return [ 3, 4, 6, 9, 10 ]
-        case .installmentFirstChoice:
-            return [ 3, 4, 6, 10, 12, 18, 24, 36 ]
-        case .installmentWhiteLabelFirstChoice:
-            return [ 3, 4, 6, 9, 10, 12, 18, 24, 36 ]
         case .installmentBBL:
             return [ 4, 6, 8, 10 ]
-        case .installmentWhiteLabelBBL:
-            return [ 4, 6, 8, 10 ]
+        case .installmentFirstChoice:
+            return [ 3, 4, 6, 10, 12, 18, 24, 36 ]
         case .installmentMBB:
             return [ 6, 12, 18, 24 ]
         case .installmentKTC:
             return [ 3, 4, 5, 6, 7, 8, 9, 10 ]
-        case .installmentWhiteLabelKTC:
-            return [ 3, 4, 5, 6, 7, 8, 9, 10 ]
         case .installmentKBank:
             return [ 3, 4, 6, 10 ]
-        case .installmentWhiteLabelKBank:
-            return [ 3, 6, 10 ]
         case .installmentSCB:
             return [ 3, 4, 6, 9, 10 ]
-        case .installmentWhiteLabelSCB:
-            return [ 3, 4, 6, 9, 10 ]
         case .installmentTTB:
             return [ 3, 4, 6, 10, 12 ]
-        case .installmentWhiteLabelTTB:
-            return [ 4, 6, 10 ]
         case .installmentUOB:
             return [ 3, 4, 6, 10 ]
+//        case .installmentWhiteLabelBAY:
+//            return [ 3, 4, 6, 9, 10 ]
+//        case .installmentWhiteLabelFirstChoice:
+//            return [ 3, 4, 6, 9, 10, 12, 18, 24, 36 ]
+//        case .installmentWhiteLabelBBL:
+//            return [ 4, 6, 8, 10 ]
+//        case .installmentWhiteLabelKTC:
+//            return [ 3, 4, 5, 6, 7, 8, 9, 10 ]
+//        case .installmentWhiteLabelSCB:
+//            return [ 3, 4, 6, 9, 10 ]
+//        case .installmentWhiteLabelKBank:
+//            return [ 3, 6, 10 ]
+//        case .installmentWhiteLabelTTB:
+//            return [ 4, 6, 10 ]
         default:
             return []
         }
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
index 4c1598ab..84301096 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
@@ -17,13 +17,13 @@ extension SourceType {
 
     public static var whiteLabelInstallments: [SourceType] {
         [
-            .installmentWhiteLabelKTC,
-            .installmentWhiteLabelKBank,
-            .installmentWhiteLabelSCB,
-            .installmentWhiteLabelBBL,
-            .installmentWhiteLabelBAY,
-            .installmentWhiteLabelFirstChoice,
-            .installmentWhiteLabelTTB
+//            .installmentWhiteLabelKTC,
+//            .installmentWhiteLabelKBank,
+//            .installmentWhiteLabelSCB,
+//            .installmentWhiteLabelBBL,
+//            .installmentWhiteLabelBAY,
+//            .installmentWhiteLabelFirstChoice,
+//            .installmentWhiteLabelTTB
         ]
     }
 
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
index 3f043a5e..7b1b271d 100644
--- a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
@@ -50,20 +50,20 @@ public enum SourceType: String, Codable, CaseIterable {
     case installmentTTB = "installment_ttb"
     /// United Overseas Bank (UOB)   https://docs.opn.ooo/installment-payments
     case installmentUOB = "installment_uob"
-    /// Krungthai Card (KTC)  https://docs.opn.ooo/installment-white-label-payments
-    case installmentWhiteLabelKTC = "installment_wlb_ktc"
-    /// Kasikorn Bank  https://docs.opn.ooo/installment-white-label-payments
-    case installmentWhiteLabelKBank = "installment_wlb_kbank"
-    /// Siam Commercial Bank  https://docs.opn.ooo/installment-white-label-payments
-    case installmentWhiteLabelSCB = "installment_wlb_scb"
-    /// Bangkok Bank https://docs.opn.ooo/installment-white-label-payments
-    case installmentWhiteLabelBBL = "installment_wlb_bbl"
-    /// Krungsri https://docs.opn.ooo/installment-white-label-payments
-    case installmentWhiteLabelBAY = "installment_wlb_bay"
-    /// Krungsri First Choice https://docs.opn.ooo/installment-white-label-payments
-    case installmentWhiteLabelFirstChoice = "installment_wlb_first_choice"
-    /// TMBThanachart Bank https://docs.opn.ooo/installment-white-label-payments
-    case installmentWhiteLabelTTB = "installment_wlb_ttb"
+//    /// Krungthai Card (KTC)  https://docs.opn.ooo/installment-white-label-payments
+//    case installmentWhiteLabelKTC = "installment_wlb_ktc"
+//    /// Kasikorn Bank  https://docs.opn.ooo/installment-white-label-payments
+//    case installmentWhiteLabelKBank = "installment_wlb_kbank"
+//    /// Siam Commercial Bank  https://docs.opn.ooo/installment-white-label-payments
+//    case installmentWhiteLabelSCB = "installment_wlb_scb"
+//    /// Bangkok Bank https://docs.opn.ooo/installment-white-label-payments
+//    case installmentWhiteLabelBBL = "installment_wlb_bbl"
+//    /// Krungsri https://docs.opn.ooo/installment-white-label-payments
+//    case installmentWhiteLabelBAY = "installment_wlb_bay"
+//    /// Krungsri First Choice https://docs.opn.ooo/installment-white-label-payments
+//    case installmentWhiteLabelFirstChoice = "installment_wlb_first_choice"
+//    /// TMBThanachart Bank https://docs.opn.ooo/installment-white-label-payments
+//    case installmentWhiteLabelTTB = "installment_wlb_ttb"
     /// Bank of Ayudhya (Krungsri)   https://docs.opn.ooo/internet-banking
     case internetBankingBAY = "internet_banking_bay"
     /// Bangkok Bank   https://docs.opn.ooo/internet-banking
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift
index 28aaf377..efeda087 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift	
@@ -107,20 +107,20 @@ class ChoosePaymentCoordinator: NSObject, ViewAttachable {
     func createInstallmentController() -> SelectPaymentController {
         var sourceTypes = client.latestLoadedCapability?.availableSourceTypes(SourceType.installments) ?? []
 
-        let filter: [SourceType: SourceType] = [
-            .installmentWhiteLabelKTC: .installmentKTC,
-            .installmentWhiteLabelKBank: .installmentKBank,
-            .installmentWhiteLabelSCB: .installmentSCB,
-            .installmentWhiteLabelBBL: .installmentBBL,
-            .installmentWhiteLabelBAY: .installmentBAY,
-            .installmentWhiteLabelFirstChoice: .installmentFirstChoice,
-            .installmentWhiteLabelTTB: .installmentTTB
-        ]
+//        let filter: [SourceType: SourceType] = [
+//            .installmentWhiteLabelKTC: .installmentKTC,
+//            .installmentWhiteLabelKBank: .installmentKBank,
+//            .installmentWhiteLabelSCB: .installmentSCB,
+//            .installmentWhiteLabelBBL: .installmentBBL,
+//            .installmentWhiteLabelBAY: .installmentBAY,
+//            .installmentWhiteLabelFirstChoice: .installmentFirstChoice,
+//            .installmentWhiteLabelTTB: .installmentTTB
+//        ]
         
-        for (keepingSourceType, removingSourceType) in filter
-            where sourceTypes.contains(keepingSourceType) {
-            sourceTypes.removeAll { $0 == removingSourceType }
-        }
+//        for (keepingSourceType, removingSourceType) in filter
+//            where sourceTypes.contains(keepingSourceType) {
+//            sourceTypes.removeAll { $0 == removingSourceType }
+//        }
 
         let viewModel = SelectSourceTypePaymentViewModel(
             title: PaymentMethod.installment.localizedTitle,
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift
index a839ba24..f8397bae 100644
--- a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift	
@@ -46,21 +46,21 @@ extension SourceType: ViewPresentable {
             return "Grab"
         case .grabPayRms:
             return "Grab"
-        case .installmentBAY, .installmentWhiteLabelBAY:
+        case .installmentBAY: // , .installmentWhiteLabelBAY:
             return "BAY"
-        case .installmentBBL, .installmentWhiteLabelBBL:
+        case .installmentBBL: // , .installmentWhiteLabelBBL:
             return "BBL"
-        case .installmentFirstChoice, .installmentWhiteLabelFirstChoice:
+        case .installmentFirstChoice: // , .installmentWhiteLabelFirstChoice:
             return "First Choice"
-        case .installmentKBank, .installmentWhiteLabelKBank:
+        case .installmentKBank: // , .installmentWhiteLabelKBank:
             return "KBANK"
-        case .installmentKTC, .installmentWhiteLabelKTC:
+        case .installmentKTC: // , .installmentWhiteLabelKTC:
             return "KTC"
         case .installmentMBB:
             return "FPX/maybank"
-        case .installmentSCB, .installmentWhiteLabelSCB:
+        case .installmentSCB: // , .installmentWhiteLabelSCB:
             return "SCB"
-        case .installmentTTB, .installmentWhiteLabelTTB:
+        case .installmentTTB: // , .installmentWhiteLabelTTB:
             return "ttb"
         case .installmentUOB:
             return "uob"