Before adding dropdownlist data

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java

@@ -509,9 +509,12 @@ public class ReceiverInfoV3Model implements Parcelable {
     };
 
 
-    public void updateSelectedCountryAndClearOtherData(CountryServiceModel selectedCountry)
+
+    public void updateSelectedCountryAndClearRelatedData(CountryServiceModel selectedCountry)
     {
-        clearAllData();
+        //TODO clear realted data
+        this.setPaymentMethod(null);
+
         this.country = selectedCountry.getCountryName();
         this.countryId = selectedCountry.getCountryId();
         this.countryCode = selectedCountry.getCountryCode();

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java

@@ -42,12 +42,14 @@ public class RecipientDetailValidatorV3 {
 
 
     public RecipientDetailValidatorV3(RecipientAddV3ContractInterface view, ReceiverInfoV3Model receiverInfoV3Model) {
-        if (receiverInfoV3Model == null) {
-            receiverInfoV3Model = new ReceiverInfoV3Model();
-        }
+        if (receiverInfoV3Model == null)
+            this.recipientInfo = new ReceiverInfoV3Model();
+        else
+            this.recipientInfo = receiverInfoV3Model;
+
         this.view = view;
-        this.recipientInfo = receiverInfoV3Model;
         validationRuleModelMap = new HashMap<>();
+        mockTestinData();
     }
 
     private void mockTestinData() {
@@ -148,12 +150,10 @@ public class RecipientDetailValidatorV3 {
 
             case FIELD_FULL_NAME:
                 //TODO Add Respective value when avialable in reciever info
-                mockTestinData();
                 if (recipientInfo.getFullName() != null && recipientInfo.getFullName().length() > 0) {
                     rule.updateValidity(true);
                     view.updateValueToWidgetFullName(recipientInfo.getFullName());
-                }
-                else {
+                } else {
                     rule.updateValidity(false);
                     view.updateValueToWidgetFullName("");
                 }
@@ -298,10 +298,9 @@ public class RecipientDetailValidatorV3 {
 
         Iterator it = validationRuleModelMap.entrySet().iterator();
         while (it.hasNext()) {
-            Map.Entry<String,ValidationRuleModel> pair = (Map.Entry)it.next();
-            if(!pair.getValue().hasValidValue())
-            {
-                areAllFormValid=false;
+            Map.Entry<String, ValidationRuleModel> pair = (Map.Entry) it.next();
+            if (!pair.getValue().hasValidValue()) {
+                areAllFormValid = false;
                 break;
             }
         }
@@ -536,11 +535,11 @@ public class RecipientDetailValidatorV3 {
     }
 
     public void validateFullName(String text) {
-        Log.d(RecipientAddEditV3Activity.TAG,"Full name validation called");
+        Log.d(RecipientAddEditV3Activity.TAG, "Full name validation called");
         ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_FULL_NAME);
         if (validationRuleModel != null) {
             String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text);
-            Log.d(RecipientAddEditV3Activity.TAG,"Full name validation result :"+error);
+            Log.d(RecipientAddEditV3Activity.TAG, "Full name validation result :" + error);
             if (error == null) {
                 validationRuleModel.updateValidity(true);
                 recipientInfo.setName(text);

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java

@@ -145,7 +145,7 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA
     @Override
     public void onCountryServiceSelected(CountryServiceModel selectedCountry) {
         this.selectedCountry=selectedCountry;
-        validator.getRecipientDetail().updateSelectedCountryAndClearOtherData(selectedCountry);
+        validator.getRecipientDetail().updateSelectedCountryAndClearRelatedData(selectedCountry);
         view.updateValueToWidgetSelectedCountry(selectedCountry.getCountryName());
         view.showSelectedCountryFlag(CountryFlagMapper.getFlagFromCountryCode(selectedCountry.getCountryCode()));
         view.updateValueToWidgetSelectedPaymentMethod(null);