Before changing account manage screen

app/src/main/AndroidManifest.xml

@@ -29,7 +29,8 @@
         <activity android:name=".accountmanage.view.inboundaccountmanage.InboundAccountAddActivity"
             android:screenOrientation="portrait"
              android:theme="@style/ActivityDialog"
-            android:windowSoftInputMode="stateAlwaysHidden"></activity>
+
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan"></activity>
         <activity
             android:name=".topup.local.view.history.LocalTopUpHistoryActivity"
             android:screenOrientation="portrait"

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

@@ -112,6 +112,7 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
     public void updateBank(KoreanBankDTO selectedBank) {
         this.pennyTestRequestBody.setBankName(selectedBank.getBankName());
         this.pennyTestRequestBody.setBankCode(selectedBank.getBankCode());
+        validateForm1();
     }
 
     @Override
@@ -120,14 +121,20 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
         {
             pennyTestRequestBody.setAccountNo(bankAccNo);
             view.showInvalidAccNoError(null);
-            view.enableForm1Button(true);
         }
         else
         {
-            pennyTestRequestBody.setAccountNo("");
+            pennyTestRequestBody.setAccountNo(null);
             view.showInvalidAccNoError("Invalid bank accNo");
-            view.enableForm1Button(false);
         }
+        validateForm1();
+
+
+    }
+
+    private void validateForm1()
+    {
+        view.enableForm1Button(pennyTestRequestBody.getAccountNo()!=null&&pennyTestRequestBody.getAccountNo().length()>=9&&pennyTestRequestBody.getBankCode()!=null&&pennyTestRequestBody.getBankName()!=null);
     }
 
     @Override

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

@@ -115,7 +115,7 @@ public class InboundAddAccountConfirmFragment extends BaseFragment {
     }
 
     public void showInvalidAccNo(String errorMessage) {
-            bankAccountNumberFormInputField.setEnabled(errorMessage!=null);
+            bankAccountNumberFormInputField.setErrorEnabled(errorMessage!=null);
             bankAccountNumberFormInputField.setError(errorMessage);
     }
 

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

@@ -9,11 +9,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
+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.customwidgets.GMEFormInputField;
 import com.gmeremit.online.gmeremittance_native.customwidgets.TextWatcherAdapter;
