Merge remote-tracking branch 'origin/UIChanges' into UIChanges

# Conflicts:
#	app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java

app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/NativeCountry.java

@@ -21,6 +21,7 @@ public class NativeCountry implements GenericImageWithTextListingDialog.ImageWit
     public NativeCountry(String id,
                          String text,
                          String countryCode) {
+
         this.id = id;
         this.text = text;
         this.countryCode = countryCode;

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java

@@ -137,7 +137,7 @@ public class ValidationRuleModel {
 
     private String validateCurrentState(String value) {
         if (isFieldRequired()) {
-            if (value == null || value.length() == 0 && !isOptional())
+            if ((value == null || value.length() == 0) && !isOptional())
                 return getFieldIsRequiredErrorMessage();
             else {
                 String result = validateMinLengthAndReturnErrorMessageOnFail(value);

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/AgentV3Model.java

@@ -25,6 +25,8 @@ public class AgentV3Model implements Parcelable {
     @Expose
     private String accountNo;
 
+
+
     public String getId() {
         return id;
     }

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java

@@ -989,6 +989,7 @@ public class BeneficiaryAddEditV3Fragment extends BaseFragment implements Recipi
         public void onTextUpdated(String text) {
             viewModel.onRecipientAccountNoChanged(text);
         }
+
     }
 
     public class RecipientFirstNameTextWatcher extends TextWatcherAdapter {
@@ -1015,7 +1016,6 @@ public class BeneficiaryAddEditV3Fragment extends BaseFragment implements Recipi
     public class RecipientFullNameTextWatcher extends TextWatcherAdapter {
         @Override
         public void onTextUpdated(String text) {
-            Log.d(TAG, "Full name textwatcher called");
             viewModel.onRecipientFullNameChanged(text);
         }
     }