Browse Source

Validation message fixes

master
preyearegmi 6 years ago
parent
commit
72b9d4fb69
  1. 14
      app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java

14
app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java

@ -90,7 +90,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
this.view.getView1Contract().setErrorOnEmail(null); this.view.getView1Contract().setErrorOnEmail(null);
if (data.getGender() == null) { if (data.getGender() == null) {
this.view.getView1Contract().setErrorOnGender("Please select gender");
this.view.getView1Contract().setErrorOnGender("Please select a gender");
isValid = false; isValid = false;
} else } else
this.view.getView1Contract().setErrorOnGender(null); this.view.getView1Contract().setErrorOnGender(null);
@ -102,7 +102,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
// this.view.getView1Contract().setErrorOnDob(null); // this.view.getView1Contract().setErrorOnDob(null);
if (data.getNativeCountry() == null) { if (data.getNativeCountry() == null) {
this.view.getView1Contract().setErrorOnNativeCountry("Please select native country");
this.view.getView1Contract().setErrorOnNativeCountry("Please select a native country");
isValid = false; isValid = false;
} else } else
this.view.getView1Contract().setErrorOnNativeCountry(null); this.view.getView1Contract().setErrorOnNativeCountry(null);
@ -120,7 +120,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
this.view.getView1Contract().setErrorOnProvince(null); this.view.getView1Contract().setErrorOnProvince(null);
if (data.getOccupation() == null) { if (data.getOccupation() == null) {
this.view.getView1Contract().setErrorOnOccupation("Please select occupation");
this.view.getView1Contract().setErrorOnOccupation("Please select an occupation");
isValid = false; isValid = false;
} else } else
this.view.getView1Contract().setErrorOnOccupation(null); this.view.getView1Contract().setErrorOnOccupation(null);
@ -149,7 +149,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
public boolean validateKYCView2(KYCView2VModel data) { public boolean validateKYCView2(KYCView2VModel data) {
boolean isValid = true; boolean isValid = true;
if (data.getPrimaryBank() == null) { if (data.getPrimaryBank() == null) {
this.view.getView2Contract().setErrorOnPrimaryBank("Please select primary bank");
this.view.getView2Contract().setErrorOnPrimaryBank("Please select a primary bank");
isValid = false; isValid = false;
} else } else
this.view.getView2Contract().setErrorOnPrimaryBank(null); this.view.getView2Contract().setErrorOnPrimaryBank(null);
@ -175,7 +175,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
isValid = false; isValid = false;
} }
if (data.getSourceOfFund() == null) { if (data.getSourceOfFund() == null) {
this.view.getView2Contract().setErrorOnSourceOfFund("Please select source of fund");
this.view.getView2Contract().setErrorOnSourceOfFund("Please select a source of fund");
isValid = false; isValid = false;
} else } else
this.view.getView2Contract().setErrorOnSourceOfFund(null); this.view.getView2Contract().setErrorOnSourceOfFund(null);
@ -195,7 +195,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
if(dependentData.equalsIgnoreCase(ISSUE_DATE_KEY)) { if(dependentData.equalsIgnoreCase(ISSUE_DATE_KEY)) {
if(checkIfEmptyOrNull(issueDate)) { if(checkIfEmptyOrNull(issueDate)) {
this.view.getView2Contract().setErrorOnIssueDate("Please select issued date");
this.view.getView2Contract().setErrorOnIssueDate("Please select an issued date");
errorInIssueDate=true; errorInIssueDate=true;
} }
else else
@ -207,7 +207,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
if(dependentData.equalsIgnoreCase(EXPIRY_DATE_KEY)) { if(dependentData.equalsIgnoreCase(EXPIRY_DATE_KEY)) {
if(checkIfEmptyOrNull(expiryDate)) { if(checkIfEmptyOrNull(expiryDate)) {
this.view.getView2Contract().setErrorOnExpiryDate("Please select expiry date");
this.view.getView2Contract().setErrorOnExpiryDate("Please select an expiry date");
errorInExpiryDate = true; errorInExpiryDate = true;
} }
else else

Loading…
Cancel
Save