diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java index bf74c60c..ebd97805 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java @@ -61,13 +61,13 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter public boolean validateKYCView1(KYCView1VModel data) { boolean isValid = true; if (checkIfEmptyOrNull(data.getFirstName())) { - this.view.getView1Contract().setErrorOnFirstName("First name cannot be empty"); + this.view.getView1Contract().setErrorOnFirstName("Please enter a valid first name"); isValid = false; } else this.view.getView1Contract().setErrorOnFirstName(null); if (checkIfEmptyOrNull(data.getLastName())) { - this.view.getView1Contract().setErrorOnLasName("Last name cannot be empty"); + this.view.getView1Contract().setErrorOnLasName("Please enter a valid last name"); isValid = false; } else this.view.getView1Contract().setErrorOnLasName(null); @@ -81,16 +81,16 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter isValid=returnFalseIfMobileNoIsNotValid(data.getMobileNumber()); if (checkIfEmptyOrNull(data.getEmail())) { - this.view.getView1Contract().setErrorOnEmail("Email cannot be empty"); + this.view.getView1Contract().setErrorOnEmail("Please enter a valid email"); isValid = false; }else if (!Utils.isValidEmail(data.getEmail())) { - this.view.getView1Contract().setErrorOnEmail("Improper email id"); + this.view.getView1Contract().setErrorOnEmail("Please enter a valid email"); isValid = false; } else this.view.getView1Contract().setErrorOnEmail(null); if (data.getGender() == null) { - this.view.getView1Contract().setErrorOnGender("Please select a gender"); + this.view.getView1Contract().setErrorOnGender("Please select gender"); isValid = false; } else this.view.getView1Contract().setErrorOnGender(null); @@ -102,25 +102,25 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter // this.view.getView1Contract().setErrorOnDob(null); if (data.getNativeCountry() == null) { - this.view.getView1Contract().setErrorOnNativeCountry("Please select a native country"); + this.view.getView1Contract().setErrorOnNativeCountry("Please select native country"); isValid = false; } else this.view.getView1Contract().setErrorOnNativeCountry(null); if (checkIfEmptyOrNull(data.getAddress())) { - this.view.getView1Contract().setErrorOnAddress("Address cannot be empty"); + this.view.getView1Contract().setErrorOnAddress("Please enter a valid address"); isValid = false; } else this.view.getView1Contract().setErrorOnAddress(null); if (data.getProvince() == null) { - this.view.getView1Contract().setErrorOnProvince("Province cannot be empty"); + this.view.getView1Contract().setErrorOnProvince("Please enter a valid province"); isValid = false; } else this.view.getView1Contract().setErrorOnProvince(null); if (data.getOccupation() == null) { - this.view.getView1Contract().setErrorOnOccupation("Please select a occupation"); + this.view.getView1Contract().setErrorOnOccupation("Please select occupation"); isValid = false; } else this.view.getView1Contract().setErrorOnOccupation(null); @@ -132,12 +132,12 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter { if(mobile==null||mobile.length()<1) { - this.view.getView1Contract().setErrorOnMobileNumber("Mobile number cannot be empty"); + this.view.getView1Contract().setErrorOnMobileNumber("Please enter a valid mobile"); return false; } if(!Utils.hasNumbersOnly(mobile)||mobile.length()>11) { - this.view.getView1Contract().setErrorOnMobileNumber("Please enter valid korean mobile"); + this.view.getView1Contract().setErrorOnMobileNumber("Please enter a valid korean mobile"); return false; } @@ -149,25 +149,25 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter public boolean validateKYCView2(KYCView2VModel data) { boolean isValid = true; if (data.getPrimaryBank() == null) { - this.view.getView2Contract().setErrorOnPrimaryBank("Please select a primary bank."); + this.view.getView2Contract().setErrorOnPrimaryBank("Please select primary bank"); isValid = false; } else this.view.getView2Contract().setErrorOnPrimaryBank(null); if (checkIfEmptyOrNull(data.getAccNo())) { - this.view.getView2Contract().setErrorOnAccountNo("Account number cannot be empty."); + this.view.getView2Contract().setErrorOnAccountNo("Please enter a valid account number"); isValid = false; } else this.view.getView2Contract().setErrorOnAccountNo(null); if (data.getVerificationType() == null) { - this.view.getView2Contract().setErrorOnVerificationType("Please select a verification id type."); + this.view.getView2Contract().setErrorOnVerificationType("Please select verification id type"); isValid = false; } else this.view.getView2Contract().setErrorOnVerificationType(null); if (checkIfEmptyOrNull(data.getVerficationId())) { - this.view.getView2Contract().setErrorOnVerificationId("Verification Id number cannot be empty."); + this.view.getView2Contract().setErrorOnVerificationId("Please enter a valid verification id"); isValid = false; } else this.view.getView2Contract().setErrorOnVerificationId(null); @@ -175,7 +175,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter isValid = false; } if (data.getSourceOfFund() == null) { - this.view.getView2Contract().setErrorOnSourceOfFund("Source of fund cannot be empty."); + this.view.getView2Contract().setErrorOnSourceOfFund("Please select source of fund"); isValid = false; } else this.view.getView2Contract().setErrorOnSourceOfFund(null); @@ -195,7 +195,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter if(dependentData.equalsIgnoreCase(ISSUE_DATE_KEY)) { if(checkIfEmptyOrNull(issueDate)) { - this.view.getView2Contract().setErrorOnIssueDate("Please provide issued date."); + this.view.getView2Contract().setErrorOnIssueDate("Please select issued date"); errorInIssueDate=true; } else @@ -207,7 +207,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter if(dependentData.equalsIgnoreCase(EXPIRY_DATE_KEY)) { if(checkIfEmptyOrNull(expiryDate)) { - this.view.getView2Contract().setErrorOnExpiryDate("Please provide expiry date."); + this.view.getView2Contract().setErrorOnExpiryDate("Please select expiry date"); errorInExpiryDate = true; } else @@ -224,7 +224,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter @Override public boolean validateKYCView3(KYCView3VModel data) { if (selfie == null || front_doc == null || back_doc == null || passbook == null || passport == null) { - view.showToastMessage("Please provide all images."); + view.showToastMessage("Please provide all images"); return false; } return true;