Account Validation fixes for recipient add/edit process

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

@@ -155,8 +155,6 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter  {
 
         }
 
-        Log.d(this.getClass().getSimpleName(),validator.getRecipientDetail().toString());
-//
         compositeDisposable.add(
                 this.gateway.addRecipient(gateway.getAuth(), gateway.getUserIDNumber(), validator.getRecipientDetail())
                         .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
@@ -171,6 +169,7 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter  {
 
     private void performAccountValidation(String accountNumber) {
 
+
         String idType = "1";
         String idNumber = gateway.getUserIDNumber();
         String customerFirstName = gateway.getUserFirstName();
@@ -180,18 +179,23 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter  {
         String country = validator.getRecipientDetail().getCountryCode();
         String accountType = "1";
         String issuerCode = "";
-        String accountNo = accountNumber;
         String amount = "10000.0";
         String bankCode = "";
         String payoutPartner = validator.getAvailableDynamicValidationModel().getPayoutPartner();
         String processId = "";
 
+
+        if((!checkStringNotEmpty(receiverFirstName)||!checkStringNotEmpty(receiverLastName))&&checkStringNotEmpty(validator.getRecipientDetail().getFullName()))
+        {
+            receiverFirstName=validator.getRecipientDetail().getFullName();
+        }
+
         String bankId = validator.getRecipientDetail().getAgent().getId();
         String receiverCountryId = validator.getRecipientDetail().getCountryId();
         String deliveryMethodID = validator.getRecipientDetail().getPaymentMethod().getId();
 
         compositeDisposable.add(gateway.validateAccountFromServer(gateway.getAuth(), idType, idNumber, customerFirstName, customerLastName, receiverFirstName, receiverLastName, country,
-                accountType, issuerCode, accountNo, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID)
+                accountType, issuerCode, accountNumber, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID)
                 .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                 .doFinally(() -> view.showProgressBar(false, ""))
                 .subscribeOn(Schedulers.io())

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

@@ -197,18 +197,23 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter {
         String country = validator.getRecipientDetail().getCountryCode();
         String accountType = "1";
         String issuerCode = "";
-        String accountNo = accountNumber;
         String amount = "10000.0";
         String bankCode = "";
         String payoutPartner = validator.getAvailableDynamicValidationModel().getPayoutPartner();
         String processId = "";
 
+
+        if((!checkStringNotEmpty(receiverFirstName)||!checkStringNotEmpty(receiverLastName))&&checkStringNotEmpty(validator.getRecipientDetail().getFullName()))
+        {
+            receiverFirstName=validator.getRecipientDetail().getFullName();
+        }
+
         String bankId = validator.getRecipientDetail().getAgent().getId();
         String receiverCountryId = validator.getRecipientDetail().getCountryId();
         String deliveryMethodID = validator.getRecipientDetail().getPaymentMethod().getId();
 
         compositeDisposable.add(gateway.validateAccountFromServer(gateway.getAuth(), idType, idNumber, customerFirstName, customerLastName, receiverFirstName, receiverLastName, country,
-                accountType, issuerCode, accountNo, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID)
+                accountType, issuerCode, accountNumber, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID)
                 .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                 .doFinally(() -> view.showProgressBar(false, ""))
                 .subscribeOn(Schedulers.io())

app/src/main/res/layout/activity_recipient_add_edit_v3.xml

@@ -518,8 +518,6 @@
                     android:background="@drawable/ic_arrow_down" />
             </LinearLayout>
 
-
-
             <Button
                 android:id="@+id/btn_submit"
                 android:layout_width="200dp"