Edit recipient mode handled properly

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

@@ -362,8 +362,7 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter {
                 view.showMobilePrefixAndFlag(gateway.getMobilePrefixFromCountryCode(validator.getRecipientDetail().getCountryCode()), CountryFlagMapper.getFlagFromCountryCode(validator.getRecipientDetail().getCountryCode()));
                 view.showCountrySelectionView(true);
                 view.showPaymentSelectionView(true);
-                if (validator.getRecipientDetail().getPaymentMethod() == null) {
-                    //Since payment method is not available at the moment we cannot show his existing mapped data
+
                 for (CountryServiceModel countryServiceModel : t.getData()) {
                     if (countryServiceModel.getCountryCode().equalsIgnoreCase(validator.getRecipientDetail().getCountryCode())) {
                         validator.updateSelectedCountry(countryServiceModel);
@@ -371,10 +370,12 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter {
                     }
                 }
 
-                } else {
+                if (validator.getRecipientDetail().getPaymentMethod() != null) {
+
                     String countryId = validator.getRecipientDetail().getCountryId();
                     String serviceTypeID = validator.getRecipientDetail().getPaymentMethod().getId();
                     getDynamicValidationAndDropDownList(countryId, serviceTypeID);
+
                 }
 
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java

@@ -103,7 +103,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
     public void saveSelectedRecipientInfomation(ReceiverInfoV3Model recipientInfoModel) {
         if (recipientInfoModel.getPaymentMethod() == null || recipientInfoModel.hasPartnerChanged()) {
             String message = "";
-            if (recipientInfoModel.getPaymentMethod() == null)
+            if (recipientInfoModel.getPaymentMethod() != null && recipientInfoModel.getPaymentMethod().getId()==null)
                 message = getStringfromStringId(R.string.recipient_profile_update_prompt_text);
             else
                 message = getStringfromStringId(R.string.recipient_bank_update_prompt_text);