Inbound add account process started

app/src/main/AndroidManifest.xml

@@ -26,10 +26,15 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:allowBackup">
-        <activity android:name=".topup.local.view.history.LocalTopUpHistoryActivity"
+        <activity android:name=".accountmanage.view.inboundaccountmanage.InboundAccountAddActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar"
+             android:theme="@style/ActivityDialog"
             android:windowSoftInputMode="stateAlwaysHidden"></activity>
+        <activity
+            android:name=".topup.local.view.history.LocalTopUpHistoryActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
             android:name=".topup.local.view.topup.LocalTopUpActivity"
             android:screenOrientation="portrait"
@@ -207,7 +212,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
-
         <activity
             android:name=".gme_branches.view.GmeBranchesActivity"
             android:screenOrientation="portrait"

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/adapter/autodebitaccountmanage/AccountListingRvAdapter.java

@@ -7,8 +7,8 @@ import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AccountAddRVViewHolder;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AccountListingRVViewHolder;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AccountAddRVViewHolder;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AccountListingRVViewHolder;
 
 import java.util.ArrayList;
 import java.util.Iterator;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/adapter/autodebitaccountmanage/InboundAccountListingRvAdapter.java

@@ -56,7 +56,7 @@ public class InboundAccountListingRvAdapter extends RecyclerView.Adapter<Inbound
 
     public static class InboundAccountListRvViewholder extends RecyclerView.ViewHolder {
 
-        @BindView(R.id.bankName)
+        @BindView(R.id.bankNameTxtView)
         TextView bankName;
 
         @BindView(R.id.accNo)

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/autodebitaccountmanage/AutoDebitAccountListingV2Gateway.java

@@ -21,11 +21,6 @@ public class AutoDebitAccountListingV2Gateway extends PrivilegedGateway implemen
         return HttpClientV2.getInstance().getInboundAccountList(auth,Uid);
     }
 
-    @Override
-    public Observable<ResponseBody> getKoreanBankList(String auth, String Uid) {
-        return HttpClientV2.getInstance().getKoreanBankList(auth);
-
-    }
 
     @Override
     public Observable<ResponseBody> checkAutoDebitAccountForRenewal(String auth, String Uid) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/inboundaccountmanage/InboundAccountAddV2Gateway.java