+import com.gmeremit.online.gmeremittance_native.customwidgets.banklistingdialog.BankIconMapper;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -29,6 +32,18 @@ public class InboundAddAccountPennyTestFragment extends BaseFragment {
     @BindView(R.id.ed_creditNumber)
     EditText ed_creditNumber;
 
+    @BindView(R.id.txt_pennytest_msg)
+    TextView txt_pennytest_msg;
+
+    @BindView(R.id.bankNameTxtView)
+    TextView bankNameTxtView;
+
+    @BindView(R.id.bankAccNoTxtView)
+    TextView bankAccNoTxtView;
+
+    @BindView(R.id.bankIcon)
+    ImageView bankIcon;
+
     @BindView(R.id.pennyTestCompleteButton)
     Button pennyTestCompleteButton;
 
@@ -60,7 +75,10 @@ public class InboundAddAccountPennyTestFragment extends BaseFragment {
     }
 
     public void updateData(InboundPennyTestViewDTO inboundPennyTestViewDTO) {
-
+        txt_pennytest_msg.setText(inboundPennyTestViewDTO.pennyTestMessage);
+        bankIcon.setImageResource(BankIconMapper.getBankIconFromBankCode(inboundPennyTestViewDTO.bankCode));
+        bankNameTxtView.setText(inboundPennyTestViewDTO.bankName);
+        bankAccNoTxtView.setText(inboundPennyTestViewDTO.accountNo);
     }
 
     @Override
@@ -77,7 +95,7 @@ public class InboundAddAccountPennyTestFragment extends BaseFragment {
 
 
     public void showInvalidDepositError(String errorMessage) {
-        depositReferenceInputWrapper.setEnabled(errorMessage!=null);
+        depositReferenceInputWrapper.setErrorEnabled(errorMessage!=null);
         depositReferenceInputWrapper.setError(errorMessage);
     }
 
@@ -91,7 +109,6 @@ public class InboundAddAccountPennyTestFragment extends BaseFragment {
         if(pennyTestCompleteButton.isEnabled())
         {
             ((InboundAccountAddActionListener) getActivity()).getPresenter().submitPennyTest(ed_creditNumber.getText().toString());
-
         }
     }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/receipt/gateway/DomesticRemitReceiptGateway.java

@@ -47,7 +47,7 @@ public class DomesticRemitReceiptGateway extends PrivilegedGateway implements Do
     }
 
 //    @Override
-//    public DomesticRemitTxnReceiptDTO getMockedReciept() {
-//       return  HttpClientV2.getDeserializer().fromJson(mockedData,DomesticRemitTxnReceiptDTO.class);
+//    public InboundRemitTxnReceiptDTO getMockedReciept() {
+//       return  HttpClientV2.getDeserializer().fromJson(mockedData,InboundRemitTxnReceiptDTO.class);
 //    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/receipt/presenter/DomesticRemitReceiptGatewayInterface.java

@@ -11,5 +11,5 @@ public interface DomesticRemitReceiptGatewayInterface extends PrivilegedGatewayI
 
     Observable<ResponseBody> getReceiptData(String auth, String transactionId);
 
-//    DomesticRemitTxnReceiptDTO getMockedReciept();
+//    InboundRemitTxnReceiptDTO getMockedReciept();
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/receipt/view/DomesticRemitReceiptActivity.java

@@ -64,7 +64,7 @@ public class DomesticRemitReceiptActivity extends BaseActivity implements Domest
 
     private DomesticRemitReceiptPresenterImpl presenter;
 
-    public static final String DOMESTIC_TXN_ID_BUNDLE_KEY = "DOMESTIC_TXN_ID_BUNDLE_KEY";
+    public static final String DOMESTIC_TXN_ID_BUNDLE_KEY = "INBOUND_TXN_ID_BUNDLE_KEY";
     public static final String REQUEST_FROM_DOMESTIC_REMIT_PROCESS = "REQUEST_FROM_DOMESTIC_REMIT_PROCESS";
 
     @Override

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

@@ -46,6 +46,7 @@ import com.gmeremit.online.gmeremittance_native.resendV2.view.TransactionListing
 import com.gmeremit.online.gmeremittance_native.settings.view.FingerprintEnablePromptActivity;
 import com.gmeremit.online.gmeremittance_native.settings.view.SettingsView;
 import com.gmeremit.online.gmeremittance_native.static_pages.view.AboutGME;
+import com.gmeremit.online.gmeremittance_native.topup.local.view.topup.LocalTopUpActivity;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.OutboundTransactionHistoryActivityV2;
 import com.gmeremit.online.gmeremittance_native.user_profile.view.ProfileActivity;
 import com.gmeremit.online.gmeremittance_native.utils.ChatUtils;

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

@@ -337,50 +337,50 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
     }
 
     public void showNotificationView(HomeNotificationViewDTO notificationViewDTO) {
-//            new Handler().postDelayed(() -> {
-//                View notificationView = HomeNotificiationViewFactory.getNotificationView(notificationViewDTO, notificationViewContainer.getContext());
-//                if (notificationView != null) {
-//
-//                    AutoTransition autoTransition = new AutoTransition();
-//                    if (notificationViewDTO.isFocused()) {
-//                        scrollViewHomeFragment.setEnableScrolling(false);
-//                        autoTransition.addListener(new TransitionListenerAdapter() {
-//                            @Override
-//                            public void onTransitionEnd(@NonNull Transition transition) {
-//                                super.onTransitionEnd(transition);
-//
-//                                int[] notificationViewContainerPos = new int[2];
-//                                notificationViewContainer.getLocationInWindow(notificationViewContainerPos);
-//                                Rect notificationViewContainerBoundry = new Rect(0, notificationViewContainerPos[0], notificationViewContainer.getWidth(), notificationViewContainerPos[1] + notificationView.getHeight());
-//                                if(getActivity()!=null)
-//                                ((HomeParentViewContractV2) getActivity()).dimOutMenu(notificationViewContainerBoundry, true);
-//                            }
-//
-//
-//                        });
-//
-//                    } else {
-//                        scrollViewHomeFragment.setEnableScrolling(true);
-//                        if(getActivity()!=null)
-//                        ((HomeParentViewContractV2) getActivity()).dimOutMenu(null, false);
-//
-//                    }
-//
-//                    TransitionManager.beginDelayedTransition(homeContainerView, autoTransition);
-//                    if (notificationViewContainer.getChildCount() > 0)
-//                        notificationViewContainer.removeAllViews();
-//                    notificationViewContainer.addView(notificationView);
-//                    notificationViewContainer.setVisibility(View.VISIBLE);
-//                    notificationViewContainer.setOnClickListener(this);
-//                } else {
-//                    TransitionManager.beginDelayedTransition(homeContainerView);
-//                    notificationViewContainer.setVisibility(View.GONE);
-//                    notificationViewContainer.removeAllViews();
-//                    notificationViewContainer.setOnClickListener(null);
-//                    if(getActivity()!=null)
-//                    ((HomeParentViewContractV2) getActivity()).dimOutMenu(null, false);
-//                }
-//            }, 500);
+            new Handler().postDelayed(() -> {
+                View notificationView = HomeNotificiationViewFactory.getNotificationView(notificationViewDTO, notificationViewContainer.getContext());
+                if (notificationView != null) {
+
+                    AutoTransition autoTransition = new AutoTransition();
+                    if (notificationViewDTO.isFocused()) {
+                        scrollViewHomeFragment.setEnableScrolling(false);
+                        autoTransition.addListener(new TransitionListenerAdapter() {
+                            @Override
+                            public void onTransitionEnd(@NonNull Transition transition) {
+                                super.onTransitionEnd(transition);
+
+                                int[] notificationViewContainerPos = new int[2];
+                                notificationViewContainer.getLocationInWindow(notificationViewContainerPos);
+                                Rect notificationViewContainerBoundry = new Rect(0, notificationViewContainerPos[0], notificationViewContainer.getWidth(), notificationViewContainerPos[1] + notificationView.getHeight());
+                                if(getActivity()!=null)
+                                ((HomeParentViewContractV2) getActivity()).dimOutMenu(notificationViewContainerBoundry, true);
+                            }
+
+
+                        });
+
+                    } else {
+                        scrollViewHomeFragment.setEnableScrolling(true);
+                        if(getActivity()!=null)
+                        ((HomeParentViewContractV2) getActivity()).dimOutMenu(null, false);
+
+                    }
+
+                    TransitionManager.beginDelayedTransition(homeContainerView, autoTransition);
+                    if (notificationViewContainer.getChildCount() > 0)
+                        notificationViewContainer.removeAllViews();
+                    notificationViewContainer.addView(notificationView);
+                    notificationViewContainer.setVisibility(View.VISIBLE);
+                    notificationViewContainer.setOnClickListener(this);
+                } else {
+                    TransitionManager.beginDelayedTransition(homeContainerView);
+                    notificationViewContainer.setVisibility(View.GONE);
+                    notificationViewContainer.removeAllViews();
+                    notificationViewContainer.setOnClickListener(null);
+                    if(getActivity()!=null)
+                    ((HomeParentViewContractV2) getActivity()).dimOutMenu(null, false);
+                }
+            }, 500);
     }
 
     private void showKJBankNoticeIfRequired(boolean shouldShowAutoDebitNotice) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/gateway/InboundRemitReceiptGateway.java

