From 735a06dca054a3658bbc708236e19a446ea204d7 Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Tue, 27 Aug 2019 14:44:04 +0900
Subject: [PATCH] Add Recipient onCountrySlected and OnService event handling
 fixes

---
 .../RecipientAddV3ContractInterface.java           |  3 +++
 .../add/RecipientAddV3Presenter.java               | 14 ++++++++------
 .../RecipientAddEditV3Activity.java                | 14 ++++++++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java
index 3675a988..8206e730 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java
@@ -155,4 +155,7 @@ public interface RecipientAddV3ContractInterface extends BaseContractInterface
     void scrollAccountNumberView();
 
     void clearViewDependentOnServiceType();
+
+    void clearViewDependentOnCountryServiceSelected();
+
 }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java
index bc6f7001..896bf97d 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java
@@ -108,6 +108,9 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter imp
 
     @Override
     public void onCountryServiceSelected(CountryServiceModel selectedCountry) {
+
+        flushCountryRelatedDataOnCountryServiceSelected();
+
         validator.updateSelectedCountryServiceData(selectedCountry);
 
         view.updateValueToWidgetSelectedCountry(selectedCountry.getCountryName());
@@ -115,23 +118,21 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter imp
 
         this.showMobilePrefixAndFlag(selectedCountry.getCountryCode());
 
-        flushCountryRelatedDataOnCountryServiceSelected();
 
         view.showPaymentSelectionView(true);
 
     }
 
     private void flushCountryRelatedDataOnCountryServiceSelected() {
-        view.updateValueToWidgetSelectedPaymentMethod("");
-        view.updateValueToWidgetBankName("");
-        view.updateValueToWidgetBranchName("");
 
-        validator.getRecipientDetail().setPaymentMethod(null);
-        validator.getRecipientDetail().setAgent(null);
+        view.clearViewDependentOnCountryServiceSelected();
+
+        validator.getRecipientDetail().clearData();
     }
 
     @Override
     public void onServiceTypeSelected(ServiceTypeModel selectedServiceType) {
+
         flushPaymentMethodRelatedDataOnServiceTypeSelected();
 
         validator.getRecipientDetail().updateSelectedCountry(validator.getSelectedCountryServiceData());
@@ -154,6 +155,7 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter imp
         view.clearViewDependentOnServiceType();
 
         validator.getRecipientDetail().clearData();
+
     }
 
     @Override
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java
index cdacc4fa..383c0bca 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java
@@ -247,8 +247,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
     }
 
-    private void removeInputFiltersFromDropDownEditText()
-    {
+    private void removeInputFiltersFromDropDownEditText() {
         recieverPaymentMethodSelectionFormInputField.setInputFilters(new InputFilter[]{});
     }
 
@@ -726,8 +725,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
     @Override
     public void scrollAccountNumberView() {
-        if(receiverBankViewContainer.getVisibility()==View.VISIBLE)
-        {
+        if (receiverBankViewContainer.getVisibility() == View.VISIBLE) {
             scrollView.post(new Runnable() {
                 @Override
                 public void run() {
@@ -768,6 +766,14 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
         recieverIDTypeSelectionFormInputField.getEditTextView().setText("");
     }
 
+    @Override
+    public void clearViewDependentOnCountryServiceSelected() {
+
+        recieverPaymentMethodSelectionFormInputField.getEditTextView().setText("");
+
+        clearViewDependentOnServiceType();
+    }
+
     @Override
     public void updateValidationRuleToWidgetProvince(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) {
         editTextConfiguration.applyConfigurationSetting(recieverStateSelectionFormInputField.getEditTextView());