From 66f94bc7462a5173dc5373568e8cd22481a7a110 Mon Sep 17 00:00:00 2001
From: AhlaamK-tap <a.kazi@tap.company>
Date: Sun, 14 May 2023 15:02:09 +0300
Subject: [PATCH] Hot fix

ui overlapp
npe check added for amounted currency
---
 .idea/deploymentTargetDropDown.xml                         | 4 ++--
 CHANGELOG.md                                               | 7 +++++++
 README.md                                                  | 2 +-
 .../internal/activities/GoSellPaymentActivity.java         | 3 ++-
 .../payment_options/PaymentOptionsDataManager.java         | 1 +
 .../layout/gosellsdk_viewholder_card_payment_option.xml    | 4 ++--
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index e0708f2e..bbd7629d 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="SERIAL_NUMBER" />
-            <value value="5200345652f5b40f" />
+            <value value="adb-R9PT508HDZR-wEoLyP._adb-tls-connect._tcp." />
           </Key>
         </deviceKey>
       </Target>
     </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-04-04T09:24:26.892385Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-05-14T11:51:30.925844Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b8e67b4..fec72371 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # CHANGELOG
+[3.16.3] - 2023-05-14
+### Hot Fix:
+- Bug fix for UI 
+### Impact on existing integrations:
+- The update does not impact existing integrations.
+### Recommended changes for existing integrations before updating:
+- None.
 [3.16.2] - 2023-04-04
 ### Hot Fix:
 - Bug fix for NPE 
diff --git a/README.md b/README.md
index 264c61a7..214c6b1e 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ To integrate goSellSDK into your project add it in your **root** `build.gradle`
 Step 2. Add the dependency
 ```java
 	dependencies {
-	        implementation 'com.github.Tap-Payments:goSellSDK-AndroidX:3.16.2'
+	        implementation 'com.github.Tap-Payments:goSellSDK-AndroidX:3.16.3'
 	}
 ```
 
diff --git a/library/src/main/java/company/tap/gosellapi/internal/activities/GoSellPaymentActivity.java b/library/src/main/java/company/tap/gosellapi/internal/activities/GoSellPaymentActivity.java
index 4b476ac1..9f16cc1d 100644
--- a/library/src/main/java/company/tap/gosellapi/internal/activities/GoSellPaymentActivity.java
+++ b/library/src/main/java/company/tap/gosellapi/internal/activities/GoSellPaymentActivity.java
@@ -336,11 +336,12 @@ private void setupChargeOrAuthorizeMode() {
 
         }else {
 
-            if (dataSource.getSelectedCurrency() != null)
+            if (dataSource.getSelectedCurrency() != null && dataSource.getSelectedCurrency().getAmount()!=null && dataSource.getSelectedCurrency().getAmount()!=null ){
                 payButton.getPayButton().setText(String
                         .format("%s %s %s", getResources().getString(R.string.pay),
                                 dataSource.getSelectedCurrency().getSymbol(),
                                 dataSource.getSelectedCurrency().getAmount()));
+            }
         }
     }
 
diff --git a/library/src/main/java/company/tap/gosellapi/internal/data_managers/payment_options/PaymentOptionsDataManager.java b/library/src/main/java/company/tap/gosellapi/internal/data_managers/payment_options/PaymentOptionsDataManager.java
index 1775c2c0..42a5ded9 100644
--- a/library/src/main/java/company/tap/gosellapi/internal/data_managers/payment_options/PaymentOptionsDataManager.java
+++ b/library/src/main/java/company/tap/gosellapi/internal/data_managers/payment_options/PaymentOptionsDataManager.java
@@ -265,6 +265,7 @@ private AmountedCurrency getTransactionCurrency() {
 
         String currencyCode = paymentOptionsResponse.getCurrency();
 
+        if(paymentOptionsResponse!=null && paymentOptionsResponse.getSupportedCurrencies()!=null)
         for (AmountedCurrency amountedCurrency : paymentOptionsResponse.getSupportedCurrencies()) {
 
             if (amountedCurrency.getCurrency().equals(currencyCode)) return amountedCurrency;
diff --git a/library/src/main/res/layout/gosellsdk_viewholder_card_payment_option.xml b/library/src/main/res/layout/gosellsdk_viewholder_card_payment_option.xml
index edf5f34d..57dacebc 100644
--- a/library/src/main/res/layout/gosellsdk_viewholder_card_payment_option.xml
+++ b/library/src/main/res/layout/gosellsdk_viewholder_card_payment_option.xml
@@ -323,10 +323,10 @@
         android:layout_marginTop="18dp"
         android:layout_marginBottom="18dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/saveCardSwitch"
+        android:layout_marginEnd="@dimen/margin_basic_16dp"
         app:layout_constraintTop_toBottomOf="@id/saveCardTopSeparator"
         app:layout_constraintBottom_toBottomOf="parent"
-
         android:text="@string/textview_disclaimer_save_card"
         android:textDirection="locale"
         />