@@ -0,0 +1,20 @@
+package com.gmeremit.online.gmeremittance_native.inboundreceipt.gateway;
+
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
+import com.gmeremit.online.gmeremittance_native.inboundreceipt.presenter.InboundRemitReceiptGatewayInterface;
+import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2;
+
+import io.reactivex.Observable;
+import okhttp3.ResponseBody;
+
+public class InboundRemitReceiptGateway extends PrivilegedGateway implements InboundRemitReceiptGatewayInterface {
+
+
+
+    @Override
+    public Observable<ResponseBody> getReceiptData(String auth, String transactionId) {
+            return HttpClientV2.getInstance().getDomesticReceipt(auth,transactionId);
+    }
+
+
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/model/InboundRemitTxnReceiptDTO.java

@@ -0,0 +1,331 @@
+package com.gmeremit.online.gmeremittance_native.inboundreceipt.model;
+
+import com.gmeremit.online.gmeremittance_native.utils.Utils;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class InboundRemitTxnReceiptDTO {
+
+    @SerializedName("controlNo")
+    @Expose
+    private String controlNo;
+    @SerializedName("trnsDate")
+    @Expose
+    private String trnsDate;
+    @SerializedName("trnId")
+    @Expose
+    private String trnId;
+    @SerializedName("rFirstName")
+    @Expose
+    private String rFirstName;
+    @SerializedName("rMiddleName")
+    @Expose
+    private String rMiddleName;
+    @SerializedName("rLastName")
+    @Expose
+    private String rLastName;
+    @SerializedName("rAddress")
+    @Expose
+    private String rAddress;
+    @SerializedName("rCountryName")
+    @Expose
+    private String rCountryName;
+    @SerializedName("rContactNo")
+    @Expose
+    private String rContactNo;
+    @SerializedName("rCity")
+    @Expose
+    private String rCity;
+    @SerializedName("rEmail")
+    @Expose
+    private String rEmail;
+    @SerializedName("relWithSender")
+    @Expose
+    private String relWithSender;
+    @SerializedName("rState")
+    @Expose
+    private String rState;
+    @SerializedName("payoutCountry")
+    @Expose
+    private String payoutCountry;
+    @SerializedName("trnDate")
+    @Expose
+    private String trnDate;
+    @SerializedName("pAmount")
+    @Expose
+    private String pAmount;
+    @SerializedName("pAgentBank")
+    @Expose
+    private String pAgentBank;
+    @SerializedName("accountNo")
+    @Expose
+    private String accountNo;
+    @SerializedName("payoutBankBranch")
+    @Expose
+    private String payoutBankBranch;
+    @SerializedName("collAmount")
+    @Expose
+    private String collAmount;
+    @SerializedName("exRate")
+    @Expose
+    private String exRate;
+    @SerializedName("serviceCharge")
+    @Expose
+    private String serviceCharge;
+    @SerializedName("payOutAmount")
+    @Expose
+    private String payOutAmount;
+    @SerializedName("payOutMode")
+    @Expose
+    private String payOutMode;
+    @SerializedName("couponName")
+    @Expose
+    private String couponName;
+    @SerializedName("discountType")
+    @Expose
+    private String discountType;
+    @SerializedName("discountValue")
+    @Expose
+    private String discountValue;
+    @SerializedName("discountPercent")
+    @Expose
+    private String discountPercent;
+
+    public String getControlNo() {
+        return controlNo;
+    }
+
+    public void setControlNo(String controlNo) {
+        this.controlNo = controlNo;
+    }
+
+    public String getTrnsDate() {
+        return trnsDate;
+    }
+
+    public void setTrnsDate(String trnsDate) {
+        this.trnsDate = trnsDate;
+    }
+
+    public String getTrnId() {
+        return trnId;
+    }
+
+    public void setTrnId(String trnId) {
+        this.trnId = trnId;
+    }
+
+    public String getRFirstName() {
+        return rFirstName;
+    }
+
+    public void setRFirstName(String rFirstName) {
+        this.rFirstName = rFirstName;
+    }
+
+    public String getRMiddleName() {
+        return rMiddleName;
+    }
+
+    public void setRMiddleName(String rMiddleName) {
+        this.rMiddleName = rMiddleName;
+    }
+
+    public String getRLastName() {
+        return rLastName;
+    }
+
+    public void setRLastName(String rLastName) {
+        this.rLastName = rLastName;
+    }
+
+    public String getRAddress() {
+        return rAddress;
+    }
+
+    public void setRAddress(String rAddress) {
+        this.rAddress = rAddress;
+    }
+
+    public String getRCountryName() {
+        return rCountryName;
+    }
+
+    public void setRCountryName(String rCountryName) {
+        this.rCountryName = rCountryName;
+    }
+
+    public String getRContactNo() {
+        return rContactNo;
+    }
+
+    public void setRContactNo(String rContactNo) {
+        this.rContactNo = rContactNo;
+    }
+
+    public String getRCity() {
+        return rCity;
+    }
+
+    public void setRCity(String rCity) {
+        this.rCity = rCity;
+    }
+
+    public String getREmail() {
+        return rEmail;
+    }
+
+    public void setREmail(String rEmail) {
+        this.rEmail = rEmail;
+    }
+
+    public String getRelWithSender() {
+        return relWithSender;
+    }
+
+    public void setRelWithSender(String relWithSender) {
+        this.relWithSender = relWithSender;
+    }
+
+    public String getRState() {
+        return rState;
+    }
+
+    public void setRState(String rState) {
+        this.rState = rState;
+    }
+
+    public String getPayoutCountry() {
+        return payoutCountry;
+    }
+
+    public void setPayoutCountry(String payoutCountry) {
+        this.payoutCountry = payoutCountry;
+    }
+
+    public String getTrnDate() {
+        return trnDate;
+    }
+
+    public void setTrnDate(String trnDate) {
+        this.trnDate = trnDate;
+    }
+
+    public String getPAmount() {
+        return pAmount;
+    }
+
+    public void setPAmount(String pAmount) {
+        this.pAmount = pAmount;
+    }
+
+    public String getPAgentBank() {
+        return pAgentBank;
+    }
+
+    public void setPAgentBank(String pAgentBank) {
+        this.pAgentBank = pAgentBank;
+    }
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
+    }
+
+    public String getPayoutBankBranch() {
+        return payoutBankBranch;
+    }
+
+    public void setPayoutBankBranch(String payoutBankBranch) {
+        this.payoutBankBranch = payoutBankBranch;
+    }
+
+    public String getCollAmount() {
+        return collAmount;
+    }
+
+    public void setCollAmount(String collAmount) {
+        this.collAmount = collAmount;
+    }
+
+    public String getExRate() {
+        return exRate;
+    }
+
+    public void setExRate(String exRate) {
+        this.exRate = exRate;
+    }
+
+    public String getServiceCharge() {
+        return serviceCharge;
+    }
+
+    public void setServiceCharge(String serviceCharge) {
+        this.serviceCharge = serviceCharge;
+    }
+
+    public String getPayOutAmount() {
+        return payOutAmount;
+    }
+
+    public void setPayOutAmount(String payOutAmount) {
+        this.payOutAmount = payOutAmount;
+    }
+
+    public String getPayOutMode() {
+        return payOutMode;
+    }
+
+    public void setPayOutMode(String payOutMode) {
+        this.payOutMode = payOutMode;
+    }
+
+    public String getCouponName() {
+
+        String couponString = "";
+
+        if(couponName==null||couponName.length()<1)
+            return null;
+
+        if (discountType!=null&&discountType.equalsIgnoreCase("1")) {
+            couponString = couponName +" "+ discountPercent+"% (-" + Utils.formatCurrencyWithoutTruncatingDecimal(discountValue) + "KRW)";
+        }
+        //Value type discount
+        else {
+            couponString = couponName + " (-" +Utils.formatCurrencyWithoutTruncatingDecimal(discountValue) + " KRW)";
+        }
+
+        return couponString;
+    }
+
+    public void setCouponName(String couponName) {
+        this.couponName = couponName;
+    }
+
+    public String getDiscountType() {
+        return discountType;
+    }
+
+    public void setDiscountType(String discountType) {
+        this.discountType = discountType;
+    }
+
+    public String getDiscountValue() {
+        return discountValue;
+    }
+
+    public void setDiscountValue(String discountValue) {
+        this.discountValue = discountValue;
+    }
+
+    public String getDiscountPercent() {
+        return discountPercent;
+    }
+
+    public void setDiscountPercent(String discountPercent) {
+        this.discountPercent = discountPercent;
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/presenter/InboundRemitReceiptGatewayInterface.java

@@ -0,0 +1,13 @@
+package com.gmeremit.online.gmeremittance_native.inboundreceipt.presenter;
+
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface;
+
+import io.reactivex.Observable;
+import okhttp3.ResponseBody;
+
+public interface InboundRemitReceiptGatewayInterface extends PrivilegedGatewayInterface {
+
+    Observable<ResponseBody> getReceiptData(String auth, String transactionId);
+
+//    InboundRemitTxnReceiptDTO getMockedReciept();
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java

@@ -0,0 +1,107 @@
+package com.gmeremit.online.gmeremittance_native.inboundreceipt.presenter;
+
+import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
+import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
+import com.gmeremit.online.gmeremittance_native.inboundreceipt.model.InboundRemitTxnReceiptDTO;
+import com.gmeremit.online.gmeremittance_native.inboundreceipt.view.InboundRemitReceiptActivity;
+import com.gmeremit.online.gmeremittance_native.utils.Constants;
+import com.gmeremit.online.gmeremittance_native.utils.Utils;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponseV2;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericResponseDataModel;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+
+public class InboundRemitReceiptPresenterImpl extends BasePresenter implements InboundRemitReceiptPresenterInterface {
+
+    private final InboundRemitReceiptViewContract view;
+    private final InboundRemitReceiptGatewayInterface gateway;
+    private final CompositeDisposable compositeDisposable;
+    private final String txnId;
+    private final boolean requestFromDomesticRemitProcess;
+
+    public InboundRemitReceiptPresenterImpl(InboundRemitReceiptViewContract view, InboundRemitReceiptGatewayInterface gateway, String txnId, boolean requestFromDomesticremitProcess) {
+        this.view=view;
+        this.gateway=gateway;
+        this.compositeDisposable =new CompositeDisposable();
+        this.txnId=txnId;
+        this.requestFromDomesticRemitProcess=requestFromDomesticremitProcess;
+    }
+
+    @Override
+    public void getReceiptData() {
+        compositeDisposable.add(
+                this.gateway.getReceiptData(gateway.getAuth(),this.txnId)
+                        .doOnSubscribe(dis->view.showProgressBar(true,""))
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .doFinally(()->view.showProgressBar(false,""))
+                        .subscribeWith(new DomesticRemitReceiptObserver())
+
+        );
+    }
+
+    @Override
+    public boolean isRequestFromDomesticRemitProcess() {
+        return requestFromDomesticRemitProcess;
+    }
+
+    private void formatDataAndUpdateReceipt(InboundRemitTxnReceiptDTO domesticRemitTxnReceiptDTO)
+    {
+        InboundRemitReceiptActivity.TxnReceiptViewModel txnReceiptViewModel=new InboundRemitReceiptActivity.TxnReceiptViewModel();
+        txnReceiptViewModel.setMobileNo(domesticRemitTxnReceiptDTO.getRContactNo());
+        txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getPayOutAmount())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setRecieverName(domesticRemitTxnReceiptDTO.getRFirstName());
+        txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceCharge())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setTxnDate(domesticRemitTxnReceiptDTO.getTrnsDate());
+        txnReceiptViewModel.setTxnNo("GME Control No. " +domesticRemitTxnReceiptDTO.getTrnId());
+        txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getCollAmount())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setBank(domesticRemitTxnReceiptDTO.getPAgentBank());
+        txnReceiptViewModel.setAccNo(domesticRemitTxnReceiptDTO.getAccountNo());
+
+        view.showReciept(txnReceiptViewModel);
+    }
+
+
+    public class DomesticRemitReceiptObserver extends GenericApiObserverResponseV2<InboundRemitTxnReceiptDTO>
+    {
+        @Override
+        protected Type getDataType() {
+            return TypeToken.getParameterized(InboundRemitTxnReceiptDTO.class).getType();
+        }
+
+        @Override
+        protected void onSuccess(GenericResponseDataModel<InboundRemitTxnReceiptDTO> t) {
+            if(t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
+            {
+                formatDataAndUpdateReceipt(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.NO_INTERNET,alertType -> view.exitView());
+
+        }
+
+        @Override
+        protected void unauthorizedAccess(String message) {
+            gateway.clearAllUserData();
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> view.logout());
+
+        }
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java

@@ -0,0 +1,19 @@
+package com.gmeremit.online.gmeremittance_native.inboundreceipt.presenter;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
+import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+import com.gmeremit.online.gmeremittance_native.inboundreceipt.view.InboundRemitReceiptActivity;
+
+public interface InboundRemitReceiptPresenterInterface extends BasePresenterInterface {
+
+    void getReceiptData();
+
+    boolean isRequestFromDomesticRemitProcess();
+
+
+    interface InboundRemitReceiptViewContract extends BaseContractInterface
+    {
+        void showReciept(InboundRemitReceiptActivity.TxnReceiptViewModel receiptViewModel);
+
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/view/InboundRemitReceiptActivity.java

@@ -0,0 +1,212 @@
+package com.gmeremit.online.gmeremittance_native.inboundreceipt.view;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
+import com.gmeremit.online.gmeremittance_native.homeV2.view.HomeActivityV2;
+import com.gmeremit.online.gmeremittance_native.inboundreceipt.gateway.InboundRemitReceiptGateway;
+import com.gmeremit.online.gmeremittance_native.inboundreceipt.presenter.InboundRemitReceiptPresenterImpl;
+import com.gmeremit.online.gmeremittance_native.inboundreceipt.presenter.InboundRemitReceiptPresenterInterface;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class InboundRemitReceiptActivity extends BaseActivity implements InboundRemitReceiptPresenterInterface.InboundRemitReceiptViewContract {
+
+
+    @BindView(R.id.toolbar_title)
+    TextView toolbar_title;
+
+    @BindView(R.id.iv_back)
+    View iv_back;
+
+    @BindView(R.id.iv_cancel)
+    View iv_cancel;
+
+
+    @BindView(R.id.tv_receiver_name)
+    TextView tv_receiver_name;
+
+    @BindView(R.id.tv_payout_amount)
+    TextView tv_payout_amount;
+
+    @BindView(R.id.tv_gme_control_no)
+    TextView tv_gme_control_no;
+
+
+    @BindView(R.id.tv_transaction_date)
+    TextView tv_transaction_date;
+
+
+    @BindView(R.id.tv_receiver_name2)
+    TextView tv_receiver_name2;
+
+    @BindView(R.id.tv_mobile_no)
+    TextView tv_mobile_no;
+
+    @BindView(R.id.tv_total_sent_amount)
+    TextView tv_total_sent_amount;
+
+    @BindView(R.id.tv_bank_name)
+    TextView tv_bank_name;
+
+    @BindView(R.id.tv_service_fee)
+    TextView tv_service_fee;
+
+    @BindView(R.id.tv_acc_no)
+    TextView tv_acc_no;
+
+
+    private InboundRemitReceiptPresenterImpl presenter;
+
+    public static final String INBOUND_TXN_ID_BUNDLE_KEY = "INBOUND_TXN_ID_BUNDLE_KEY";
+    public static final String REQUEST_FROM_DOMESTIC_REMIT_PROCESS = "REQUEST_FROM_DOMESTIC_REMIT_PROCESS";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_inbound_remit_receipt);
+        ButterKnife.bind(this);
+        init();
+        performDefaultAction(savedInstanceState);
+    }
+
+    private void init() {
+        this.presenter = new InboundRemitReceiptPresenterImpl(this, new InboundRemitReceiptGateway(), getIntent().getStringExtra(INBOUND_TXN_ID_BUNDLE_KEY), getIntent().getBooleanExtra(REQUEST_FROM_DOMESTIC_REMIT_PROCESS, false));
+    }
+
+    private void performDefaultAction(Bundle savedInstanceState) {
+        if (savedInstanceState == null) {
+            iv_cancel.setVisibility(View.INVISIBLE);
+            toolbar_title.setText(getString(R.string.receipt_title_text));
+            presenter.getReceiptData();
+        } else {
+
+        }
+    }
+
+    @Override
+    public void showReciept(TxnReceiptViewModel receiptViewModel) {
+        tv_receiver_name.setText(receiptViewModel.getRecieverName());
+        tv_receiver_name2.setText(receiptViewModel.getRecieverName());
+        tv_payout_amount.setText(receiptViewModel.getpAmount());
+        tv_gme_control_no.setText(receiptViewModel.getTxnNo());
+        tv_transaction_date.setText(receiptViewModel.getTxnDate());
+        tv_mobile_no.setText(receiptViewModel.getMobileNo());
+        tv_total_sent_amount.setText(receiptViewModel.getTotalSendAmount());
+        tv_service_fee.setText(receiptViewModel.getServiceFee());
+        tv_bank_name.setText(receiptViewModel.getBank());
+        tv_acc_no.setText(receiptViewModel.getAccNo());
+    }
+
+    @OnClick({R.id.iv_back, R.id.btn_submit})
+    public void goBack(View iv_back) {
+        onBackPressed();
+
+
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (!presenter.isRequestFromDomesticRemitProcess())
+            super.onBackPressed();
+        else {
+            Intent a = new Intent(this, HomeActivityV2.class);
+            a.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            a.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            startActivity(a);
+            finish();
+        }
+    }
+
+    public static class TxnReceiptViewModel {
+
+        String pAmount;
+        String txnNo;
+        String txnDate;
+        String recieverName;
+        String mobileNo;
+        String totalSendAmount;
+        String serviceFee;
+        String bank;
+        String accNo;
+
+        public String getAccNo() {
+            return accNo;
+        }
+
+        public void setAccNo(String accNo) {
+            this.accNo = accNo;
+        }
+
+        public String getBank() {
+            return bank;
+        }
+
+        public void setBank(String bank) {
+            this.bank = bank;
+        }
+
+        public String getpAmount() {
+            return pAmount;
+        }
+
+        public void setpAmount(String pAmount) {
+            this.pAmount = pAmount;
+        }
+
+        public String getTxnNo() {
+            return txnNo;
+        }
+
+        public void setTxnNo(String txnNo) {
+            this.txnNo = txnNo;
+        }
+
+        public String getTxnDate() {
+            return txnDate;
+        }
+
+        public void setTxnDate(String txnDate) {
+            this.txnDate = txnDate;
+        }
+
+        public String getRecieverName() {
+            return recieverName;
+        }
+
+        public void setRecieverName(String recieverName) {
+            this.recieverName = recieverName;
+        }
+
+        public String getMobileNo() {
+            return mobileNo;
+        }
+
+        public void setMobileNo(String mobileNo) {
+            this.mobileNo = mobileNo;
+        }
+
+        public String getTotalSendAmount() {
+            return totalSendAmount;
+        }
+
+        public void setTotalSendAmount(String totalSendAmount) {
+            this.totalSendAmount = totalSendAmount;
+        }
+
+        public String getServiceFee() {
+            return serviceFee;
+        }
+
+        public void setServiceFee(String serviceFee) {
+            this.serviceFee = serviceFee;
+        }
+    }
+
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/FingerprintEnablePromptActivity.java

@@ -33,7 +33,7 @@ public class FingerprintEnablePromptActivity extends BaseActivity implements Vie
     @BindView(R.id.btn_use_fingerprint)
     Button btnUseFingerPrint;
 
-    @BindView(R.id.txt_not_use_fingerprint)
+    @BindView(R.id.txt_pennytest_msg)
     TextView notNow;
 
     @BindView(R.id.tv_manual)
@@ -171,7 +171,7 @@ public class FingerprintEnablePromptActivity extends BaseActivity implements Vie
                 showFingerprintAuthDialog();
                 break;
 
-            case R.id.txt_not_use_fingerprint:
+            case R.id.txt_pennytest_msg:
                 finish();
                 break;
         }

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

@@ -163,8 +163,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
     private SplashScreenPresenterInterface splashPresenter;
     private ExchangeRatePresenterInterface exRatePresenter;
 
-//    public static final String TAG = "SplashScreenTAG";
-
     private SendAmountTextWatcher sendMoneyTextWatcher;
     private ReceiveAmountTextWatcher receiveMoneyTextWatcher;
     private GestureDetectorCompat gestureDetector;
@@ -233,8 +231,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
                 break;
             case R.id.btn_lgn:
                 startActivity(new Intent(this, LoginV2Activity.class));
-//                launchActivity(new Intent(this, PayoutCountrySelectionActivity.class));
-
                 break;
             case R.id.iv_back:
                 if (languageViewTransitionManager.isUserOnLanguageSelectionView())

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

@@ -19,21 +19,21 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="outer_circle_path_data">
-        <aapt:attr name="android:animation">
-            <set android:ordering="sequentially">
-                <objectAnimator
-                    android:startOffset="200"
-                    android:duration="600"
-                    android:interpolator="@android:interpolator/linear"
-                    android:propertyName="fillAlpha"
-                    android:repeatCount="infinite"
-                    android:repeatMode="reverse"
-                    android:valueFrom="1"
-                    android:valueTo=".6"
-                    android:valueType="floatType" />
+<!--    <target android:name="outer_circle_path_data">-->
+<!--        <aapt:attr name="android:animation">-->
+<!--            <set android:ordering="sequentially">-->
+<!--                <objectAnimator-->
+<!--                    android:startOffset="200"-->
+<!--                    android:duration="600"-->
+<!--                    android:interpolator="@android:interpolator/linear"-->
+<!--                    android:propertyName="fillAlpha"-->
+<!--                    android:repeatCount="infinite"-->
+<!--                    android:repeatMode="reverse"-->
+<!--                    android:valueFrom="1"-->
+<!--                    android:valueTo=".6"-->
+<!--                    android:valueType="floatType" />-->
 
-            </set>
-        </aapt:attr>
-    </target>
+<!--            </set>-->
+<!--        </aapt:attr>-->
+<!--    </target>-->
 </animated-vector>

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

@@ -99,7 +99,7 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_manual" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/txt_not_use_fingerprint"
+        android:id="@+id/txt_pennytest_msg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"

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

@@ -0,0 +1,618 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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="@color/background_gray"
+    android:orientation="vertical"
+    >
+    <include layout="@layout/layout_sendmoney_toolbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/background_gray"
+            android:orientation="vertical">
+
+            <android.support.constraint.ConstraintLayout
+                android:id="@+id/relativeLayout4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/_8sdp"
+                android:background="@drawable/ic_recharge_share_background">
+
+                <ImageView
+                    android:id="@+id/logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/_14sdp"
+                    android:src="@drawable/ic_gme_logo_white"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/imageView6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="66dp"
+                    android:padding="@dimen/_11sdp"
+                    android:src="@drawable/ic_share_image"
+                    android:visibility="gone"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/transfer_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/_6sdp"
+                    android:layout_marginEnd="@dimen/_6sdp"
+                    android:padding="@dimen/_4sdp"
+                    android:text="@string/transfer_success_text"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_14ssp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/logo"
+                    app:txtfontName="@string/semibold" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_receiver_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/_6sdp"
+                    android:layout_marginEnd="@dimen/_6sdp"
+                    android:gravity="center_horizontal"
+                    android:padding="@dimen/_1sdp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_12ssp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/transfer_detail"
+                    app:txtfontName="@string/heavy"
+                    tools:text="Some name" />
+
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/gmeTextView8"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/_6sdp"
+                    android:layout_marginTop="@dimen/_6sdp"
+                    android:layout_marginEnd="@dimen/_6sdp"
+                    android:padding="@dimen/_1sdp"
+                    android:paddingStart="@dimen/_4sdp"
+                    android:paddingEnd="@dimen/_4sdp"
+                    android:text="@string/total_payout_amount_text"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_12ssp"
+                    app:layout_constraintEnd_toStartOf="@+id/tv_payout_amount"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_receiver_name" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_payout_amount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/_6sdp"
+                    android:padding="2dp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_11ssp"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/gmeTextView8"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/gmeTextView8"
+                    app:txtfontName="@string/semibold"
+                    tools:text="50000" />
+
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_gme_control_no"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/_6sdp"
+                    android:gravity="center_horizontal"
+                    android:padding="@dimen/_1sdp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_14ssp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_payout_amount"
+                    app:txtfontName="@string/heavy"
+                    tools:text="1209389128379128" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_note"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/_6sdp"
+                    android:gravity="center"
+                    android:paddingStart="@dimen/_4sdp"
+                    android:paddingTop="@dimen/_2sdp"
+                    android:paddingEnd="@dimen/_4sdp"
+                    android:paddingBottom="@dimen/_4sdp"
+                    android:text="@string/gme_control_security_text"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_10ssp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/imageView7"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_gme_control_no" />
+
+                <ImageView
+                    android:id="@+id/imageView7"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:src="@drawable/ic_secure_lock"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/tv_note"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/tv_note" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/transfer_detail"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/_6sdp"
+                    android:layout_marginEnd="@dimen/_6sdp"
+                    android:gravity="center_horizontal"
+                    android:padding="@dimen/_1sdp"
+                    android:paddingStart="@dimen/_4sdp"
+                    android:paddingEnd="@dimen/_4sdp"
+                    android:text="@string/transfer_success_info_text"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_12ssp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/transfer_label" />
+
+
+            </android.support.constraint.ConstraintLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/ic_rectangle_white_extra_corners">
+                <LinearLayout
+                    android:id="@+id/nameContainer"
+                    android:layout_width="match_parent"
+                    android:weightSum="1"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="10dp"
+                        android:text="Transaction Date"
+                        android:textColor="@color/darkgray"
+                        android:textSize="14sp" />
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                        android:id="@+id/tv_transaction_date"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:layout_height="wrap_content"
+                        android:padding="10dp"
+                        android:textColor="@color/darkgray"
+                        android:textSize="14sp"
+                        app:txtfontName="@string/semibold" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_below="@id/nameContainer"
+                    android:background="@color/gray" />
+
+
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/receiver_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/nameContainer"
+                    android:padding="10dp"
+                    android:text="Sender"
+                    android:textColor="@color/darkgray"
+                    android:textSize="14sp" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_receiver_name2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_below="@id/nameContainer"
+                    android:maxLength="25"
+                    android:padding="10dp"
+                    tools:text="Some random name"
+                    android:singleLine="true"
+                    android:textColor="@color/darkgray"
+                    android:textSize="14sp"
+                    app:txtfontName="@string/semibold" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_below="@id/receiver_label"
+                    android:background="@color/gray" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/mobile_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/receiver_label"
+                    android:padding="10dp"
+                    android:text="@string/mobile_text"
+                    android:textColor="@color/darkgray"
+                    android:textSize="14sp" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_mobile_no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_below="@id/receiver_label"
+                    android:padding="10dp"
+                    tools:text="123123"
+                    android:textColor="@color/darkgray"
+                    android:textSize="14sp"
+                    app:txtfontName="@string/semibold" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_below="@id/mobile_label"
+                    android:background="@color/gray" />
+
+
+
+
+
+                <LinearLayout
+                    android:id="@+id/notForHome"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/mobile_label"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+
+                        android:background="@color/gray" />
+                    <LinearLayout
+                        android:id="@+id/bank_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        >
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical"
+                            android:padding="10dp"
+                            android:text="@string/payout_agent_text"
+                            android:textColor="@color/darkgray"
+                            android:textSize="14sp" />
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                            android:id="@+id/tv_bank_name"
+                            android:layout_width="match_parent"
+                            android:gravity="right"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:padding="10dp"
+                            android:text=""
+                            tools:text="Some thing"
+                            android:textColor="@color/darkgray"
+                            android:textSize="14sp"
+                            app:txtfontName="@string/semibold" />
+                    </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+
+                        android:background="@color/gray" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="10dp"
+                            android:gravity="left"
+                            android:text="@string/total_sent_amount_text"
+                            android:textColor="@color/darkgray"
+                            android:textSize="14sp" />
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                            android:id="@+id/tv_total_sent_amount"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:gravity="right"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:maxLines="2"
+                            android:padding="10dp"
+                            android:singleLine="false"
+                            android:text=""
+                            tools:text="asldkfj"
+                            android:textColor="@color/darkgray"
+                            android:textSize="14sp"
+                            app:txtfontName="@string/semibold"
+                            />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+
+                        android:background="@color/gray" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="left"
+                            android:padding="10dp"
+                            android:text="@string/account_number_text"
+                            android:textColor="@color/darkgray"
+                            android:textSize="14sp" />
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                            android:id="@+id/tv_acc_no"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:ellipsize="end"
+                            android:gravity="right"
+                            android:maxLines="2"
+                            android:padding="10dp"
+                            android:singleLine="false"
+                            android:text=""
+                            android:textColor="@color/darkgray"
+                            android:textSize="14sp"
+                            app:txtfontName="@string/semibold"
+                            tools:text="asldkfj" />
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+
+                <View
+                    android:id="@+id/total_sent_amount_divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_below="@id/notForHome"
+                    android:background="@color/gray" />
+
+                <RelativeLayout
+                    android:id="@+id/total_sent_amount_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/total_sent_amount_divider">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="10dp"
+                        android:text="Service Fee"
+                        android:textColor="@color/darkgray"
+                        android:textSize="14sp" />
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                        android:id="@+id/tv_service_fee"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:padding="10dp"
+                        android:text=""
+                        tools:text="10,000 KRW"
+                        android:textColor="@color/darkgray"
+                        android:textSize="14sp"
+                        app:txtfontName="@string/semibold" />
+                </RelativeLayout>
+                <!--<View-->
+                <!--android:id="@+id/bank_divider"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="1dp"-->
+                <!--android:layout_below="@id/total_sent_amount_layout"-->
+                <!--android:background="@color/gray" />-->
+                <!--<LinearLayout-->
+                <!--android:id="@+id/bank_container"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_below="@id/bank_divider">-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="match_parent"-->
+                <!--android:gravity="center_vertical"-->
+                <!--android:padding="10dp"-->
+                <!--android:text="Bank"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp" />-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:id="@+id/tv_bank_name"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:gravity="right"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_alignParentRight="true"-->
+                <!--android:padding="10dp"-->
+                <!--android:text=""-->
+                <!--tools:text="Some thing"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp"-->
+                <!--app:txtfontName="@string/semibold" />-->
+                <!--</LinearLayout>-->
+
+                <!---->
+                <!--<View-->
+                <!--android:id="@+id/service_fee_divider"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="1dp"-->
+                <!--android:layout_below="@id/total_sent_amount_layout"-->
+                <!--android:background="@color/gray" />-->
+
+                <!--<RelativeLayout-->
+                <!--android:id="@+id/service_fee_layout"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_below="@id/service_fee_divider">-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:id="@+id/tv_order_date_label"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:padding="10dp"-->
+                <!--android:text="@string/order_date_text"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp" />-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:id="@+id/tv_order_date"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_alignParentRight="true"-->
+                <!--android:padding="10dp"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp"-->
+                <!--app:txtfontName="@string/semibold" />-->
+                <!--</RelativeLayout>-->
+
+                <!--&lt;!&ndash;&ndash;&gt;-->
+                <!--<View-->
+                <!--android:id="@+id/exrate_divider"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="1dp"-->
+                <!--android:layout_below="@id/service_fee_layout"-->
+                <!--android:background="@color/gray" />-->
+                <!--<RelativeLayout-->
+                <!--android:id="@+id/exrate_layout"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_below="@id/exrate_divider">-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:padding="10dp"-->
+                <!--android:id="@+id/order_receive_lbl"-->
+                <!--android:text="@string/order_receive_date_text"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp" />-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:id="@+id/tv_order_receive_date_text"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_alignParentRight="true"-->
+                <!--android:padding="10dp"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp"-->
+                <!--app:txtfontName="@string/semibold" />-->
+                <!--</RelativeLayout>-->
+
+                <!--<View-->
+                <!--android:id="@+id/total_amount_divider"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="1dp"-->
+                <!--android:layout_below="@id/exrate_layout"-->
+                <!--android:background="@color/gray" />-->
+
+                <!--<RelativeLayout-->
+                <!--android:id="@+id/order_no_text"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_below="@id/total_amount_divider">-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:padding="10dp"-->
+                <!--android:text="@string/order_no_text"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp" />-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:id="@+id/tv_order_no"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_alignParentRight="true"-->
+                <!--android:padding="10dp"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp"-->
+                <!--app:txtfontName="@string/semibold" />-->
+                <!--</RelativeLayout>-->
+
+                <!--<View-->
+                <!--android:id="@+id/order_no_text_divider"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="1dp"-->
+                <!--android:layout_below="@id/order_no_text"-->
+                <!--android:background="@color/gray" />-->
+                <!--<RelativeLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_below="@id/order_no_text_divider">-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:padding="10dp"-->
+                <!--android:text="@string/order_type_text"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp" />-->
+
+                <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:id="@+id/tv_order_type"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_alignParentRight="true"-->
+                <!--android:padding="10dp"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp"-->
+                <!--app:txtfontName="@string/semibold" />-->
+                <!--</RelativeLayout>-->
+            </RelativeLayout>
+
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+                android:visibility="visible"
+                android:id="@+id/btn_submit"
+                android:layout_width="200dp"
+                android:layout_height="45dp"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center"
+                android:layout_marginBottom="30dp"
+                android:layout_marginTop="20dp"
+                android:background="@drawable/ic_rounded_background_red_coloured"
+                android:text="@string/done_text"
+                android:textAllCaps="false"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+
+
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>

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

@@ -15,7 +15,7 @@
         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_constraintBottom_toTopOf="@+id/txt_pennytest_msg"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -24,7 +24,7 @@
         app:srcCompat="@drawable/ic_bank_link_image" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/txt_not_use_fingerprint"
+        android:id="@+id/txt_pennytest_msg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -55,7 +55,7 @@
         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">
+        app:layout_constraintTop_toBottomOf="@+id/txt_pennytest_msg">
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="wrap_content"

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

@@ -15,31 +15,30 @@
         android:id="@+id/bankIcon"
         android:layout_width="@dimen/_65sdp"
         android:layout_height="@dimen/_50sdp"
-        app:layout_constraintBottom_toBottomOf="@+id/bankNameTxtView"
+        android:layout_marginTop="32dp"
         app:layout_constraintEnd_toStartOf="@+id/guideline3"
-        app:layout_constraintTop_toTopOf="@+id/bankNameTxtView"
+        app:layout_constraintTop_toTopOf="parent"
         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:gravity="center_vertical|start"
         android:minHeight="@dimen/_50sdp"
-        android:text="Sinhan Bank"
         android:textColor="@color/black"
         android:textSize="@dimen/_20ssp"
+        app:layout_constraintBottom_toBottomOf="@+id/bankIcon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline3"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/bankIcon"
         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:layout_marginTop="8dp"
         android:gravity="center"
         android:textColor="@color/black"
         android:textSize="@dimen/_18ssp"
@@ -49,7 +48,7 @@
         app:txtfontName="@string/semibold" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/txt_not_use_fingerprint"
+        android:id="@+id/txt_pennytest_msg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -74,7 +73,7 @@
         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">
+        app:layout_constraintTop_toBottomOf="@+id/txt_pennytest_msg">
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
             android:id="@+id/ed_creditNumber"
@@ -136,6 +135,7 @@
         android:textAllCaps="false"
         android:textColor="@color/white"
         android:textSize="@dimen/_14ssp"
+        android:enabled="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -146,7 +146,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.5" />
+        app:layout_constraintGuide_percent="0.38" />
 
     <android.support.constraint.Barrier
         android:id="@+id/barrier5"

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/txt_not_use_fingerprint"
+        android:id="@+id/txt_pennytest_msg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -28,9 +28,9 @@
         android:id="@+id/imageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/txt_not_use_fingerprint"
-        app:layout_constraintEnd_toEndOf="@+id/txt_not_use_fingerprint"
-        app:layout_constraintStart_toStartOf="@+id/txt_not_use_fingerprint"
+        app:layout_constraintBottom_toTopOf="@+id/txt_pennytest_msg"
+        app:layout_constraintEnd_toEndOf="@+id/txt_pennytest_msg"
+        app:layout_constraintStart_toStartOf="@+id/txt_pennytest_msg"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.32"
         app:layout_constraintVertical_chainStyle="packed"

app/src/main/res/values/styles.xml

@@ -95,6 +95,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:background">@android:color/transparent</item>
+        <item name="android:fitsSystemWindows">true</item>
     </style>
 
     <style name="AppFullScreenTheme" parent="Theme.AppCompat.Light.NoActionBar">