From 7abc9d292c668b0b9a36d9e5129153636a3f350a Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Thu, 30 Aug 2018 16:16:34 +0900
Subject: [PATCH] Before adding auto complete branch selection

---
 ...AmountDetailExRateCountryListingDialog.java |  1 -
 .../AmountDetailSendMoneyFragment.java         | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java
index 33b10729..826cf33d 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java
@@ -62,7 +62,6 @@ public class AmountDetailExRateCountryListingDialog extends DialogFragment imple
         initialize();
         return dialog;
     }
-
     private void initialize() {
         cancelButton.setOnClickListener(this);
         searchEditTextView.addTextChangedListener(this);
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
index eaf4f3be..a80bd795 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
@@ -141,7 +141,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
     }
 
     private void showCurrencyListingDialog() {
-        if(amountDetailRelatedData.getAvailableCurrencyData()==null||amountDetailRelatedData.getAvailableCurrencyData().isEmpty())
+        if (amountDetailRelatedData.getAvailableCurrencyData() == null || amountDetailRelatedData.getAvailableCurrencyData().isEmpty())
             return;
         if (exRateCountryListingDialog == null)
             exRateCountryListingDialog = new AmountDetailExRateCountryListingDialog();
@@ -281,9 +281,19 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
 
         @Override
         protected void onSuccess(AmountDetailRelatedDataModel amountDetailRelatedDataModel) {
-            amountDetailRelatedData = amountDetailRelatedDataModel;
-            if (amountDetailRelatedData.getDefaultSelectedCurrency() != null)
-                showSelectedCurrency(amountDetailRelatedData.getDefaultSelectedCurrency().getCountryCode(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode());
+            if (isUIReady()) {
+                amountDetailRelatedData = amountDetailRelatedDataModel;
+                if (amountDetailRelatedData.getDefaultSelectedCurrency() != null)
+                    showSelectedCurrency(amountDetailRelatedData.getDefaultSelectedCurrency().getCountryCode(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode());
+
+            }
+            scheduleTaskLater(() -> {
+                amountDetailRelatedData = amountDetailRelatedDataModel;
+                if (amountDetailRelatedData.getDefaultSelectedCurrency() != null)
+                    showSelectedCurrency(amountDetailRelatedData.getDefaultSelectedCurrency().getCountryCode(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode());
+
+
+            });
         }
 
         @Override