Translation fixes

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java

@@ -114,7 +114,7 @@ public class ValidationRuleModel {
 
 
     public String getFieldIsRequiredErrorMessage() {
-        return "Value cannot be empty";
+        return "Field cannot be empty";
     }
 
 
@@ -162,11 +162,13 @@ public class ValidationRuleModel {
     }
 
     public String getFieldLengthIsLessThanLowerBoundDefinedErrorMessage() {
-        return "Value must be greater than "+getMinFieldLength()+" digits";
+//        return "Value must be greater than "+getMinFieldLength()+" digits";
+        return "Field size must be greater than "+getMinFieldLength()+" characters in length";
     }
 
     public String getFieldLengthIsGreaterThanUpperBoundDefinedErrorMessage() {
-        return "Value must be less or equal to "+getMaxFieldLength()+" digits";
+//        return "Value must be less or equal to "+getMaxFieldLength()+" digits";
+        return "Field size must be less or equal to "+getMaxFieldLength()+" characters in length";
     }
 
 

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

@@ -208,18 +208,31 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter  {
                 validator.updateDynamicValidationModel(t.getData());
                 applyValidationRulesToView(t.getData().getValidationRuleList());
             } else {
+
+                validator.getRecipientDetail().setPaymentMethod(null);
+                view.updateValueToWidgetSelectedPaymentMethod(null);
+                view.setSubmitButtonEnabled(false);
+
                 view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
             }
         }
 
         @Override
         public void onFailed(String message) {
-            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+            validator.getRecipientDetail().setPaymentMethod(null);
+            view.updateValueToWidgetSelectedPaymentMethod(null);
+            view.setSubmitButtonEnabled(false);
+
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
         }
 
         @Override
         protected void onConnectionNotEstablished(String message) {
-            view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.exitView());
+            validator.getRecipientDetail().setPaymentMethod(null);
+            view.updateValueToWidgetSelectedPaymentMethod(null);
+            view.setSubmitButtonEnabled(false);
+
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null);
         }
 
         @Override

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

@@ -293,17 +293,29 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter  {
                 validator.validateFieldsExplicitly();
 
             } else {
+                validator.getRecipientDetail().setPaymentMethod(null);
+                view.updateValueToWidgetSelectedPaymentMethod(null);
+                view.setSubmitButtonEnabled(false);
+
                 view.showPopUpMessage(data.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
             }
         }
 
         @Override
         public void onFailed(String message) {
+            validator.getRecipientDetail().setPaymentMethod(null);
+            view.updateValueToWidgetSelectedPaymentMethod(null);
+            view.setSubmitButtonEnabled(false);
+
             view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
         }
 
         @Override
         protected void onConnectionNotEstablished(String message) {
+            validator.getRecipientDetail().setPaymentMethod(null);
+            view.updateValueToWidgetSelectedPaymentMethod(null);
+            view.setSubmitButtonEnabled(false);
+
             view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.exitView());
         }
 

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

@@ -112,7 +112,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
                 public void onPositiveBtnPressed() {
                     view.proceedToEditRecipient(recipientInfoModel);
                 }
-            },"Please update recipient information before proceeding to send money.");
+            }, "Recipient profile update is necessary inorder to proceed. Do you want to update it now?");
         } else {
             this.selectedRecipientInfoModel = recipientInfoModel;
             this.view.showPaymentSourceSelection(availablePaymentSources);
@@ -124,6 +124,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
             for (ReceiverInfoV3Model receiverInfoV3Model : availableRecipientList) {
                 if (reciverId.equalsIgnoreCase(receiverInfoV3Model.getReceiverId())) {
                     selectedRecipientInfoModel = receiverInfoV3Model;
+                    String reciverName = getReceiverName(receiverInfoV3Model);
                     view.promptToSendMoney(new GenericPromptDialog.GenericDialogPromptListener() {
                         @Override
                         public void onNegativeBtnPressed() {
@@ -134,12 +135,25 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
                         public void onPositiveBtnPressed() {
                             view.showPaymentSourceSelection(availablePaymentSources);
                         }
-                    },"Do you want to proceed to send money?");
+                    }, "Do you want to send money to "+getReceiverName(receiverInfoV3Model)+"?");
                     return;
                 }
             }
     }
 
+    private String getReceiverName(ReceiverInfoV3Model receiverInfoV3Model) {
+        String name = "";
+        if (receiverInfoV3Model.getFullName() != null && receiverInfoV3Model.getFullName().length() > 0)
+            name = receiverInfoV3Model.getFullName();
+        else if (receiverInfoV3Model.getFirstName() != null && receiverInfoV3Model.getFirstName().length() > 0)
+            name = receiverInfoV3Model.getFirstName();
+        else if (receiverInfoV3Model.getLocalFullName() != null && receiverInfoV3Model.getLocalFullName().length() > 0)
+            name = receiverInfoV3Model.getLocalFullName();
+        else if (receiverInfoV3Model.getLocalFirstName() != null && receiverInfoV3Model.getLocalFirstName().length() > 0)
+            name = receiverInfoV3Model.getLocalFirstName();
+        return name;
+    }
+
     @Override
     public void onRecipentUpdatedSucesss(String receiverId) {
         getAllRecipientList(() -> searchReceiverById(receiverId));