Recipient Add/Edit View input fields updated

app/src/main/assets/mockeddynamicvalidation.json

@@ -2,8 +2,8 @@
    {
       "Field": "Local Name",
       "FieldRequired": "M",
-      "MinLength": "1",
-       "MaxLength": "50",
+      "MinLength": "3",
+       "MaxLength": "10",
      "Keyboard": "ANS"     
    },
    {

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

@@ -100,21 +100,7 @@ public class ValidationRuleModel {
     }
 
 
-//
-//    public boolean validateValueAndReturnErrorMessageOnFail(String value) {
-//        if (fieldRequired) {
-//
-//            //maxFieldLength is applied
-//            if (maxfieldLength > 0) {
-//                //value length is within the bound
-//                return value.length() <= maxfieldLength&&value.length()>0;
-//            } else {
-//                return value.length() > 0;
-//            }
-//        }
-//        //If field is not required then just relay the value, backend will handle
-//        return true;
-//    }
+
 
     public String validateValueAndReturnErrorMessageOnFail(String value) {
         if (isFieldRequired()) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java

@@ -193,6 +193,7 @@ public class ReceiverInfoV3Model implements Parcelable {
     }
 
     public String getName() {
+
         return name;
     }
 

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

@@ -5,6 +5,8 @@ import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
 public interface RecipientAddV3ContractInterface extends BaseContractInterface
 {
 
+    void registerTextWatchers(boolean action);
+
     void updateValidationRuleToWidgetFullName(boolean visiblity, boolean shouldAllowSpecialCharacters, int maxLength);
     void updateValueToWidgetFullName(String name);
     void setErrorOnWidgetFullName(String error);
@@ -19,4 +21,6 @@ public interface RecipientAddV3ContractInterface extends BaseContractInterface
     void updateValidationRuleToWidgetPaymentMethodSelection(boolean visiblity);
 
     void hideAllViewExceptCountry();
+
+    void hideAllFormInputFields();
 }

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

@@ -43,7 +43,7 @@ public class RecipientDetailValidaitorV3 {
     }
 
 
-    public void validateRecipientName(String fullName)
+    public void validateLocalName(String fullName)
     {
         ValidationRuleModel validationRuleModel=validationRuleModelMap.get(FIELD_FULL_NAME);
         if(validationRuleModel!=null&&validationRuleModel.validateValueAndReturnErrorMessageOnFail(fullName)==null) {
@@ -69,4 +69,51 @@ public class RecipientDetailValidaitorV3 {
     public static final String FIELD_FULL_NAME="Full Name";
 
 
+    public void validateAccountNo(String text) {
+
+    }
+
+    public void validateFirstName(String text) {
+
+    }
+
+    public void validateMiddleName(String text) {
+
+    }
+
+    public void validateLastName(String text) {
+
+    }
+
+    public void validateCity(String text) {
+
+    }
+
+    public void validateAddress(String text) {
+
+    }
+
+    public void validateMobileNumber(String text) {
+
+    }
+
+    public void validateEmail(String text) {
+
+    }
+
+    public void validateIdNumber(String text) {
+
+    }
+
+    public void validateFirstNameLocal(String text) {
+
+    }
+
+    public void validateMiddleNameLocal(String text) {
+
+    }
+
+    public void validateLastNameLocal(String text) {
+
+    }
 }

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

@@ -10,11 +10,36 @@ public interface RecipientPresenterInterface extends BasePresenterInterface {
 
     void onCountryServiceSelected(CountryServiceModel selectedCountry);
 
-    void onRecipientNameChanged(String rec);
+    void onRecipientLocalNameChanged(String rec);
 
     void onServiceTypeSelected(ServiceTypeModel selectedServiceType);
 
     List<CountryServiceModel> getAvailableCountryServiceData();
 
     List<ServiceTypeModel> getAvailableServiceMethodList();
+
+
+    void onRecipientAccountNoChanged(String text);
+
+    void onRecipientFirstNameChanged(String text);
+
+    void onRecipientMiddleNameChanged(String text);
+
+    void onRecipientLastNameChanged(String text);
+
+    void onRecipientCityChanged(String text);
+
+    void onRecipientAddressChanged(String text);
+
+    void onRecipientMobileNumberChanged(String text);
+
+    void onRecipientEmailChanged(String text);
+
+    void onRecipientIdNumberChanged(String text);
+
+    void onRecipientFirstNameLocalChanged(String text);
+
+    void onRecipientMiddleNameLocalChanged(String text);
+
+    void onRecipientLastNameLocalChanged(String text);
 }

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

@@ -54,6 +54,7 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA
     private void init() {
         this.compositeDisposable = new CompositeDisposable();
         mockCountryServiceDetail();
+        view.hideAllViewExceptCountry();
     }
 
     /**
@@ -126,10 +127,13 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA
      * @param data
      */
     private void applyValidationRulesToView(List<ValidationRuleModel> data) {
-        if (data != null)
+        if (data != null) {
+            view.registerTextWatchers(false);
             for (ValidationRuleModel rule : data) {
                 validator.applyDynamicValidationRuleToView(rule);
             }
+            view.registerTextWatchers(true);
+        }
     }
 
     /**
@@ -166,11 +170,6 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA
     }
 
 
-    @Override
-    public void onRecipientNameChanged(String recipientName) {
-        validator.validateRecipientName(recipientName);
-    }
-
     @Override
     public List<CountryServiceModel> getAvailableCountryServiceData() {
         return this.availableCountryServiceData;
@@ -183,6 +182,76 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA
         return null;
     }
 
+    @Override
+    public void onRecipientAccountNoChanged(String text) {
+        validator.validateAccountNo(text);
+    }
+
+    @Override
+    public void onRecipientFirstNameChanged(String text) {
+        validator.validateFirstName(text);
+
+    }
+
+    @Override
+    public void onRecipientMiddleNameChanged(String text) {
+        validator.validateMiddleName(text);
+
+    }
+
+    @Override
+    public void onRecipientLastNameChanged(String text) {
+        validator.validateLastName(text);
+
+    }
+
+    @Override
+    public void onRecipientLocalNameChanged(String recipientName) {
+        validator.validateLocalName(recipientName);
+    }
+
+    @Override
+    public void onRecipientCityChanged(String text) {
+        validator.validateCity(text);
+
+    }
+
+    @Override
+    public void onRecipientAddressChanged(String text) {
+        validator.validateAddress(text);
+
+    }
+
+    @Override
+    public void onRecipientMobileNumberChanged(String text) {
+        validator.validateMobileNumber(text);
+    }
+
+    @Override
+    public void onRecipientEmailChanged(String text) {
+        validator.validateEmail(text);
+    }
+
+    @Override
+    public void onRecipientIdNumberChanged(String text) {
+        validator.validateIdNumber(text);
+    }
+
+    @Override
+    public void onRecipientFirstNameLocalChanged(String text) {
+        validator.validateFirstNameLocal(text);
+    }
+
+    @Override
+    public void onRecipientMiddleNameLocalChanged(String text) {
+        validator.validateMiddleNameLocal(text);
+    }
+
+    @Override
+    public void onRecipientLastNameLocalChanged(String text) {
+        validator.validateLastNameLocal(text);
+    }
+
 
     public class DynamicListObserver extends GenericApiObserverResponseV2<List<ValidationRuleModel>> {
 

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

@@ -104,11 +104,6 @@ public class RecipientEditV3Presenter extends BasePresenter implements Recipient
         this.selectedCountry=selectedCountry;
     }
 
-    @Override
-    public void onRecipientNameChanged(String recipientName) {
-        validator.validateRecipientName(recipientName);
-    }
-
     @Override
     public void onServiceTypeSelected(ServiceTypeModel selectedServiceType) {
         this.selectedServiceType=selectedServiceType;
@@ -117,6 +112,79 @@ public class RecipientEditV3Presenter extends BasePresenter implements Recipient
 
     }
 
+
+    @Override
+    public void onRecipientAccountNoChanged(String text) {
+        validator.validateAccountNo(text);
+    }
+
+    @Override
+    public void onRecipientFirstNameChanged(String text) {
+        validator.validateFirstName(text);
+
+    }
+
+    @Override
+    public void onRecipientMiddleNameChanged(String text) {
+        validator.validateMiddleName(text);
+
+    }
+
+    @Override
+    public void onRecipientLastNameChanged(String text) {
+        validator.validateLastName(text);
+
+    }
+
+    @Override
+    public void onRecipientLocalNameChanged(String recipientName) {
+        validator.validateLocalName(recipientName);
+    }
+
+    @Override
+    public void onRecipientCityChanged(String text) {
+        validator.validateCity(text);
+
+    }
+
+    @Override
+    public void onRecipientAddressChanged(String text) {
+        validator.validateAddress(text);
+
+    }
+
+    @Override
+    public void onRecipientMobileNumberChanged(String text) {
+        validator.validateMobileNumber(text);
+    }
+
+    @Override
+    public void onRecipientEmailChanged(String text) {
+        validator.validateEmail(text);
+    }
+
+    @Override
+    public void onRecipientIdNumberChanged(String text) {
+        validator.validateIdNumber(text);
+    }
+
+    @Override
+    public void onRecipientFirstNameLocalChanged(String text) {
+        validator.validateFirstNameLocal(text);
+    }
+
+    @Override
+    public void onRecipientMiddleNameLocalChanged(String text) {
+        validator.validateMiddleNameLocal(text);
+    }
+
+    @Override
+    public void onRecipientLastNameLocalChanged(String text) {
+        validator.validateLastNameLocal(text);
+    }
+
+
+
     @Override
     public List<CountryServiceModel> getAvailableCountryServiceData() {
         return this.availableCountryServiceData;

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java

@@ -2,6 +2,7 @@ package com.gmeremit.online.gmeremittance_native.recipientV3.view.recipientadded
 
 import android.os.Bundle;
 import android.view.View;
+import android.widget.LinearLayout;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
@@ -25,11 +26,10 @@ import static android.view.View.GONE;
 
 public class RecipientAddEditV3Activity extends BaseActivity implements RecipientAddV3ContractInterface, View.OnClickListener {
 
-    @BindView(R.id.recieverNameFormInputField)
-    GMEFormInputField recieverNameFormInputField;
 
-    @BindView(R.id.recieverAddressFormInputField)
-    GMEFormInputField recieverAddressFormInputField;
+    @BindView(R.id.receiverFromViewContainer)
+    LinearLayout receiverFormViewContainer;
+
 
     @BindView(R.id.recieverCountryViewContainer)
     View recieverCountryViewContainer;
@@ -43,16 +43,114 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
     @BindView(R.id.recieverPaymentMethodSelectionFormInputField)
     GMEFormInputField recieverPaymentMethodSelectionFormInputField;
 
+    @BindView(R.id.receiverBankViewContainer)
+    View receiverBankViewContainer;
+
+    @BindView(R.id.recieverBankSelectionFormInputField)
+    GMEFormInputField recieverBankSelectionFormInputField;
+
+    @BindView(R.id.receiverBranchViewContainer)
+    View receiverBranchViewContainer;
+
+    @BindView(R.id.recieverBranchSelectionFormInputField)
+    GMEFormInputField recieverBranchSelectionFormInputField;
+
+
+    @BindView(R.id.recieverAccountNoFormInputField)
+    GMEFormInputField recieverAccountNoFormInputField;
+
+    @BindView(R.id.recieverFirstNameFormInputField)
+    GMEFormInputField recieverFirstNameFormInputField;
+
+    @BindView(R.id.recieverMiddleNameFormInputField)
+    GMEFormInputField recieverMiddleNameFormInputField;
+
+    @BindView(R.id.recieverLastNameFormInputField)
+    GMEFormInputField recieverLastNameFormInputField;
+
+    @BindView(R.id.recieverFirstNameLocalFormInputField)
+    GMEFormInputField recieverFirstNameLocalFormInputField;
+
+    @BindView(R.id.recieverMiddleNameLocalFormInputField)
+    GMEFormInputField recieverMiddleNameLocalFormInputField;
+
+    @BindView(R.id.recieverLastNameLocalFormInputField)
+    GMEFormInputField recieverLastNameLocalFormInputField;
+
+
+    @BindView(R.id.recieverLocalNameFormInputField)
+    GMEFormInputField recieverLocalNameFormInputField;
+
+
+    @BindView(R.id.receiverStateViewContainer)
+    View receiverStateViewContainer;
+
+    @BindView(R.id.recieverStateSelectionFormInputField)
+    GMEFormInputField recieverStateSelectionFormInputField;
+
+    @BindView(R.id.receiverDistrictViewContainer)
+    View receiverDistrictViewContainer;
+
+    @BindView(R.id.recieverDistrictSelectionFormInputField)
+    GMEFormInputField recieverDistrictSelectionFormInputField;
+
+    @BindView(R.id.recieverCityFormInputField)
+    GMEFormInputField recieverCityFormInputField;
+
+    @BindView(R.id.recieverAddressFormInputField)
+    GMEFormInputField recieverAddressFormInputField;
+
+    @BindView(R.id.receiverRelationViewContainer)
+    View receiverRelationViewContainer;
+
+    @BindView(R.id.recieverRelationSelectionFormInputField)
+    GMEFormInputField recieverRelationSelectionFormInputField;
+
+    @BindView(R.id.recieverMobileNoFormInputField)
+    GMEFormInputField recieverMobileNoFormInputField;
+
+    @BindView(R.id.recieverEmailFormInputField)
+    GMEFormInputField recieverEmailFormInputField;
+
+    @BindView(R.id.receiverTransferReasonViewContainer)
+    View receiverTransferReasonViewContainer;
+
+    @BindView(R.id.recieverTransferReasonSelectionFormInputField)
+    GMEFormInputField recieverTransferReasonSelectionFormInputField;
+
+    @BindView(R.id.receiverIDTypeViewContainer)
+    View receiverIDTypeViewContainer;
+
+    @BindView(R.id.recieverIDTypeSelectionFormInputField)
+    GMEFormInputField recieverIDTypeSelectionFormInputField;
+
+    @BindView(R.id.recieverIdNumberFormInputField)
+    GMEFormInputField recieverIdNumberFormInputField;
+
 
     GenericTextListingDialog<CountryServiceModel> countryListingDialog;
     GenericTextListingDialog<ServiceTypeModel> serviceMethodListingDialog;
 
-    RecipientNameTextWatcher recieverNameTextWatcher;
 
     public static String RECIPIENT_INFO_BUNDLE_KEY = "recipientInfoKey";
 
     private RecipientPresenterInterface presenter;
 
+    private RecipientLocalNameTextWatcher recieverNameTextWatcher;
+    private RecipientAccountNoTextWatcher recieverAccountNoTextWatcher;
+    private RecipientFirstNameTextWatcher recieverFirstNameTextWatcher;
+    private RecipientMiddleNameTextWatcher recieverMiddleNameTextWatcher;
+    private RecipientLastNameTextWatcher recieverLastNameTextWatcher;
+    private RecipientFirstNameLocalTextWatcher recieverFirstNameLocalTextWatcher;
+    private RecipientMiddleNameLocalTextWatcher recieverMiddleNameLocalTextWatcher;
+    private RecipientLastNameLocalTextWatcher recieverLastNameLocalTextWatcher;
+    private RecipientLocalNameTextWatcher recieverLocalNameTextWatcher;
+    private RecipientCityTextWatcher recieverCityTextWatcher;
+    private RecipientAddressTextWatcher recieverAddressTextWatcher;
+    private RecipientMobileNumberTextWatcher recieverMobileNoTextWatcher;
+    private RecipientEmailTextWatcher recieverEmailTextWatcher;
+    private RecipientIdNumberTextWatcher recieverIdNumberTextWatcher;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -78,14 +176,55 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
     }
 
     private void initTextWatchers() {
-        recieverNameTextWatcher = new RecipientNameTextWatcher();
+        recieverNameTextWatcher = new RecipientLocalNameTextWatcher();
+        recieverAccountNoTextWatcher= new RecipientAccountNoTextWatcher();
+        recieverFirstNameTextWatcher= new RecipientFirstNameTextWatcher();
+        recieverMiddleNameTextWatcher= new RecipientMiddleNameTextWatcher();
+        recieverLastNameTextWatcher= new RecipientLastNameTextWatcher();
+        recieverFirstNameLocalTextWatcher= new RecipientFirstNameLocalTextWatcher();
+        recieverMiddleNameLocalTextWatcher= new RecipientMiddleNameLocalTextWatcher();
+        recieverLastNameLocalTextWatcher= new RecipientLastNameLocalTextWatcher();
+        recieverLocalNameTextWatcher= new RecipientLocalNameTextWatcher();
+        recieverCityTextWatcher= new RecipientCityTextWatcher();
+        recieverAddressTextWatcher= new RecipientAddressTextWatcher();
+        recieverMobileNoTextWatcher= new RecipientMobileNumberTextWatcher();
+        recieverEmailTextWatcher= new RecipientEmailTextWatcher();
+        recieverIdNumberTextWatcher= new RecipientIdNumberTextWatcher();
+
     }
 
-    private void registerTextWatchers(boolean action) {
+    @Override
+    public  void registerTextWatchers(boolean action) {
         if (action) {
-            recieverNameFormInputField.addTextWatchers(recieverNameTextWatcher);
+            recieverLocalNameFormInputField.addTextWatchers(recieverNameTextWatcher);
+            recieverAccountNoFormInputField.addTextWatchers(recieverAccountNoTextWatcher);
+            recieverFirstNameFormInputField.addTextWatchers(recieverFirstNameTextWatcher);
+            recieverMiddleNameFormInputField.addTextWatchers(recieverMiddleNameTextWatcher);
+            recieverLastNameFormInputField.addTextWatchers(recieverLastNameTextWatcher);
+            recieverFirstNameLocalFormInputField.addTextWatchers(recieverFirstNameLocalTextWatcher);
+            recieverMiddleNameLocalFormInputField.addTextWatchers(recieverMiddleNameLocalTextWatcher);
+            recieverLastNameLocalFormInputField.addTextWatchers(recieverLastNameLocalTextWatcher);
+            recieverLocalNameFormInputField.addTextWatchers(recieverLocalNameTextWatcher);
+            recieverCityFormInputField.addTextWatchers(recieverCityTextWatcher);
+            recieverAddressFormInputField.addTextWatchers(recieverAddressTextWatcher);
+            recieverMobileNoFormInputField.addTextWatchers(recieverMobileNoTextWatcher);
+            recieverEmailFormInputField.addTextWatchers(recieverEmailTextWatcher);
+            recieverIdNumberFormInputField.addTextWatchers(recieverIdNumberTextWatcher);
         } else {
-            recieverNameFormInputField.removeTextWatchers(recieverNameTextWatcher);
+            recieverLocalNameFormInputField.removeTextWatchers(recieverNameTextWatcher);
+            recieverAccountNoFormInputField.removeTextWatchers(recieverAccountNoTextWatcher);
+            recieverFirstNameFormInputField.removeTextWatchers(recieverFirstNameTextWatcher);
+            recieverMiddleNameFormInputField.removeTextWatchers(recieverMiddleNameTextWatcher);
+            recieverLastNameFormInputField.removeTextWatchers(recieverLastNameTextWatcher);
+            recieverFirstNameLocalFormInputField.removeTextWatchers(recieverFirstNameLocalTextWatcher);
+            recieverMiddleNameLocalFormInputField.removeTextWatchers(recieverMiddleNameLocalTextWatcher);
+            recieverLastNameLocalFormInputField.removeTextWatchers(recieverLastNameLocalTextWatcher);
+            recieverLocalNameFormInputField.removeTextWatchers(recieverLocalNameTextWatcher);
+            recieverCityFormInputField.removeTextWatchers(recieverCityTextWatcher);
+            recieverAddressFormInputField.removeTextWatchers(recieverAddressTextWatcher);
+            recieverMobileNoFormInputField.removeTextWatchers(recieverMobileNoTextWatcher);
+            recieverEmailFormInputField.removeTextWatchers(recieverEmailTextWatcher);
+            recieverIdNumberFormInputField.removeTextWatchers(recieverIdNumberTextWatcher);
         }
     }
     private void registerClickListener(boolean action) {
@@ -93,18 +232,31 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
         {
             recieverCountrySelectionFormInputField.getEditTextView().setOnClickListener(new CountrySelectionClickListener());
             recieverPaymentMethodSelectionFormInputField.getEditTextView().setOnClickListener(new PaymentMethodSelectionClickListener());
+            recieverBankSelectionFormInputField.getEditTextView().setOnClickListener(new BankSelectionClickListener());
+            recieverBranchSelectionFormInputField.getEditTextView().setOnClickListener(new BranchSelectionClickListener());
+            recieverStateSelectionFormInputField.getEditTextView().setOnClickListener(new StateSelectionClickListener());
+            recieverDistrictSelectionFormInputField.getEditTextView().setOnClickListener(new DistrictSelectionClickListener());
+            recieverRelationSelectionFormInputField.getEditTextView().setOnClickListener(new RelationSelectionClickListener());
+            recieverTransferReasonSelectionFormInputField.getEditTextView().setOnClickListener(new TransferReasonSelectionClickListener());
+            recieverIDTypeSelectionFormInputField.getEditTextView().setOnClickListener(new IDTypeSelectionClickListener());
         }
         else
         {
             recieverCountrySelectionFormInputField.getEditTextView().setOnClickListener(null);
             recieverPaymentMethodSelectionFormInputField.getEditTextView().setOnClickListener(null);
+            recieverBankSelectionFormInputField.getEditTextView().setOnClickListener(null);
+            recieverBranchSelectionFormInputField.getEditTextView().setOnClickListener(null);
+            recieverStateSelectionFormInputField.getEditTextView().setOnClickListener(null);
+            recieverDistrictSelectionFormInputField.getEditTextView().setOnClickListener(null);
+            recieverRelationSelectionFormInputField.getEditTextView().setOnClickListener(null);
+            recieverTransferReasonSelectionFormInputField.getEditTextView().setOnClickListener(null);
+            recieverIDTypeSelectionFormInputField.getEditTextView().setOnClickListener(null);
         }
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        registerTextWatchers(true);
         registerClickListener(true);
     }
 
@@ -113,7 +265,6 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
     @Override
     protected void onStop() {
         super.onStop();
-        registerTextWatchers(false);
         registerClickListener(false);
 
 
@@ -121,23 +272,23 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
     @Override
     public void updateValidationRuleToWidgetFullName(boolean showWidget, boolean shouldAllowSpecialCharacters, int maxLength) {
-        recieverNameFormInputField.setInputFilters(InputFilterFactory.getRequiredInputFilters(shouldAllowSpecialCharacters, maxLength));
+        recieverLocalNameFormInputField.setInputFilters(InputFilterFactory.getRequiredInputFilters(shouldAllowSpecialCharacters, maxLength));
         if (showWidget) {
-            recieverNameFormInputField.setVisibility(View.VISIBLE);
+            recieverLocalNameFormInputField.setVisibility(View.VISIBLE);
         } else
-            recieverNameFormInputField.setVisibility(GONE);
+            recieverLocalNameFormInputField.setVisibility(GONE);
     }
 
     @Override
     public void updateValueToWidgetFullName(String name) {
-        recieverNameFormInputField.removeTextWatchers(recieverNameTextWatcher);
-        recieverNameFormInputField.getEditTextView().setText(name);
-        recieverNameFormInputField.addTextWatchers(recieverNameTextWatcher);
+        recieverLocalNameFormInputField.removeTextWatchers(recieverNameTextWatcher);
+        recieverLocalNameFormInputField.getEditTextView().setText(name);
+        recieverLocalNameFormInputField.addTextWatchers(recieverNameTextWatcher);
     }
 
     @Override
     public void setErrorOnWidgetFullName(String error) {
-        recieverNameFormInputField.updateErrorSafely(error);
+        recieverLocalNameFormInputField.updateErrorSafely(error);
 
     }
 
@@ -171,7 +322,23 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
     @Override
     public void hideAllViewExceptCountry() {
+        hideViewFromIndexId(2);
+
+    }
 
+    @Override
+    public void hideAllFormInputFields() {
+        hideViewFromIndexId(1);
+    }
+
+    private void hideViewFromIndexId(int indexId)
+    {
+        if(indexId<0)
+            return;
+        for(int i = indexId; i< receiverFormViewContainer.getChildCount(); i++)
+        {
+            receiverFormViewContainer.getChildAt(i).setVisibility(GONE);
+        }
     }
 
     @Override
@@ -227,10 +394,206 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
         }
     }
 
-    public class RecipientNameTextWatcher extends TextWatcherAdapter {
+    public class BankSelectionClickListener implements View.OnClickListener
+    {
+
+        @Override
+        public void onClick(View v) {
+            hideKeyBoard();
+//            if (serviceMethodListingDialog == null)
+//                serviceMethodListingDialog = new GenericTextListingDialog<>();
+//            serviceMethodListingDialog.setData(presenter.getAvailableServiceMethodList());
+//            serviceMethodListingDialog.setListener(selectedPaymentMethod ->
+//            {
+//                presenter.onServiceTypeSelected(selectedPaymentMethod);
+//                serviceMethodListingDialog.dismiss();
+//            });
+//            serviceMethodListingDialog.setHintAndTitle("Search payment method", "Select payment method", "No payment method found.");
+//            serviceMethodListingDialog.disableSearch(false);
+//            if (!serviceMethodListingDialog.isAdded())
+//                serviceMethodListingDialog.show(getSupportFragmentManager(), "PaymentMethodListingDialog");
+        }
+    }
+
+    public class BranchSelectionClickListener implements View.OnClickListener
+    {
+
+        @Override
+        public void onClick(View v) {
+            hideKeyBoard();
+//            if (serviceMethodListingDialog == null)
+//                serviceMethodListingDialog = new GenericTextListingDialog<>();
+//            serviceMethodListingDialog.setData(presenter.getAvailableServiceMethodList());
+//            serviceMethodListingDialog.setListener(selectedPaymentMethod ->
+//            {
+//                presenter.onServiceTypeSelected(selectedPaymentMethod);
+//                serviceMethodListingDialog.dismiss();
+//            });
+//            serviceMethodListingDialog.setHintAndTitle("Search payment method", "Select payment method", "No payment method found.");
+//            serviceMethodListingDialog.disableSearch(false);
+//            if (!serviceMethodListingDialog.isAdded())
+//                serviceMethodListingDialog.show(getSupportFragmentManager(), "PaymentMethodListingDialog");
+        }
+    }
+
+    public class StateSelectionClickListener implements View.OnClickListener
+    {
+
+        @Override
+        public void onClick(View v) {
+            hideKeyBoard();
+//            if (serviceMethodListingDialog == null)
+//                serviceMethodListingDialog = new GenericTextListingDialog<>();
+//            serviceMethodListingDialog.setData(presenter.getAvailableServiceMethodList());
+//            serviceMethodListingDialog.setListener(selectedPaymentMethod ->
+//            {
+//                presenter.onServiceTypeSelected(selectedPaymentMethod);
+//                serviceMethodListingDialog.dismiss();
+//            });
+//            serviceMethodListingDialog.setHintAndTitle("Search payment method", "Select payment method", "No payment method found.");
+//            serviceMethodListingDialog.disableSearch(false);
+//            if (!serviceMethodListingDialog.isAdded())
+//                serviceMethodListingDialog.show(getSupportFragmentManager(), "PaymentMethodListingDialog");
+        }
+    }
+    public class DistrictSelectionClickListener implements View.OnClickListener
+    {
+
+        @Override
+        public void onClick(View v) {
+            hideKeyBoard();
+//            if (serviceMethodListingDialog == null)
+//                serviceMethodListingDialog = new GenericTextListingDialog<>();
+//            serviceMethodListingDialog.setData(presenter.getAvailableServiceMethodList());
+//            serviceMethodListingDialog.setListener(selectedPaymentMethod ->
+//            {
+//                presenter.onServiceTypeSelected(selectedPaymentMethod);
+//                serviceMethodListingDialog.dismiss();
+//            });
+//            serviceMethodListingDialog.setHintAndTitle("Search payment method", "Select payment method", "No payment method found.");
+//            serviceMethodListingDialog.disableSearch(false);
+//            if (!serviceMethodListingDialog.isAdded())
+//                serviceMethodListingDialog.show(getSupportFragmentManager(), "PaymentMethodListingDialog");
+        }
+    }
+
+    public class RelationSelectionClickListener implements View.OnClickListener
+    {
+
+        @Override
+        public void onClick(View v) {
+            hideKeyBoard();
+//            if (serviceMethodListingDialog == null)
+//                serviceMethodListingDialog = new GenericTextListingDialog<>();
+//            serviceMethodListingDialog.setData(presenter.getAvailableServiceMethodList());
+//            serviceMethodListingDialog.setListener(selectedPaymentMethod ->
+//            {
+//                presenter.onServiceTypeSelected(selectedPaymentMethod);
+//                serviceMethodListingDialog.dismiss();
+//            });
+//            serviceMethodListingDialog.setHintAndTitle("Search payment method", "Select payment method", "No payment method found.");
+//            serviceMethodListingDialog.disableSearch(false);
+//            if (!serviceMethodListingDialog.isAdded())
+//                serviceMethodListingDialog.show(getSupportFragmentManager(), "PaymentMethodListingDialog");
+        }
+    }
+
+    public class TransferReasonSelectionClickListener implements View.OnClickListener
+    {
+
+        @Override
+        public void onClick(View v) {
+            hideKeyBoard();
+//            if (serviceMethodListingDialog == null)
+//                serviceMethodListingDialog = new GenericTextListingDialog<>();
+//            serviceMethodListingDialog.setData(presenter.getAvailableServiceMethodList());
+//            serviceMethodListingDialog.setListener(selectedPaymentMethod ->
+//            {
+//                presenter.onServiceTypeSelected(selectedPaymentMethod);
+//                serviceMethodListingDialog.dismiss();
+//            });
+//            serviceMethodListingDialog.setHintAndTitle("Search payment method", "Select payment method", "No payment method found.");
+//            serviceMethodListingDialog.disableSearch(false);
+//            if (!serviceMethodListingDialog.isAdded())
+//                serviceMethodListingDialog.show(getSupportFragmentManager(), "PaymentMethodListingDialog");
+        }
+    }
+
+    public class IDTypeSelectionClickListener implements View.OnClickListener
+    {
+
+        @Override
+        public void onClick(View v) {
+            hideKeyBoard();
+//            if (serviceMethodListingDialog == null)
+//                serviceMethodListingDialog = new GenericTextListingDialog<>();
+//            serviceMethodListingDialog.setData(presenter.getAvailableServiceMethodList());
+//            serviceMethodListingDialog.setListener(selectedPaymentMethod ->
+//            {
+//                presenter.onServiceTypeSelected(selectedPaymentMethod);
+//                serviceMethodListingDialog.dismiss();
+//            });
+//            serviceMethodListingDialog.setHintAndTitle("Search payment method", "Select payment method", "No payment method found.");
+//            serviceMethodListingDialog.disableSearch(false);
+//            if (!serviceMethodListingDialog.isAdded())
+//                serviceMethodListingDialog.show(getSupportFragmentManager(), "PaymentMethodListingDialog");
+        }
+    }
+
+
+    public class RecipientAccountNoTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientAccountNoChanged(text);
+        }
+    }
+
+    public class RecipientFirstNameTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientFirstNameChanged(text);
+        }
+    }
+
+    public class RecipientMiddleNameTextWatcher extends TextWatcherAdapter {
         @Override
         public void onTextUpdated(String text) {
-            presenter.onRecipientNameChanged(text);
+            presenter.onRecipientMiddleNameChanged(text);
+        }
+    }
+
+    public class RecipientLastNameTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientLastNameChanged(text);
+        }
+    }
+
+    public class RecipientFirstNameLocalTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientFirstNameLocalChanged(text);
+        }
+    }
+
+    public class RecipientMiddleNameLocalTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientMiddleNameLocalChanged(text);
+        }
+    }
+
+    public class RecipientLastNameLocalTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientLastNameLocalChanged(text);
+        }
+    }
+
+    public class RecipientCityTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientCityChanged(text);
 
         }
     }
@@ -238,7 +601,38 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
     public class RecipientAddressTextWatcher extends TextWatcherAdapter {
         @Override
         public void onTextUpdated(String text) {
+            presenter.onRecipientAddressChanged(text);
+        }
+    }
 
+    public class RecipientMobileNumberTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientMobileNumberChanged(text);
+        }
+    }
+
+    public class RecipientEmailTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientEmailChanged(text);
         }
     }
+
+    public class RecipientIdNumberTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientIdNumberChanged(text);
+
+        }
+    }
+
+    public class RecipientLocalNameTextWatcher extends TextWatcherAdapter {
+        @Override
+        public void onTextUpdated(String text) {
+            presenter.onRecipientLocalNameChanged(text);
+        }
+    }
+
+
 }

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

@@ -13,6 +13,7 @@
         android:layout_weight="1">
 
         <LinearLayout
+            android:id="@+id/receiverFromViewContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/_8sdp"
@@ -30,7 +31,7 @@
                 android:textSize="@dimen/_14ssp" />
 
             <LinearLayout
-                android:visibility="gone"
+                android:visibility="visible"
                 android:id="@+id/recieverCountryViewContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -55,7 +56,7 @@
                    />
             </LinearLayout>
             <LinearLayout
-                android:visibility="gone"
+                android:visibility="visible"
                 android:id="@+id/receiverPaymentMethodViewContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -79,23 +80,312 @@
                     android:background="@drawable/ic_arrow_down"
                    />
             </LinearLayout>
+            <LinearLayout
+                android:visibility="visible"
+                android:id="@+id/receiverBankViewContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                    android:id="@+id/recieverBankSelectionFormInputField"
+                    style="@style/gme_form_text_input_layout"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    app:edFormHint="Select Bank"
+                    app:edFormFocusable="false"
+                    app:edFormCursorVisible="false"/>
+                <ImageView
+                    android:layout_marginStart="@dimen/_4sdp"
+                    android:layout_marginEnd="@dimen/_4sdp"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_arrow_down"
+                   />
+            </LinearLayout>
+            <LinearLayout
+                android:visibility="visible"
+                android:id="@+id/receiverBranchViewContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                    android:id="@+id/recieverBranchSelectionFormInputField"
+                    style="@style/gme_form_text_input_layout"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    app:edFormHint="Select Branch"
+                    app:edFormFocusable="false"
+                    app:edFormCursorVisible="false"/>
+                <ImageView
+                    android:layout_marginStart="@dimen/_4sdp"
+                    android:layout_marginEnd="@dimen/_4sdp"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_arrow_down"
+                    />
+            </LinearLayout>
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverAccountNoFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="Account Number" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverFirstNameFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="First Name" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverFirstNameLocalFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="First Name (Local)" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverMiddleNameFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="Middle Name" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverMiddleNameLocalFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="Middle Name  (Local)" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverLastNameFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="Last Name" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverLastNameLocalFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="Last Name  (Local)" />
+
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverLocalNameFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="Local Name" />
+
+            <LinearLayout
+                android:visibility="visible"
+                android:id="@+id/receiverStateViewContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                    android:id="@+id/recieverStateSelectionFormInputField"
+                    style="@style/gme_form_text_input_layout"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    app:edFormHint="Select State/Porvince"
+                    app:edFormFocusable="false"
+                    app:edFormCursorVisible="false"/>
+                <ImageView
+                    android:layout_marginStart="@dimen/_4sdp"
+                    android:layout_marginEnd="@dimen/_4sdp"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_arrow_down"
+                   />
+            </LinearLayout>
+            <LinearLayout
+                android:visibility="visible"
+                android:id="@+id/receiverDistrictViewContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                    android:id="@+id/recieverDistrictSelectionFormInputField"
+                    style="@style/gme_form_text_input_layout"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    app:edFormHint="Select District"
+                    app:edFormFocusable="false"
+                    app:edFormCursorVisible="false"/>
+                <ImageView
+                    android:layout_marginStart="@dimen/_4sdp"
+                    android:layout_marginEnd="@dimen/_4sdp"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_arrow_down"
+                   />
+            </LinearLayout>
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
-                android:visibility="gone"
+                android:visibility="visible"
                 android:layout_marginEnd="@dimen/_1sdp"
-                android:id="@+id/recieverNameFormInputField"
+                android:id="@+id/recieverCityFormInputField"
                 style="@style/gme_form_text_input_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:edFormHint="Full Name" />
+                app:edFormHint="City" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
-                android:visibility="gone"
+                android:visibility="visible"
                 style="@style/gme_form_text_input_layout"
                 android:id="@+id/recieverAddressFormInputField"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:edFormHint="Address" />
+
+            <LinearLayout
+                android:visibility="visible"
+                android:id="@+id/receiverRelationViewContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                    android:id="@+id/recieverRelationSelectionFormInputField"
+                    style="@style/gme_form_text_input_layout"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    app:edFormHint="Select Relation"
+                    app:edFormFocusable="false"
+                    app:edFormCursorVisible="false"/>
+                <ImageView
+                    android:layout_marginStart="@dimen/_4sdp"
+                    android:layout_marginEnd="@dimen/_4sdp"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_arrow_down"
+                    />
+            </LinearLayout>
+
+
+
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverMobileNoFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="Mobile Number" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverEmailFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="Email" />
+
+
+            <LinearLayout
+                android:visibility="visible"
+                android:id="@+id/receiverTransferReasonViewContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                    android:id="@+id/recieverTransferReasonSelectionFormInputField"
+                    style="@style/gme_form_text_input_layout"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    app:edFormHint="Select Relation"
+                    app:edFormFocusable="false"
+                    app:edFormCursorVisible="false"/>
+                <ImageView
+                    android:layout_marginStart="@dimen/_4sdp"
+                    android:layout_marginEnd="@dimen/_4sdp"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_arrow_down"
+                    />
+            </LinearLayout>
+
+            <LinearLayout
+                android:visibility="visible"
+                android:id="@+id/receiverIDTypeViewContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                    android:id="@+id/recieverIDTypeSelectionFormInputField"
+                    style="@style/gme_form_text_input_layout"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    app:edFormHint="Select ID Type"
+                    app:edFormFocusable="false"
+                    app:edFormCursorVisible="false"/>
+                <ImageView
+                    android:layout_marginStart="@dimen/_4sdp"
+                    android:layout_marginEnd="@dimen/_4sdp"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_arrow_down"
+                    />
+            </LinearLayout>
+
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+                android:visibility="visible"
+                android:layout_marginEnd="@dimen/_1sdp"
+                android:id="@+id/recieverIdNumberFormInputField"
+                style="@style/gme_form_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:edFormHint="ID Number" />
+
+
+
+
+
         </LinearLayout>
     </ScrollView>