@@ -0,0 +1,35 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.gateway.inboundaccountmanage;
+
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody;
+import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2InteractorInterface;
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
+import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2;
+import com.google.gson.JsonObject;
+
+import io.reactivex.Observable;
+import okhttp3.ResponseBody;
+
+public class InboundAccountAddV2Gateway extends PrivilegedGateway implements InboundAccountAddV2InteractorInterface.InboundAccountAddV2GatewayInterface {
+
+    @Override
+    public Observable<ResponseBody> getKoreanBankList(String auth, String Uid) {
+        return HttpClientV2.getInstance().getKoreanBankList(auth);
+
+    }
+
+    @Override
+    public Observable<ResponseBody> startPennyTest(String auth, String userId, InboundAccountAddRequestBody requestBody) {
+        return HttpClientV2.getInstance().startInboundPennyTestStart(auth,userId,requestBody);
+    }
+
+    @Override
+    public Observable<ResponseBody> submitPennyTest(String auth, String userId, String bankCode, String accountNo, String cerNumber) {
+        JsonObject jsonObject=new JsonObject() ;
+        jsonObject.addProperty("CustomerId",userId);
+        jsonObject.addProperty("BankCode",bankCode);
+        jsonObject.addProperty("AccountNo",accountNo);
+        jsonObject.addProperty("CertNumber",cerNumber);
+        return HttpClientV2.getInstance().performInboundPennyTestSubmit(auth,jsonObject);
+    }
+
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/InboundAccount.java

@@ -1,9 +1,12 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
-public class InboundAccount {
+public class InboundAccount implements Parcelable {
 
     @SerializedName("BankCode")
     @Expose
@@ -61,4 +64,41 @@ public class InboundAccount {
         this.accountNo = accountNo;
     }
 
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.bankCode);
+        dest.writeValue(this.isPennyTestSuccess);
+        dest.writeValue(this.isPrimary);
+        dest.writeString(this.bank);
+        dest.writeString(this.accountNo);
+    }
+
+    public InboundAccount() {
+    }
+
+    protected InboundAccount(Parcel in) {
+        this.bankCode = in.readString();
+        this.isPennyTestSuccess = (Boolean) in.readValue(Boolean.class.getClassLoader());
+        this.isPrimary = (Boolean) in.readValue(Boolean.class.getClassLoader());
+        this.bank = in.readString();
+        this.accountNo = in.readString();
+    }
+
+    public static final Parcelable.Creator<InboundAccount> CREATOR = new Parcelable.Creator<InboundAccount>() {
+        @Override
+        public InboundAccount createFromParcel(Parcel source) {
+            return new InboundAccount(source);
+        }
+
+        @Override
+        public InboundAccount[] newArray(int size) {
+            return new InboundAccount[size];
+        }
+    };
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/KoreanBankDTO.java

@@ -13,4 +13,28 @@ public class KoreanBankDTO {
     @SerializedName("Name")
     @Expose
     private String bankName;
+
+    public KoreanBankDTO() {
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    @Override
+    public String toString() {
+        return bankName;
+    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/inboundaccountmanage/InboundAccountAddRequestBody.java

@@ -0,0 +1,88 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage;
+
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class InboundAccountAddRequestBody {
+
+    @SerializedName("accountType")
+    @Expose
+    private String accountType;
+
+    @SerializedName("bankCode")
+    @Expose
+    private String bankCode;
+
+    private String bankName;
+
+    @SerializedName("accountNo")
+    @Expose
+    private String accountNo;
+
+    @SerializedName("accountID")
+    @Expose
+    private String accountId;
+
+    public InboundAccountAddRequestBody(String accountType, String bankCode, String accountNo, String accountId,String bankName) {
+        this.accountType = accountType;
+        this.bankCode = bankCode;
+        this.accountNo = accountNo;
+        this.accountId = accountId;
+        this.bankName=bankName;
+    }
+
+    public InboundAccountAddRequestBody() {
+    }
+
+    public String getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(String accountType) {
+        this.accountType = accountType;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
+    }
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public static InboundAccountAddRequestBody createRequestBodyFromAutoDebitAccount(AutoDebitAccount autoDebitAccount)
+    {
+        return new InboundAccountAddRequestBody("autodebit",autoDebitAccount.getBankCode(),autoDebitAccount.getAccountNumMasked(),autoDebitAccount.getKftcAccountId(),autoDebitAccount.getBankName());
+    }
+    public static InboundAccountAddRequestBody createRequestBodyFromInboundAccount(InboundAccount inboundAccount)
+    {
+        return new InboundAccountAddRequestBody("",inboundAccount.getBankCode(),inboundAccount.getAccountNo(),"",inboundAccount.getBank());
+
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2InteractorInterface.java

@@ -13,7 +13,6 @@ public interface AutoDebitAccountListingV2InteractorInterface extends BaseIntera
     {
         Observable<ResponseBody> getAutDebitAccountsFromNetwork(String auth, String Uid);
         Observable<ResponseBody> getInboundAccountsFromNetwork(String auth, String Uid);
-        Observable<ResponseBody> getKoreanBankList(String auth, String Uid);
 
         Observable<ResponseBody> checkAutoDebitAccountForRenewal(String auth,String Uid);
         Observable<ResponseBody> deleteAccountFromNetwork(String auth, String Uid, String kftcAccountID);

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2Presenter.java

@@ -38,7 +38,6 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
     private final AutoDebitAccountListingV2GatewayInterface gateway;
     private CompositeDisposable compositeDisposable;
     private AutoDebitRegistrationDTO autoDebitRegistrationRelatedData;
-    private List<KoreanBankDTO> koreanBankList;
 
 
     private io.reactivex.subjects.BehaviorSubject<List<AutoDebitAccount>> autoDebitAccountBehaviorSubject;
@@ -66,7 +65,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
     public void getAccountRelatedData() {
 
         compositeDisposable.add(
-                Observable.zip(getAutoDebitAccountList(), getInboundAccountList(),getKoreanBankList(), AccountDTO::new)
+                Observable.zip(getAutoDebitAccountList(), getInboundAccountList(), AccountDTO::new)
                         .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .observeOn(AndroidSchedulers.mainThread())
                         .doFinally(() -> view.showProgressBar(false, ""))
@@ -92,20 +91,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
                 });
     }
 
-    private Observable<List<KoreanBankDTO>> getKoreanBankList() {
-        Type bankResponseType = new TypeToken<GenericResponseDataModel<List<KoreanBankDTO>>>() {
-        }.getType();
 
-        return this.gateway.getKoreanBankList(this.gateway.getAuth(), this.gateway.getUserIDNumber())
-                .subscribeOn(Schedulers.io())
-                .flatMap(response -> {
-                    GenericResponseDataModel<List<KoreanBankDTO>> data = HttpClientV2.getDeserializer().fromJson(response.string(), bankResponseType);
-                    if (data.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
-                        return Observable.just(data.getData());
-                    } else
-                        return Observable.just(new ArrayList<>());
-                });
-    }
 
     private Observable<AutoDebitModel> getAutoDebitAccountList() {
         Type accountResponseType = new TypeToken<GenericResponseDataModel<AutoDebitModel>>() {
@@ -181,14 +167,12 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
     }
 
      static class AccountDTO {
-         private final List<KoreanBankDTO> koreanBankList;
          private final AutoDebitModel autoDebitRelatedData;
          private final List<InboundAccount> inboundAccountList;
 
-        public AccountDTO(AutoDebitModel autoDebitAccountList, List<InboundAccount> inboundAccountList,List<KoreanBankDTO> koreanBankList) {
+        public AccountDTO(AutoDebitModel autoDebitAccountList, List<InboundAccount> inboundAccountList) {
             this.autoDebitRelatedData = autoDebitAccountList;
             this.inboundAccountList = inboundAccountList;
-            this.koreanBankList=koreanBankList;
         }
 
         public AutoDebitModel getAutoDebitRelatedData() {
@@ -199,9 +183,6 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
             return inboundAccountList;
         }
 
-         public List<KoreanBankDTO> getKoreanBankList() {
-             return koreanBankList;
-         }
      }
 
     public class AccountListObserver extends DisposableObserver<AccountDTO> {
@@ -217,10 +198,6 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
             {
                 inboundAccountBehaviorSubject.onNext(accountData.getInboundAccountList());
             }
-            if(accountData.getKoreanBankList()!=null)
-            {
-                koreanBankList=accountData.getKoreanBankList();
-            }
 
         }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2InteractorInterface.java

@@ -0,0 +1,21 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage;
+
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody;
+import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface;
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface;
+
+import io.reactivex.Observable;
+import okhttp3.ResponseBody;
+
+public interface InboundAccountAddV2InteractorInterface extends BaseInteractorInterface {
+
+
+     interface InboundAccountAddV2GatewayInterface extends PrivilegedGatewayInterface
+    {
+        Observable<ResponseBody> getKoreanBankList(String auth, String Uid);
+
+        Observable<ResponseBody> startPennyTest(String auth, String userId, InboundAccountAddRequestBody requestBody);
+
+        Observable<ResponseBody> submitPennyTest(String auth,String userId,String bankCode, String accountNo, String cerNumber);
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java

@@ -0,0 +1,262 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KoreanBankDTO;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountConfirmFragment;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountPennyTestFragment;
+import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
+import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
+import com.gmeremit.online.gmeremittance_native.utils.Constants;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponseV2;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericResponseDataModel;
+import com.gmeremit.online.gmeremittance_native.utils.https.MessageResponseDataModel;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+import io.reactivex.subjects.BehaviorSubject;
+
+public class InboundAccountAddV2Presenter extends BasePresenter implements InboundAccountAddV2PresenterInterface {
+
+
+    private final InboundAccountAddV2ContractInterface view;
+    private final InboundAccountAddV2InteractorInterface.InboundAccountAddV2GatewayInterface gateway;
+    private final CompositeDisposable compositeDisposable;
+    private InboundAccountAddRequestBody pennyTestRequestBody;
+    private List<KoreanBankDTO> availableKoreanBankList;
+    private BehaviorSubject<InboundAddAccountConfirmFragment.InboundAddAccountViewDTO> addAcountDataSubject;
+    private BehaviorSubject<InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO> pennyTestDataSubject;
+
+    public InboundAccountAddV2Presenter(InboundAccountAddV2ContractInterface view, InboundAccountAddV2InteractorInterface.InboundAccountAddV2GatewayInterface gateway) {
+        this.view = view;
+        this.gateway = gateway;
+        this.compositeDisposable = new CompositeDisposable();
+        this.pennyTestRequestBody=new InboundAccountAddRequestBody();
+        this.availableKoreanBankList=new ArrayList<>();
+        addAcountDataSubject=BehaviorSubject.create();
+        pennyTestDataSubject=BehaviorSubject.create();
+
+    }
+
+    @Override
+    public void updateAutoDebitAccountData(AutoDebitAccount autoDebitAccount) {
+        this.pennyTestRequestBody = InboundAccountAddRequestBody.createRequestBodyFromAutoDebitAccount(autoDebitAccount);
+
+        InboundAddAccountConfirmFragment.InboundAddAccountViewDTO addAccountViewDTO=new InboundAddAccountConfirmFragment.InboundAddAccountViewDTO(autoDebitAccount.getBankName(),autoDebitAccount.getBankCode(),autoDebitAccount.getAccountNumMasked(),false);
+
+        addAcountDataSubject.onNext(addAccountViewDTO);
+    }
+
+    @Override
+    public void updateInboundAccount(InboundAccount inboundAccount) {
+        this.pennyTestRequestBody = InboundAccountAddRequestBody.createRequestBodyFromInboundAccount(inboundAccount);
+        InboundAddAccountConfirmFragment.InboundAddAccountViewDTO addAccountViewDTO=new InboundAddAccountConfirmFragment.InboundAddAccountViewDTO(inboundAccount.getBank(),inboundAccount.getBankCode(),inboundAccount.getAccountNo(),false);
+
+        addAcountDataSubject.onNext(addAccountViewDTO);
+    }
+
+    @Override
+    public void getRelatedData() {
+        compositeDisposable.add(
+                this.gateway.getKoreanBankList(this.gateway.getAuth(), this.gateway.getUserIDNumber())
+                        .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .doFinally(() -> view.showProgressBar(false, ""))
+                        .subscribeWith(new KoreanBankListObserver())
+        );
+    }
+
+    @Override
+    public void requestForPennyTest() {
+        compositeDisposable.add(
+                this.gateway.startPennyTest(this.gateway.getAuth(), this.gateway.getUserIDNumber(), this.pennyTestRequestBody)
+                        .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .doFinally(() -> view.showProgressBar(false, ""))
+                        .subscribeWith(new PennyTestRequestObserver())
+        );
+
+    }
+
+
+
+    @Override
+    public void submitPennyTest(String depositReference) {
+        compositeDisposable.add(
+                this.gateway.submitPennyTest(this.gateway.getAuth(), this.gateway.getUserIDNumber(), this.pennyTestRequestBody.getBankCode(), this.pennyTestRequestBody.getAccountNo(), depositReference)
+                        .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .doFinally(() -> view.showProgressBar(false, ""))
+                        .subscribeWith(new PennyTestResultObserver())
+        );
+    }
+
+    @Override
+    public List<KoreanBankDTO> getKoreanBankList() {
+        return availableKoreanBankList;
+    }
+
+    @Override
+    public void updateBank(KoreanBankDTO selectedBank) {
+        this.pennyTestRequestBody.setBankName(selectedBank.getBankName());
+        this.pennyTestRequestBody.setBankCode(selectedBank.getBankCode());
+    }
+
+    @Override
+    public void onBankAccNoChanged(String bankAccNo) {
+        if(bankAccNo!=null&&bankAccNo.length()>=9)
+        {
+            pennyTestRequestBody.setAccountNo(bankAccNo);
+            view.showInvalidAccNoError(null);
+            view.enableForm1Button(true);
+        }
+        else
+        {
+            pennyTestRequestBody.setAccountNo("");
+            view.showInvalidAccNoError("Invalid bank accNo");
+            view.enableForm1Button(false);
+        }
+    }
+
+    @Override
+    public Observable<InboundAddAccountConfirmFragment.InboundAddAccountViewDTO> subscribeToInboundAddAccountDataEvent() {
+        return addAcountDataSubject;
+    }
+
+    @Override
+    public Observable<InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO> subscribeToPennyTestDataEvent() {
+        return pennyTestDataSubject;
+    }
+
+    @Override
+    public void onDepositReferenceChanged(String depositReference) {
+        if(depositReference!=null&&depositReference.length()==4)
+        {
+            view.showInvalidDepositError(null);
+            view.enableForm2Button(true);
+        }
+        else
+        {
+            view.showInvalidDepositError("4 digit pin is required");
+            view.enableForm2Button(false);
+        }
+    }
+
+    public class PennyTestRequestObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
+
+        @Override
+        protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
+            if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
+                InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO pennyTestViewDTO = new InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO(pennyTestRequestBody.getBankName(), pennyTestRequestBody.getBankCode(), pennyTestRequestBody.getAccountNo(), t.getMsg());
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> {
+                        pennyTestDataSubject.onNext(pennyTestViewDTO);
+                        view.showPennyTestScreen();
+                });
+            } else {
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
+            }
+        }
+
+        @Override
+        public void onFailed(String message) {
+            mockErrorAsSuccess();
+//            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+        }
+
+        @Override
+        protected void onConnectionNotEstablished(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+        }
+
+        @Override
+        protected void unauthorizedAccess(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+
+        }
+
+        private void mockErrorAsSuccess()
+        {
+            InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO pennyTestViewDTO = new InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO(pennyTestRequestBody.getBankName(), pennyTestRequestBody.getBankCode(), pennyTestRequestBody.getAccountNo(),"We have successfully deposited 1KRW to your bank account please check.");
+            view.showPopUpMessage("We have successfully deposited 1KRW to your bank account please check.", CustomAlertDialog.AlertType.SUCCESS, alertType -> {
+                pennyTestDataSubject.onNext(pennyTestViewDTO);
+                view.showPennyTestScreen();
+            });
+        }
+    }
+
+    public class PennyTestResultObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
+
+        @Override
+        protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
+            if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> {
+                    view.exitView();
+                });
+            } else {
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
+            }
+        }
+
+        @Override
+        public void onFailed(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+        }
+
+        @Override
+        protected void onConnectionNotEstablished(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+        }
+
+        @Override
+        protected void unauthorizedAccess(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+
+        }
+    }
+
+    public class KoreanBankListObserver extends GenericApiObserverResponseV2<List<KoreanBankDTO>> {
+
+
+        @Override
+        protected Type getDataType() {
+            return TypeToken.getParameterized(List.class, KoreanBankDTO.class).getType();
+        }
+
+        @Override
+        protected void onSuccess(GenericResponseDataModel<List<KoreanBankDTO>> t) {
+            if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
+                availableKoreanBankList = t.getData();
+            } else {
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+            }
+        }
+
+        @Override
+        public void onFailed(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+        }
+
+        @Override
+        protected void onConnectionNotEstablished(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+        }
+
+        @Override
+        protected void unauthorizedAccess(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+
+        }
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2PresenterInterface.java

@@ -0,0 +1,50 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage;
+
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KoreanBankDTO;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountConfirmFragment;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountPennyTestFragment;
+import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
+import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+
+import java.util.List;
+
+import io.reactivex.Observable;
+
+public interface InboundAccountAddV2PresenterInterface extends BasePresenterInterface {
+
+     void updateAutoDebitAccountData(AutoDebitAccount autoDebitAccount);
+     void updateInboundAccount(InboundAccount inboundAccount);
+
+     void getRelatedData();
+
+     void requestForPennyTest();
+
+     void submitPennyTest(String depositReference);
+
+    List<KoreanBankDTO> getKoreanBankList();
+
+    void updateBank(KoreanBankDTO selectedBank);
+
+    void onBankAccNoChanged(String bankAccNo);
+
+    Observable<InboundAddAccountConfirmFragment.InboundAddAccountViewDTO> subscribeToInboundAddAccountDataEvent();
+    Observable<InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO> subscribeToPennyTestDataEvent();
+
+    void onDepositReferenceChanged(String depositReference);
+
+
+    interface InboundAccountAddV2ContractInterface extends BaseContractInterface
+    {
+        void showInvalidAccNoError(String errorMessage);
+
+        void enableForm1Button(boolean action);
+
+        void showPennyTestScreen();
+
+        void showInvalidDepositError(String errorMessage);
+
+        void enableForm2Button(boolean action);
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/AutoDebitAccountManageV2Activity.java

@@ -17,8 +17,8 @@ import com.gmeremit.online.gmeremittance_native.accountmanage.model.bankaccountv
 import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.autodebitaccountmanage.AutoDebitAccountListingV2Presenter;
 import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.autodebitaccountmanage.AutoDebitAccountListingV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.AutoDebitWebBrowserV2;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AutoDebitAccountListingFragment;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inbound.InboundAccountListingFragment;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AutoDebitAccountListingFragment;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inboundlisting.InboundAccountListingFragment;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.bankaccountvalidation.BankAccountValidationV2Activity;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
 import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AccountAddRVViewHolder.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AccountAddRVViewHolder.java

@@ -1,4 +1,4 @@
-package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting;
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AccountListingRVViewHolder.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AccountListingRVViewHolder.java

@@ -1,4 +1,4 @@
-package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting;
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
@@ -12,7 +12,7 @@ import butterknife.ButterKnife;
 
 public class AccountListingRVViewHolder extends RecyclerView.ViewHolder {
 
-    @BindView(R.id.bankName)
+    @BindView(R.id.bankNameTxtView)
     TextView bankName;
 
     @BindView(R.id.accNo)

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AutoDebitAccountListingDialog.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AutoDebitAccountListingDialog.java

@@ -1,4 +1,4 @@
-package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting;
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting;
 
 import android.app.Dialog;
 import android.content.Context;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AutoDebitAccountListingFragment.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AutoDebitAccountListingFragment.java

@@ -1,4 +1,4 @@
-package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting;
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -17,6 +17,7 @@ import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitacc
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KeyValueData;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.AutoDebitAccountManageActionListener;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.bankaccountvalidation.BankAccountValidationV2Activity;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAccountAddActivity;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericPromptDialog;
@@ -161,7 +162,7 @@ public class AutoDebitAccountListingFragment extends BaseFragment implements Acc
 
     @Override
     public void onAccountSelected(AutoDebitAccount recipientInfoModel) {
-
+        InboundAccountAddActivity.launchActivity(getActivity(),recipientInfoModel);
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/CountryListRvViewHolder.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/CountryListRvViewHolder.java

@@ -1,4 +1,4 @@
-package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting;
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/CountryListingRvAdapter.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/CountryListingRvAdapter.java

@@ -1,4 +1,4 @@
-package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting;
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountAddBottomSheetDialogFragment.java

@@ -1,51 +0,0 @@
-package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inbound;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.customwidgets.CustomProgressDialog;
-
-public class InboundAccountAddBottomSheetDialogFragment extends BottomSheetDialogFragment {
-
-    private CustomProgressDialog progressBar;
-
-    public static InboundAccountAddBottomSheetDialogFragment newInstance() {
-        return new InboundAccountAddBottomSheetDialogFragment();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-       return inflater.inflate(R.layout.dialog_fingerprint_auth_prompt, container,
-                false);
-
-        // get the views and attach the listener
-
-
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        init();
-    }
-
-    private void init()
-    {
-      progressBar=  new CustomProgressDialog();
-      progressBar.show(getChildFragmentManager(),"PB");
-      new Handler().postDelayed(()->progressBar.dismiss(),4000);
-    }
-}
-
-

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountListingFragment.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inboundlisting/InboundAccountListingFragment.java

@@ -1,25 +1,17 @@
-package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inbound;
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inboundlisting;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountListingRvAdapter;
 import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.InboundAccountListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KeyValueData;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.AutoDebitAccountManageActionListener;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.bankaccountvalidation.BankAccountValidationV2Activity;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericPromptDialog;
@@ -32,8 +24,6 @@ import butterknife.ButterKnife;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.observers.DisposableObserver;
 
-import static com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.AutoDebitAccountManageV2Activity.AUTO_DEBIT_BANK_VERIFICATION;
-
 public class InboundAccountListingFragment extends BaseFragment implements  View.OnClickListener, InboundAccountListingRvAdapter.InboundAccountActionListener {
 
     @BindView(R.id.accountListRv)
@@ -49,7 +39,7 @@ public class InboundAccountListingFragment extends BaseFragment implements  View
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_inbound_account_add, container, false);
+        return inflater.inflate(R.layout.fragment_inbound_account_list, container, false);
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActionListener.java

@@ -0,0 +1,8 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage;
+
+import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2PresenterInterface;
+
+public interface InboundAccountAddActionListener {
+
+    InboundAccountAddV2PresenterInterface getPresenter();
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java

@@ -0,0 +1,143 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.os.Build;
+import android.os.Parcelable;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.view.Window;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountManageViewPagerAdapter;
+import com.gmeremit.online.gmeremittance_native.accountmanage.gateway.inboundaccountmanage.InboundAccountAddV2Gateway;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount;
+import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2Presenter;
+import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2PresenterInterface;
+import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
+
+import java.util.ArrayList;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class InboundAccountAddActivity extends BaseActivity implements InboundAccountAddV2PresenterInterface.InboundAccountAddV2ContractInterface,InboundAccountAddActionListener {
+
+    private static final String ACCOUNT_DATA_BUNDLE_KEY = "ACCOUNT_DATA_BUNDLE_KEY";
+    @BindView(R.id.fragmentContainer)
+    ViewPager fragmentContainer;
+
+
+    private AccountManageViewPagerAdapter accountManageViewPagerAdapter;
+    private ArrayList<Fragment> fragments;
+    private InboundAccountAddV2PresenterInterface presenter;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_inbound_account_add_activitity);
+        if (Build.VERSION.SDK_INT == 26) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
+
+        Window window = getWindow();
+        if (window != null) {
+            window.getAttributes().windowAnimations = R.style.SlideInAnimation;
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+//            window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+        }
+
+
+        ButterKnife.bind(this);
+        init();
+        performDefaultAction(savedInstanceState);
+    }
+
+
+    public static void launchActivity(Context context, AutoDebitAccount autoDebitAccount) {
+        Intent intent = new Intent(context, InboundAccountAddActivity.class);
+        intent.putExtra(ACCOUNT_DATA_BUNDLE_KEY, autoDebitAccount);
+        context.startActivity(intent);
+    }
+
+    public static void launchActivity(Context context, InboundAccount inboundAccount) {
+        Intent intent = new Intent(context, InboundAccountAddActivity.class);
+        intent.putExtra(ACCOUNT_DATA_BUNDLE_KEY, inboundAccount);
+        context.startActivity(intent);
+    }
+
+    private void init() {
+        presenter = new InboundAccountAddV2Presenter(this,new InboundAccountAddV2Gateway());
+        setupViewPager();
+
+
+    }
+
+    private void performDefaultAction(Bundle savedInstance) {
+        Parcelable data = getIntent().getParcelableExtra(ACCOUNT_DATA_BUNDLE_KEY);
+        if (data != null) {
+            if (data instanceof AutoDebitAccount)
+                presenter.updateAutoDebitAccountData((AutoDebitAccount) data);
+            else
+                presenter.updateInboundAccount((InboundAccount) data);
+        } else
+            presenter.getRelatedData();
+    }
+
+
+    private void setupViewPager() {
+        accountManageViewPagerAdapter = new AccountManageViewPagerAdapter(getSupportFragmentManager());
+
+        fragments = new ArrayList<>();
+        fragments.add(new InboundAddAccountConfirmFragment());
+        fragments.add(new InboundAddAccountPennyTestFragment());
+
+
+        accountManageViewPagerAdapter.addFragments(fragments);
+
+        fragmentContainer.setAdapter(accountManageViewPagerAdapter);
+    }
+
+
+
+
+    @Override
+    public void showInvalidAccNoError(String errorMessage) {
+        ((InboundAddAccountConfirmFragment) fragments.get(0)).showInvalidAccNo(errorMessage);
+    }
+
+    @Override
+    public void enableForm1Button(boolean action) {
+        ((InboundAddAccountConfirmFragment) fragments.get(0)).enableButton(action);
+
+    }
+
+    @Override
+    public void showPennyTestScreen() {
+        fragmentContainer.setCurrentItem(1,true);
+    }
+
+    @Override
+    public void showInvalidDepositError(String errorMessage) {
+        ((InboundAddAccountPennyTestFragment) fragments.get(1)).showInvalidDepositError(errorMessage);
+
+    }
+
+    @Override
+    public void enableForm2Button(boolean action) {
+        ((InboundAddAccountPennyTestFragment) fragments.get(1)).enableButton(action);
+    }
+
+    @Override
+    public InboundAccountAddV2PresenterInterface getPresenter() {
+        return this.presenter;
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountConfirmFragment.java

@@ -0,0 +1,189 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KoreanBankDTO;
+import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
+import com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField;
+import com.gmeremit.online.gmeremittance_native.customwidgets.TextWatcherAdapter;
+import com.gmeremit.online.gmeremittance_native.customwidgets.banklistingdialog.BankIconMapper;
+import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericTextListingDialog;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+import io.reactivex.observers.DisposableObserver;
+
+public class InboundAddAccountConfirmFragment extends BaseFragment {
+
+    @BindView(R.id.bankAccountNumberFormInputField)
+    GMEFormInputField bankAccountNumberFormInputField;
+
+
+    @BindView(R.id.bankSelectionFormInputField)
+    GMEFormInputField bankSelectionFormInputField;
+
+    @BindView(R.id.bank_ico_imageview)
+    ImageView bankIconImageView;
+
+    @BindView(R.id.startPennyTestButton)
+    Button startPennyTestButton;
+    private BankSelectClickListener bankSelectionClickListener;
+    private GenericTextListingDialog<KoreanBankDTO> bankListingDialog;
+    private BankAccountNumberTextWatcher bankAccountNoTextWatcher;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_inbound_account_add, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ButterKnife.bind(this, view);
+        init();
+        performDefaultAction(savedInstanceState);
+    }
+
+    private void init() {
+        bankSelectionClickListener = new BankSelectClickListener();
+        bankAccountNoTextWatcher=new BankAccountNumberTextWatcher();
+        bankSelectionFormInputField.setInputFilters (new InputFilter[]{});
+        ((InboundAccountAddActionListener) getActivity()).getPresenter().subscribeToInboundAddAccountDataEvent().subscribe(new InboundAddAccoountDataObserver());
+
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        registerTextWatchers(true);
+        bankSelectionFormInputField.getEditTextView().setOnClickListener(bankSelectionClickListener);
+    }
+
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        registerTextWatchers(false);
+        bankSelectionFormInputField.getEditTextView().setOnClickListener(null);
+    }
+
+    private void registerTextWatchers(boolean action) {
+        if (action) {
+            bankAccountNumberFormInputField.getEditTextView().addTextChangedListener(bankAccountNoTextWatcher);
+        } else {
+            bankAccountNumberFormInputField.getEditTextView().removeTextChangedListener(bankAccountNoTextWatcher);
+        }
+    }
+
+    @OnClick(R.id.startPennyTestButton)
+    public void startPennyTest() {
+        if (startPennyTestButton.isEnabled()) {
+            ((InboundAccountAddActionListener) getActivity()).getPresenter().requestForPennyTest();
+        }
+    }
+
+
+    private void performDefaultAction(Bundle savedInstance) {
+
+    }
+
+    private void updateData(InboundAddAccountViewDTO inboundAddAccountViewDTO) {
+
+        registerTextWatchers(false);
+        bankAccountNumberFormInputField.getEditTextView().setText(inboundAddAccountViewDTO.accountNo);
+        bankSelectionFormInputField.getEditTextView().setText(inboundAddAccountViewDTO.bankName);
+        bankIconImageView.setImageResource(BankIconMapper.getBankIconFromBankCode(inboundAddAccountViewDTO.bankCode));
+        bankSelectionFormInputField.setEnabled(inboundAddAccountViewDTO.enableFields);
+        bankAccountNumberFormInputField.setEnabled(inboundAddAccountViewDTO.enableFields);
+
+        registerTextWatchers(true);
+
+        startPennyTestButton.setEnabled(true);
+
+
+    }
+
+    public void showInvalidAccNo(String errorMessage) {
+            bankAccountNumberFormInputField.setEnabled(errorMessage!=null);
+            bankAccountNumberFormInputField.setError(errorMessage);
+    }
+
+    public void enableButton(boolean action) {
+        startPennyTestButton.setEnabled(action);
+    }
+
+    public class BankSelectClickListener implements View.OnClickListener {
+
+        @Override
+        public void onClick(View v) {
+
+            if (bankListingDialog == null)
+                bankListingDialog = new GenericTextListingDialog<>();
+            bankListingDialog.setData(((InboundAccountAddActionListener) getActivity()).getPresenter().getKoreanBankList());
+            bankListingDialog.setListener(selectedBank ->
+            {
+                ((InboundAccountAddActionListener) getActivity()).getPresenter().updateBank(selectedBank);
+                bankSelectionFormInputField.getEditTextView().setText(selectedBank.toString());
+                bankListingDialog.dismiss();
+            });
+            bankListingDialog.setHintAndTitle(getString(R.string.search_bank_text), getString(R.string.bank_placeholder_text), getString(R.string.no_bank_found_text));
+            bankListingDialog.disableSearch(false);
+            if (!bankListingDialog.isAdded())
+                bankListingDialog.show(getFragmentManager(), "BankSelectionDialog");
+        }
+    }
+
+    public class BankAccountNumberTextWatcher extends TextWatcherAdapter
+    {
+        @Override
+        public void afterTextChanged(Editable s) {
+            ((InboundAccountAddActionListener) getActivity()).getPresenter().onBankAccNoChanged(s.toString());
+        }
+    }
+
+    public static class InboundAddAccountViewDTO {
+        String bankName;
+        String bankCode;
+        String accountNo;
+        boolean enableFields;
+
+        public InboundAddAccountViewDTO(String bankName, String bankCode, String accountNo, boolean enableFields) {
+            this.bankName = bankName;
+            this.bankCode = bankCode;
+            this.accountNo = accountNo;
+            this.enableFields = enableFields;
+        }
+    }
+
+
+    public class InboundAddAccoountDataObserver extends DisposableObserver<InboundAddAccountViewDTO>
+    {
+
+
+        @Override
+        public void onNext(InboundAddAccountViewDTO inboundAddAccountViewDTO) {
+            updateData(inboundAddAccountViewDTO);
+        }
+
+        @Override
+        public void onError(Throwable e) {
+
+        }
+
+        @Override
+        public void onComplete() {
+
+        }
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java

@@ -0,0 +1,141 @@
+package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TextInputLayout;
+import android.text.Editable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
+import com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField;
+import com.gmeremit.online.gmeremittance_native.customwidgets.TextWatcherAdapter;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import io.reactivex.observers.DisposableObserver;
+
+public class InboundAddAccountPennyTestFragment extends BaseFragment {
+
+
+    @BindView(R.id.depositReferenceInputWrapper)
+    TextInputLayout depositReferenceInputWrapper;
+
+    @BindView(R.id.ed_creditNumber)
+    EditText ed_creditNumber;
+
+    @BindView(R.id.pennyTestCompleteButton)
+    Button pennyTestCompleteButton;
+
+    private DepositReferenceTextWatcher depositReferenceTextWatcher;
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_inbound_account_penny_test, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ButterKnife.bind(this, view);
+        init();
+        performDefaultAction(savedInstanceState);
+    }
+
+    private void init() {
+        depositReferenceTextWatcher = new DepositReferenceTextWatcher();
+        ((InboundAccountAddActionListener) getActivity()).getPresenter().subscribeToPennyTestDataEvent().subscribe(new InboundPennyTestDataObserver());
+
+    }
+
+
+    private void performDefaultAction(Bundle savedInstance) {
+
+    }
+
+    public void updateData(InboundPennyTestViewDTO inboundPennyTestViewDTO) {
+
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        ed_creditNumber.addTextChangedListener(depositReferenceTextWatcher);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        ed_creditNumber.removeTextChangedListener(depositReferenceTextWatcher);
+    }
+
+
+    public void showInvalidDepositError(String errorMessage) {
+        depositReferenceInputWrapper.setEnabled(errorMessage!=null);
+        depositReferenceInputWrapper.setError(errorMessage);
+    }
+
+    public void enableButton(boolean action) {
+        pennyTestCompleteButton.setEnabled(action);
+    }
+
+    @OnClick(R.id.pennyTestCompleteButton)
+    public void onPennyTestCompleteButtonPressed()
+    {
+        if(pennyTestCompleteButton.isEnabled())
+        {
+            ((InboundAccountAddActionListener) getActivity()).getPresenter().submitPennyTest(ed_creditNumber.getText().toString());
+
+        }
+    }
+
+
+    public class DepositReferenceTextWatcher extends TextWatcherAdapter
+    {
+        @Override
+        public void afterTextChanged(Editable s) {
+            ((InboundAccountAddActionListener) getActivity()).getPresenter().onDepositReferenceChanged(s.toString());
+        }
+    }
+
+    public static class InboundPennyTestViewDTO
+    {
+        String bankName;
+        String bankCode;
+        String accountNo;
+        String pennyTestMessage;
+
+        public InboundPennyTestViewDTO(String bankName, String bankCode, String accountNo,String pennyTestMessage) {
+            this.bankName = bankName;
+            this.bankCode = bankCode;
+            this.accountNo = accountNo;
+            this.pennyTestMessage=pennyTestMessage;
+        }
+    }
+
+    public class InboundPennyTestDataObserver extends DisposableObserver<InboundPennyTestViewDTO>
+    {
+
+
+        @Override
+        public void onNext(InboundPennyTestViewDTO inboundAddAccountViewDTO) {
+            updateData(inboundAddAccountViewDTO);
+        }
+
+        @Override
+        public void onError(Throwable e) {
+
+        }
+
+        @Override
+        public void onComplete() {
+
+        }
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java

@@ -276,7 +276,7 @@ public class CustomerSupportFragment extends DialogFragment implements CustomerS
 //        mail.setType("message/rfc822");
 //        mail.putExtra(Intent.EXTRA_EMAIL, new String[]{"support@gmeremit.com"});
 //        try {
-//            startActivity(Intent.createChooser(mail, "Send mail...."));
+//            launchActivity(Intent.createChooser(mail, "Send mail...."));
 //        } catch (ActivityNotFoundException e) {
 //            Toast.makeText(getActivity().getApplicationContext(), "There are no email clients installed", Toast.LENGTH_SHORT).show();
 //        }

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/LineDividerItemDecoration.java

@@ -5,6 +5,7 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -79,7 +80,7 @@ public class LineDividerItemDecoration extends RecyclerView.ItemDecoration {
     }
 
     @Override
-    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+    public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
         if (mOrientation == VERTICAL_LIST) {
             outRect.set(0, 0, 0, mDivider.getIntrinsicHeight());
         } else {

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java

@@ -7,7 +7,7 @@ public class BankIconMapper {
 
     public static int getBankIconFromBankCode(String bankCode) {
         if (bankCode == null || bankCode.length() < 1)
-            return 0;
+            return R.drawable.ic_bank;
 
         switch (bankCode.toUpperCase()) {
             case "002":
@@ -44,7 +44,7 @@ public class BankIconMapper {
                 return R.drawable.ico_bank_shinhan;
 
             default:
-                return 0;
+                return R.drawable.ic_bank;
         }
     }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/common/GenericTextListingDialog.java

@@ -64,13 +64,13 @@ public class GenericTextListingDialog<T> extends android.support.v4.app.DialogFr
         cancelButton.setOnClickListener(this);
         searchEditTextView.addTextChangedListener(this);
         genericTextListingRvAdapter = new GenericTextListingRvAdapter<>(this.listener);
-        genericTextListingRvAdapter.setData(this.data);
         textListRv.setAdapter(genericTextListingRvAdapter);
-        LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST);
-        textListRv.addItemDecoration(lineDividerItemDecoration);
+//        LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(textListRv.getContext(), LineDividerItemDecoration.VERTICAL_LIST);
+//        textListRv.addItemDecoration(lineDividerItemDecoration);
         titleView.setText(titleText != null && titleText.length() > 0 ? titleText : "Select Data");
         searchEditTextView.setHint(hintText != null && hintText.length() > 0 ? hintText : "Search Data");
         noDataFoundView.setHint(noDataFoundText != null && noDataFoundText.length() > 0 ? noDataFoundText : "No Data Found");
+        genericTextListingRvAdapter.setData(this.data);
         if (shouldDisableSearch)
             searchViewContainer.setVisibility(View.GONE);
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java

@@ -25,7 +25,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inbound.InboundAccountAddBottomSheetDialogFragment;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAccountAddActivity;
 import com.gmeremit.online.gmeremittance_native.agentsV2.view.AgentListV2Activity;
 import com.gmeremit.online.gmeremittance_native.appupdate.AppUpdateActivity;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.AutoDebitAccountManageV2Activity;
@@ -50,7 +50,6 @@ import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.Outbou
 import com.gmeremit.online.gmeremittance_native.user_profile.view.ProfileActivity;
 import com.gmeremit.online.gmeremittance_native.utils.ChatUtils;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;
-import com.gmeremit.online.gmeremittance_native.walletstatementV2.view.WalletStatementV2Activity;
 import com.gmeremit.online.gmeremittance_native.withdrawV2.view.WithdrawV2Activity;
 import com.text.drawable.TextDrawable;
 import com.zoyi.channel.plugin.android.ChannelIO;
@@ -313,7 +312,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
             return;
         String unverifiedMessage = presenter.checkIfUserVerified();
         if (unverifiedMessage == null)
-//            startActivity(new Intent(getApplicationContext(), RecipientListingV2Activity.class));
+//            launchActivity(new Intent(getApplicationContext(), RecipientListingV2Activity.class));
             startActivity(new Intent(getApplicationContext(), RecipientListingV3Activity.class));
         else
             showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null);
@@ -328,7 +327,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
     public void showTodaysRateView() {
         if (isNotificaitonViewActive())
             return;
-//        startActivity(new Intent(this, ExchangeMethodV2Activity.class));
+//        launchActivity(new Intent(this, ExchangeMethodV2Activity.class));
         startActivity(new Intent(this, ExchangeRateActivity.class));
 
     }
@@ -339,11 +338,14 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
 //            return;
 //        String unverifiedMessage = presenter.checkIfUserVerified();
 //        if (unverifiedMessage == null)
-//            startActivity(new Intent(getApplicationContext(), WalletStatementV2Activity.class));
+//            launchActivity(new Intent(getApplicationContext(), WalletStatementV2Activity.class));
 //        else
 //            showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null);
 
-        InboundAccountAddBottomSheetDialogFragment.newInstance().show( getSupportFragmentManager(),"Inbound add");
+//        InboundAccountAddBottomSheetDialogFragment.newInstance().show( getSupportFragmentManager(),"Inbound add");
+
+        Intent startPennyTestIntent = new Intent(this, InboundAccountAddActivity.class);
+        startActivity(startPennyTestIntent);
     }
 
     @Override
@@ -353,7 +355,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         String unverifiedMessage = presenter.checkIfUserVerified();
         if (unverifiedMessage == null)
             startActivity(new Intent(getApplicationContext(), OutboundTransactionHistoryActivityV2.class));
-//            startActivity(new Intent(getApplicationContext(), LocalTopUpActivity.class));
+//            launchActivity(new Intent(getApplicationContext(), LocalTopUpActivity.class));
         else
             showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null);
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java

@@ -11,7 +11,6 @@ import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest.PennyTestPresenterInterface;
 import com.gmeremit.online.gmeremittance_native.utils.other.Utility;
 
 import butterknife.BindView;
@@ -28,7 +27,7 @@ public class PennyTestOperationFragment extends BaseFragment implements View.OnC
     @BindView(R.id.resend_request)
     TextView resendRequest;
 
-    @BindView(R.id.accountWrapper)
+    @BindView(R.id.depositReferenceInputWrapper)
     TextInputLayout accountWrapper;
 
     @BindView(R.id.ed_creditNumber)

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java

@@ -11,7 +11,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountListingRvAdapter;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AutoDebitAccountListingDialog;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AutoDebitAccountListingDialog;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
 import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;
 import com.gmeremit.online.gmeremittance_native.recipientV2.adapter.RecipientListingRvAdapter;
@@ -183,7 +183,7 @@ public class RecipientListingV2Activity extends BaseActivity implements Recipien
 //        SendMoneyRequiredData sendMoneyRequiredData=recipientListingV2PresenterInterface.getSendMoneyRequiredData(selectedAccount);
 //        Intent intent = new Intent(RecipientListingV2Activity.this, SendMoneyV2Activity.class);
 //        intent.putExtra(RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY, sendMoneyRequiredData);
-//        startActivity(intent);
+//        launchActivity(intent);
 
     }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListingV3Activity.java

@@ -15,7 +15,7 @@ import android.widget.FrameLayout;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountListingRvAdapter;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AutoDebitAccountListingDialog;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AutoDebitAccountListingDialog;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
 import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericPromptDialog;
 import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;

app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountListingRvAdapter;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount;
-import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AutoDebitAccountListingDialog;
+import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AutoDebitAccountListingDialog;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
 import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;
 import com.gmeremit.online.gmeremittance_native.resendV2.adapter.TransactionListingRVAdapter;

app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java

@@ -37,7 +37,7 @@ import io.reactivex.disposables.CompositeDisposable;
 
 public class ResendMoneyAmountDetailFragment extends BaseFragment implements View.OnClickListener, TextView.OnEditorActionListener {
 
-    @BindView(R.id.amountDetailContinueButton)
+    @BindView(R.id.pennyTestCompleteButton)
     Button continueBtn;
 
     @BindView(R.id.sendAmountEdTxt)
@@ -191,7 +191,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.amountDetailContinueButton:
+            case R.id.pennyTestCompleteButton:
 
 
                 if (shouldCalculateExRate) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/verification/ResendVerificationDetailFragment.java

@@ -180,7 +180,7 @@ public class ResendVerificationDetailFragment extends BaseFragment implements  V
 //        String url = "https://online.gmeremit.com/Terms";
 //        Intent i = new Intent(Intent.ACTION_VIEW);
 //        i.setData(Uri.parse(url));
-//        startActivity(i);
+//        launchActivity(i);
         WebRequestModel requestModel=((ReSendMoneyActionListener)getActivity()).getPresenter().getWebRequestDataForTermsAndCondition();
         Intent intent= new Intent(getActivity(), TermsAndConditionV2BrowserActivity.class);
         intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel);

app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java

@@ -97,7 +97,7 @@ public class RewardPointsShippingActivity extends AppCompatActivity implements R
                 presenter.onSubmitClicked(id);
                 break;
             case R.id.view_locations:
-//                startActivity(new Intent(this, GmeBranchesActivity.class));
+//                launchActivity(new Intent(this, GmeBranchesActivity.class));
                 break;
         }
     }

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java

@@ -42,7 +42,7 @@ import io.reactivex.disposables.CompositeDisposable;
 
 public class AmountDetailSendMoneyFragment extends BaseFragment implements View.OnClickListener, AmountDetailExRateCountryListingDialog.ExRateCurrencySelectionListener, TextView.OnEditorActionListener {
 
-    @BindView(R.id.amountDetailContinueButton)
+    @BindView(R.id.pennyTestCompleteButton)
     Button continueBtn;
 
     @BindView(R.id.sendAmountEdTxt)
@@ -232,7 +232,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.amountDetailContinueButton:
+            case R.id.pennyTestCompleteButton:
 
 
                 if (shouldCalculateExRate) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java

@@ -57,7 +57,7 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
     @BindView(R.id.bankListContainer)
     ViewGroup bankListContainer;
 
-    @BindView(R.id.accountWrapper)
+    @BindView(R.id.depositReferenceInputWrapper)
     View accountViewContainer;
 
     @BindView(R.id.bankDetailContainer)

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java

@@ -185,7 +185,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements  View
 //        String url = "https://online.gmeremit.com/Terms";
 //        Intent i = new Intent(Intent.ACTION_VIEW);
 //        i.setData(Uri.parse(url));
-//        startActivity(i);
+//        launchActivity(i);
         WebRequestModel requestModel=((SendMoneyActionListener)getActivity()).getPresenter().getWebRequestDataForTermsAndCondition();
         Intent intent= new Intent(getActivity(),TermsAndConditionV2BrowserActivity.class);
         intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel);

app/src/main/java/com/gmeremit/online/gmeremittance_native/socials/view/SocialActivity.java

@@ -52,6 +52,6 @@ public class SocialActivity extends AppCompatActivity {
     public void onCommentClick(int position) {
         Intent intent = new Intent(this,CommentsActivity.class);
         intent.putExtra(Constants.FEED,feedsList.get(position));
-        startActivity(intent);
+        launchActivity(intent);
     }*/
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java

@@ -233,7 +233,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
                 break;
             case R.id.btn_lgn:
                 startActivity(new Intent(this, LoginV2Activity.class));
-//                startActivity(new Intent(this, PayoutCountrySelectionActivity.class));
+//                launchActivity(new Intent(this, PayoutCountrySelectionActivity.class));
 
                 break;
             case R.id.iv_back:

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java

@@ -70,5 +70,7 @@ public class API_URL {
     public static final String LOCAL_TOPUP_HISTORY = BuildConfig.API_VERSION + "/powerCall/GetChargeHistory";
     public static final String FETCH_INBOUND_ACCOUNT_DATA = BuildConfig.API_VERSION + "/inbound/mobile/bankaccounts/{userId}";
     public static final String GET_KOREAN_BANK_LIST = BuildConfig.API_VERSION + "/inbound/mobile/koreanBanks";
+    public static final String INBOUND_PENNY_TEST_START = BuildConfig.API_VERSION + "/inbound/mobile/pennytest/start/{userId}";
+    public static final String INBOUND_PENNY_TEST_SUBMIT = BuildConfig.API_VERSION + "/inbound/mobile/pennytest/getcertified";
 }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java

@@ -1,6 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.utils.https;
 
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAddSeriveAuthenticationServiceModel;
+import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody;
 import com.gmeremit.online.gmeremittance_native.changepasswordV2.model.ChangePasswordActivityV2APIResponse;
 import com.gmeremit.online.gmeremittance_native.domesticremit.send.model.DomesticRemitTxnRequestBody;
 import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalculationApiResponse;
@@ -320,5 +321,15 @@ public interface ApiEndpoints {
     @Headers("Content-Type: application/json")
     Observable<ResponseBody> getKoreanBankList(@Header("Authorization") String token);
 
+    @POST(API_URL.INBOUND_PENNY_TEST_START)
+    @Headers("Content-Type: application/json")
+    Observable<ResponseBody> startInboundPennyTestStart(@Header("Authorization") String token, @Path("userId") String userId, @Body()InboundAccountAddRequestBody requestBody);
+
+
+
+    @POST(API_URL.INBOUND_PENNY_TEST_SUBMIT)
+    @Headers("Content-Type: application/json")
+    Observable<ResponseBody> performInboundPennyTestSubmit(@Header("Authorization") String token,  @Body()JsonObject requestBody);
+
 
 }

app/src/main/res/drawable/avd_fail_transition.xml

@@ -93,8 +93,8 @@
                     android:valueTo="0"
                     android:valueType="floatType"/>
                 <objectAnimator
-                    android:startOffset="450"
-                    android:duration="350"
+                    android:startOffset="350"
+                    android:duration="300"
                     android:interpolator="@interpolator/fingerprint_on_0"
                     android:propertyName="trimPathEnd"
                     android:valueFrom="0.0"
@@ -114,8 +114,8 @@
                     android:valueTo="0"
                     android:valueType="floatType"/>
                 <objectAnimator
-                    android:startOffset="750"
-                    android:duration="350"
+                    android:startOffset="600"
+                    android:duration="300"
                     android:interpolator="@interpolator/fingerprint_on_0"
                     android:propertyName="trimPathEnd"
                     android:valueFrom="0.0"

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#fff"
+
+    tools:context=".accountmanage.view.inboundaccountmanage.InboundAccountAddActivity">
+
+   <android.support.v4.view.ViewPager
+        android:id="@+id/fragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"/>
+
+
+</android.support.constraint.ConstraintLayout>

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

@@ -23,7 +23,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/bankName"
+        android:id="@+id/bankNameTxtView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -57,6 +57,6 @@
         app:layout_constraintBottom_toBottomOf="@+id/iv_front_image"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/iv_front_image"
-        app:layout_constraintTop_toBottomOf="@+id/bankName" />
+        app:layout_constraintTop_toBottomOf="@+id/bankNameTxtView" />
 
 </android.support.constraint.ConstraintLayout>

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

@@ -25,7 +25,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/bankName"
+        android:id="@+id/bankNameTxtView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -59,6 +59,6 @@
         app:layout_constraintBottom_toBottomOf="@+id/iv_front_image"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/iv_front_image"
-        app:layout_constraintTop_toBottomOf="@+id/bankName" />
+        app:layout_constraintTop_toBottomOf="@+id/bankNameTxtView" />
 
 </android.support.constraint.ConstraintLayout>

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

@@ -418,7 +418,7 @@
 
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-            android:id="@+id/amountDetailContinueButton"
+            android:id="@+id/pennyTestCompleteButton"
             android:layout_width="200dp"
             android:layout_height="50dp"
             android:layout_gravity="center"

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

@@ -416,7 +416,7 @@
 
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-            android:id="@+id/amountDetailContinueButton"
+            android:id="@+id/pennyTestCompleteButton"
             android:layout_width="200dp"
             android:layout_height="50dp"
             android:layout_gravity="center"

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

@@ -1,61 +1,170 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout   xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView  xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:orientation="vertical"
     android:layout_height="match_parent">
-<!--    <android.support.v7.widget.CardView-->
-<!--        android:layout_margin="@dimen/_5sdp"-->
-<!--        app:cardCornerRadius="@dimen/_3sdp"-->
-<!--        android:visibility="gone"-->
-<!--        android:id="@+id/addAccountView"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        >-->
-<!--        <LinearLayout-->
-
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="70dp"-->
-<!--            android:layout_marginBottom="5dp"-->
-<!--            android:layout_marginLeft="10dp"-->
-<!--            android:layout_marginRight="10dp"-->
-<!--            android:layout_marginTop="8dp"-->
-<!--            android:background="@drawable/ic_rounded_white"-->
-<!--            android:clickable="true"-->
-<!--            android:gravity="center_vertical"-->
-<!--            android:orientation="horizontal">-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/iv_front_image"-->
-<!--                android:layout_width="50dp"-->
-<!--                android:layout_height="50dp"-->
-<!--                android:layout_centerVertical="true"-->
-<!--                android:layout_marginLeft="12dp"-->
-<!--                android:layout_marginStart="12dp"-->
-<!--                android:scaleType="centerCrop"-->
-<!--                android:src="@drawable/ic_auto_debit_renew" />-->
-
-<!--            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
-<!--                android:id="@+id/userName"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_centerVertical="true"-->
-<!--                android:layout_gravity="center"-->
-<!--                android:layout_marginLeft="10dp"-->
-<!--                android:layout_toRightOf="@id/iv_front_image"-->
-<!--                android:padding="2dp"-->
-<!--                android:text="@string/token_renewal_text"-->
-<!--                android:textColor="@color/darkgray"-->
-<!--                android:textSize="17sp" />-->
-<!--        </LinearLayout>-->
-<!--    </android.support.v7.widget.CardView>-->
-    <android.support.v7.widget.RecyclerView
-        android:paddingStart="@dimen/_5sdp"
-        android:paddingEnd="@dimen/_5sdp"
-        android:id="@+id/accountListRv"
-        app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+
+<android.support.constraint.ConstraintLayout
     android:layout_width="match_parent"
-        android:layout_height="0dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        app:layout_constraintBottom_toTopOf="@+id/txt_not_use_fingerprint"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.3"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:srcCompat="@drawable/ic_bank_link_image" />
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/txt_not_use_fingerprint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        android:gravity="center"
+        android:paddingStart="15dp"
+        android:paddingTop="10dp"
+        android:paddingEnd="15dp"
+        android:paddingBottom="15dp"
+        android:text="Link your Korean Bank Account to recieve money from abroad."
+        android:textSize="17sp"
+        app:layout_constraintBottom_toTopOf="@+id/bankAccountSelectionContainer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+
+    <LinearLayout
+        android:id="@+id/bankAccountSelectionContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="visible"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toTopOf="@+id/bankAccountNoFormInputField"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/txt_not_use_fingerprint">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/bank_ico_imageview"
+                android:layout_width="@dimen/_30sdp"
+                android:layout_height="@dimen/_30sdp"
+                android:layout_gravity="center_vertical"
+
+                android:src="@drawable/ic_bank"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.38" />
+
+        </android.support.constraint.ConstraintLayout>
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+            android:id="@+id/bankSelectionFormInputField"
+            style="@style/gme_form_text_input_layout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-        android:clipToPadding="false"/>
+            android:visibility="visible"
+            app:edFormCursorVisible="false"
+            app:edFormFocusable="false"
+            android:hint="Select Bank" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="@dimen/_4sdp"
+            android:layout_marginEnd="@dimen/_4sdp"
+            android:background="@drawable/ic_arrow_down" />
     </LinearLayout>
+
+
+
+
+
+    <LinearLayout
+        android:id="@+id/bankAccountNoFormInputField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="visible"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toTopOf="@+id/pennyTestCompleteButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/bankAccountSelectionContainer">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:layout_width="@dimen/_30sdp"
+                android:layout_height="@dimen/_30sdp"
+                android:layout_gravity="center_vertical"
+
+                android:src="@drawable/ic_account_card"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.38" />
+
+        </android.support.constraint.ConstraintLayout>
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField
+            android:id="@+id/bankAccountNumberFormInputField"
+            style="@style/gme_form_text_input_layout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:visibility="visible"
+            android:hint="Enter Account Number" />
+
+    </LinearLayout>
+
+
+
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+        android:id="@+id/startPennyTestButton"
+        android:layout_width="200dp"
+        android:layout_height="50dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="32dp"
+        android:background="@drawable/ic_rounded_background_red_coloured"
+        android:text="@string/continue_text"
+        android:enabled="false"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:textSize="@dimen/_14ssp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/bankAccountNoFormInputField" />
+
+
+</android.support.constraint.ConstraintLayout>
+</ScrollView>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/accountListRv"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_weight="1"
+    android:clipToPadding="false"
+    android:paddingStart="@dimen/_5sdp"
+    android:paddingEnd="@dimen/_5sdp"
+    app:layoutManager="android.support.v7.widget.LinearLayoutManager" />

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

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView  xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:id="@+id/bankIcon"
+        android:layout_width="@dimen/_65sdp"
+        android:layout_height="@dimen/_50sdp"
+        app:layout_constraintBottom_toBottomOf="@+id/bankNameTxtView"
+        app:layout_constraintEnd_toStartOf="@+id/guideline3"
+        app:layout_constraintTop_toTopOf="@+id/bankNameTxtView"
+        app:srcCompat="@drawable/ico_bank_jb" />
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/bankNameTxtView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:gravity="bottom|start"
+        android:minHeight="@dimen/_50sdp"
+        android:text="Sinhan Bank"
+        android:textColor="@color/black"
+        android:textSize="@dimen/_20ssp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guideline3"
+        app:layout_constraintTop_toTopOf="parent"
+        app:txtfontName="@string/semibold" />
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/bankAccNoTxtView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="123123*$% "
+        android:gravity="center"
+        android:textColor="@color/black"
+        android:textSize="@dimen/_18ssp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/barrier5"
+        app:txtfontName="@string/semibold" />
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/txt_not_use_fingerprint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingStart="15dp"
+        android:paddingTop="10dp"
+        android:paddingEnd="15dp"
+        android:paddingBottom="15dp"
+        android:text="Link your Korean Bank Account to recieve money from abroad."
+        android:textSize="17sp"
+        app:layout_constraintTop_toBottomOf="@+id/bankAccNoTxtView"
+         />
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/depositReferenceInputWrapper"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:hint="@string/deposit_reference_text"
+        android:textColorHint="@color/darkgray"
+        app:layout_constraintEnd_toStartOf="@+id/image_example"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/txt_not_use_fingerprint">
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+            android:id="@+id/ed_creditNumber"
+            style="@style/editetxtsingleline"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionDone"
+            android:inputType="number"
+            android:maxLength="4"
+            android:singleLine="false" />
+
+    </android.support.design.widget.TextInputLayout>
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/image_example"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_centerInParent="true"
+        android:layout_marginEnd="8dp"
+        android:gravity="center"
+        android:padding="10dp"
+        android:text="@string/view_sample_text"
+        android:textColor="#007aff"
+        android:textSize="10sp"
+        app:layout_constraintBottom_toBottomOf="@+id/depositReferenceInputWrapper"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/depositReferenceInputWrapper" />
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/resend_request"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_centerInParent="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:gravity="center"
+        android:padding="10dp"
+        android:text="@string/resend_request_text"
+        android:textColor="@color/colorPrimary"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/depositReferenceInputWrapper" />
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+        android:id="@+id/pennyTestCompleteButton"
+        android:layout_width="200dp"
+        android:layout_height="50dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/ic_rounded_background_red_coloured"
+        android:text="@string/continue_text"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:textSize="@dimen/_14ssp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/resend_request" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5" />
+
+    <android.support.constraint.Barrier
+        android:id="@+id/barrier5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="bankIcon,bankNameTxtView"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</android.support.constraint.ConstraintLayout>
+</ScrollView>

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

@@ -136,7 +136,7 @@
             android:visibility="gone"
             android:layout_marginTop="@dimen/_3sdp"
             android:layout_marginBottom="@dimen/_3sdp"
-            android:id="@+id/accountWrapper"
+            android:id="@+id/depositReferenceInputWrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/account_number_text"

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

@@ -16,7 +16,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:textSize="17sp"
-            app:layout_constraintBottom_toTopOf="@+id/accountWrapper"
+            app:layout_constraintBottom_toTopOf="@+id/depositReferenceInputWrapper"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -24,7 +24,7 @@
             app:layout_constraintVertical_chainStyle="packed" />
 
         <android.support.design.widget.TextInputLayout
-            android:id="@+id/accountWrapper"
+            android:id="@+id/depositReferenceInputWrapper"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -64,9 +64,9 @@
             android:text="@string/view_sample_text"
             android:textColor="#007aff"
             android:textSize="10sp"
-            app:layout_constraintBottom_toBottomOf="@+id/accountWrapper"
+            app:layout_constraintBottom_toBottomOf="@+id/depositReferenceInputWrapper"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/accountWrapper" />
+            app:layout_constraintTop_toTopOf="@+id/depositReferenceInputWrapper" />
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/resend_request"
@@ -85,7 +85,7 @@
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/accountWrapper" />
+            app:layout_constraintTop_toBottomOf="@+id/depositReferenceInputWrapper" />
 
 
 

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

@@ -25,7 +25,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/bankName"
+        android:id="@+id/bankNameTxtView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -59,6 +59,6 @@
         app:layout_constraintBottom_toBottomOf="@+id/iv_front_image"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/iv_front_image"
-        app:layout_constraintTop_toBottomOf="@+id/bankName" />
+        app:layout_constraintTop_toBottomOf="@+id/bankNameTxtView" />
 
 </android.support.constraint.ConstraintLayout>