diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java index ec14f905..e0ce03da 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java @@ -151,7 +151,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti public void onValidAmountInputbyUser() { view.showViewDependentOnSenderBankAndAmount(true); view.showOkButton(!domesticRemitDataValidator.areAllFormValid()); - view.enableOkButton(false); + view.enableVerifyBankButton(domesticRemitDataValidator.isValidRecipientBank&&domesticRemitDataValidator.isValidBankAcNo); view.listenForAmountFocusChangeOrActionDone(false); } @@ -175,7 +175,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti } private void mockCurrentBalance() { - String balance="15000"; + String balance="150000"; domesticRemitDataValidator.setCurrentBalance(balance); @@ -183,6 +183,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti view.showCheckBalanceButton(false); domesticRemitDataValidator.validateCurrentBalanceWithSendingAmount(); + domesticRemitDataValidator.validateAll(); } @Override @@ -350,7 +351,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti isValidSendAmount = false; } - //Businesss requirement, not checking lower bound as it will handled by server + //Business requirement, not checking lower bound as it will be handled by server // else if (formattedCurrentBalance <=formattedServiceCharge || netSendingAmount > formattedCurrentBalance) else if (netSendingAmount > formattedCurrentBalance) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterInterface.java index 387837e7..34b75b4a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterInterface.java @@ -90,7 +90,7 @@ public interface DomesticRemitPresenterInterface extends BasePresenterInterface void updateWidgetMobileNumber(String mobileNumber); void enableSubmitButton(boolean action); - void enableOkButton(boolean action); + void enableVerifyBankButton(boolean action); void showOkButton(boolean aciton); void updateWidgetAccountNo(String recipientAccount); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java index 5cef72ce..1edbc438 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java @@ -376,7 +376,7 @@ public class DomesticRemitActivity extends BaseActivity implements DomesticRemit } @Override - public void enableOkButton(boolean action) { + public void enableVerifyBankButton(boolean action) { okBtn.setEnabled(action); }