oct 8 QA Issues Sloving in process

app/src/main/java/com/swifttech/remit/android/common/customwidgets/FontCache.java

@@ -42,4 +42,6 @@ public class FontCache {
 
         return typeface;
     }
+
+
 }

app/src/main/java/com/swifttech/remit/android/features/aboutscreen/view/AboutFastRemit.java

@@ -63,7 +63,6 @@ public class AboutFastRemit extends BaseActivity implements AboutUsPresenterInte
         if (!BuildConfig.BUILD_TYPE.equalsIgnoreCase("release"))
             server = " " + BuildConfig.BUILD_TYPE;
         txt_app_version.setText(version + versionCode + server);
-        txvTermsAndCondition.setText(Html.fromHtml(getResources().getString(R.string.terms_and_condition_title_text1)));
 
 
     }

app/src/main/java/com/swifttech/remit/android/features/changepassNPin/presenter/ChangePassNPinViewModel.java

@@ -60,6 +60,12 @@ public class ChangePassNPinViewModel extends BaseViewModel implements ChangePass
                             .observeOn(AndroidSchedulers.mainThread())
                             .doFinally(() -> view.showProgressBar(false, ""))
                             .subscribeWith(new ChangePassNPinObserver(this.changePassNPinValidator.newPassword)));
+        }else{
+            if(!changePassNPinValidator.doesConfirmPasswordMatchWithNewPassword()){
+                view.showPopUpMessage(view.getContext().getResources().getString(R.string.confirm_password_mismatch_error_text), CustomAlertDialog.AlertType.FAILED, null);
+            } else if(!changePassNPinValidator.doesConfirmPinMatchWithNewPin()){
+                view.showPopUpMessage(view.getContext().getResources().getString(R.string.confirm_pin_not_matched_text), CustomAlertDialog.AlertType.FAILED, null);
+            }
         }
     }
 

app/src/main/java/com/swifttech/remit/android/features/changepassNPin/view/ChangePassNPinActivity.java

@@ -1,5 +1,6 @@
 package com.swifttech.remit.android.features.changepassNPin.view;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -17,6 +18,7 @@ import com.swifttech.remit.android.features.changepassNPin.ChangePassNPinViewMod
 import com.swifttech.remit.android.features.changepassNPin.presenter.ChangePassNPInV2PresenterInterface;
 import com.swifttech.remit.android.features.changepassNPin.presenter.ChangePassNPinLiveData;
 import com.swifttech.remit.android.features.changepassNPin.presenter.ChangePassNPinViewModel;
+import com.swifttech.remit.android.features.home.view.HomeActivityV2;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -87,7 +89,6 @@ public class ChangePassNPinActivity extends BaseActivity implements ChangePassNP
     }
 
 
-
     private void initialize() {
         this.viewModel=new ViewModelProvider(this,new ChangePassNPinViewModelFactory(this)).get(ChangePassNPinViewModel.class);
 

app/src/main/java/com/swifttech/remit/android/features/changepassword/presenter/ChangePasswordV2Presenter.java

@@ -94,6 +94,8 @@ public class ChangePasswordV2Presenter extends BaseViewModel implements ChangePa
                             .observeOn(AndroidSchedulers.mainThread())
                             .doFinally(() -> view.showProgressBar(false, ""))
                             .subscribeWith(new ChangePasswordObserver(this.changePasswordValidator.newPassword)));
+        }else{
+            view.showPopUpMessage(view.getContext().getResources().getString(R.string.confirm_password_mismatch_error_text), CustomAlertDialog.AlertType.FAILED, null);
         }
     }
 
@@ -133,7 +135,6 @@ public class ChangePasswordV2Presenter extends BaseViewModel implements ChangePa
 
         public boolean doesConfirmPasswordMatchWithNewPassword() {
             boolean result = (confirmPassword != null && confirmPassword.equalsIgnoreCase(newPassword));
-            changePasswordLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(result, getStringfromStringId(R.string.confirm_password_mismatch_error_text)));
             return result;
         }
 
@@ -181,7 +182,7 @@ public class ChangePasswordV2Presenter extends BaseViewModel implements ChangePa
 
                                 @Override
                                 public void onComplete() {
-                                    view.showPopUpMessage(changePasswordActivityV2APIResponse.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
+                                    view.showPopUpMessage(changePasswordActivityV2APIResponse.getData().getMessage(), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
 
                                 }
 

app/src/main/java/com/swifttech/remit/android/features/changetxnpin/presenter/ChangePinV2Presenter.java

@@ -4,9 +4,7 @@ import com.swifttech.remit.android.R;
 import com.swifttech.remit.android.base.BaseViewModel;
 import com.swifttech.remit.android.common.customwidgets.CustomAlertDialog;
 import com.swifttech.remit.android.common.model.FormInputStateDTO;
-import com.swifttech.remit.android.features.changepassword.model.ChangePasswordActivityV2APIResponse;
 import com.swifttech.remit.android.utils.Constants;
-import com.swifttech.remit.android.utils.https.GenericApiObserverResponse;
 import com.swifttech.remit.android.utils.https.GenericApiObserverResponseV2;
 import com.swifttech.remit.android.utils.https.GenericResponseDataModel;
 import com.swifttech.remit.android.utils.https.MessageResponseDataModel;
@@ -82,7 +80,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
 
     @Override
     public void changePin() {
-        if (changePinValidator.doesConfirmPasswordMatchWithNewPassword()) {
+        if (changePinValidator.doesConfirmPindMatchWithNewPin()) {
             useCaseCompositeDisposable.add(
                     this.gateway.performChangePassRequest(this.gateway.getAuth(), this.gateway.getUserID(), this.changePinValidator.currentPin, this.changePinValidator.newPin, this.changePinValidator.confirmPin)
                             .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
@@ -90,6 +88,8 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
                             .observeOn(AndroidSchedulers.mainThread())
                             .doFinally(() -> view.showProgressBar(false, ""))
                             .subscribeWith(new ChangePinObserver()));
+        }else{
+            view.showPopUpMessage(view.getContext().getResources().getString(R.string.confirm_pin_not_matched_text), CustomAlertDialog.AlertType.FAILED, null);
         }
     }
 
@@ -127,9 +127,8 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
 
         }
 
-        public boolean doesConfirmPasswordMatchWithNewPassword() {
+        public boolean doesConfirmPindMatchWithNewPin() {
             boolean result = (confirmPin != null && confirmPin.equalsIgnoreCase(newPin));
-            changePinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(result, view.getContext().getResources().getString(R.string.cnfmpinnotmatched_text)));
             return result;
         }
 
@@ -158,7 +157,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
         @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());
+                view.showPopUpMessage(t.getData().getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
             } else
                 view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
         }

app/src/main/java/com/swifttech/remit/android/features/customersupport/view/CustomerSupportFragment.java

@@ -56,7 +56,7 @@ public class CustomerSupportFragment extends BottomSheetDialogFragment  {
     }
 
     private void performDefaultAction() {
-        callTxtView.setText("1233-012-312");
+        callTxtView.setText("03-5475-3913");
     }
 
 

app/src/main/java/com/swifttech/remit/android/features/exrate/model/PaymentModeMapper.java

@@ -9,10 +9,10 @@ public class PaymentModeMapper {
         switch(id)
         {
             case "1":
-                return R.drawable.icv_cash_image;
+                return R.drawable.icv_payment_cash_image;
 
             case "2":
-                return R.drawable.icv_bank_image;
+                return R.drawable.icv_payment_bank_image;
 
             case "12":
                 return R.drawable.icv_home_delivery;

app/src/main/java/com/swifttech/remit/android/features/exrate/view/ExchangeRateActivity.java

@@ -232,7 +232,7 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
             gmeExratePC.setVisibility(View.INVISIBLE);
             gmeExratePC.setAlpha(0f);
             gmeExratePC.setText(formattedExRate);
-            gmeExratePC.setVisibility(View.VISIBLE);
+            gmeExratePC.setVisibility(View.INVISIBLE);
             gmeExratePC.animate().alpha(1f).setDuration(500).withLayer().start();
 
 
@@ -242,10 +242,7 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
             exchangeRateTxtView.setText(exRate);
             gmeExratePC.setText(formattedExRate);
         }
-
-
     }
-
     @Override
     public void showExrateView(Runnable task) {
         showProgressBar(false,getString(R.string.processing_request_text));

app/src/main/java/com/swifttech/remit/android/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java

@@ -34,6 +34,8 @@ public interface ExistingKYCV3PresenterInterface extends BasePresenterInterface
 
     void sendForm1KYCUpdate();
 
+    void kycSubmitSucessForPopUp();
+
 
 
 
@@ -46,6 +48,7 @@ public interface ExistingKYCV3PresenterInterface extends BasePresenterInterface
         void onKYCFormSubmittedSuccessfully();
 
 
+
         /**
          * Lazy load kyc related form when all related data are available.
          */

app/src/main/java/com/swifttech/remit/android/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java

@@ -490,6 +490,11 @@ public class ExistingKYCV3ViewModel extends BaseViewModel implements ExistingKYC
         postKYCFormToServer(validator.getExistingKycRelatedDataDTO().getForm1PostData(gateway.getUserID()), view::showDocumentDetailForm);
     }
 
+    @Override
+    public void kycSubmitSucessForPopUp() {
+        view.showPopUpMessage(view.getContext().getResources().getString(R.string.kycSubmitSucessMessage_text), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
+    }
+
     private void getNewAccessToken(Runnable task) {
         compositeDisposable.add(
                 loginGateway.loginUser(loginGateway.getBasicAuth(view.getContext()), this.userId, this.userPwd)

app/src/main/java/com/swifttech/remit/android/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java

@@ -215,12 +215,16 @@ public class ExistingKYCV3Activity extends BaseActivity implements ExistingKYCV3
 
     @Override
     public void onKYCFormSubmittedSuccessfully() {
+      viewModel.kycSubmitSucessForPopUp();
+    }
+
+    @Override
+    public void exitView() {
         Intent returnIntent = new Intent();
         setResult(Activity.RESULT_OK, returnIntent);
         finish();
     }
 
-
     @Override
     public void lazyLoadForms() {
         setupViewPager();

app/src/main/java/com/swifttech/remit/android/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java

@@ -143,7 +143,7 @@ public class ExistingCustomerDetailFragment extends BaseFragment implements Exis
 
         customerDetailViewBinding =
                 new ExistingCustomerDetailViewLiveData.CustomerDetailViewBinding(
-                        RxTextView.textChanges(ed_employerName).skipInitialValue(),
+                        RxTextView.textChanges(ed_employerName),
                         occupationSelectSubject,
                         sourceOfFundSelectSubject,
                         monthlyIncomeSelectSubject,

app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/presenter/KYCV3PresenterInterface.java

@@ -37,6 +37,8 @@ public interface KYCV3PresenterInterface extends BasePresenterInterface {
 
     void sendForm1KYCUpdate();
 
+    void kycSubmitSucessForPopUp();
+
 
     interface KYCV3ViewContractInterface extends BaseContractInterface {
 

app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/presenter/KYCV3ViewModel.java

@@ -635,6 +635,11 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
         postKYCFormToServer(validator.getKycRelatedDataDTO().getForm1PostData(gateway.getUserID()), view::showDocumentDetailForm);
     }
 
+    @Override
+    public void kycSubmitSucessForPopUp() {
+        view.showPopUpMessage(view.getContext().getResources().getString(R.string.kycSubmitSucessMessage_text), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
+    }
+
     private void getNewAccessToken(Runnable task) {
         compositeDisposable.add(
                 loginGateway.loginUser(loginGateway.getBasicAuth(view.getContext()), this.userId, this.userPwd)
@@ -863,7 +868,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
                 return true;
             } else {
                 customerDetailLiveData.getEmployerNameLiveData().setValue(new FormInputStateDTO<>(true, null, null));
-                return false;
+                return true;
             }
         }
 

app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/view/KYCV3Activity.java

@@ -213,6 +213,11 @@ public class KYCV3Activity extends BaseActivity implements KYCV3PresenterInterfa
 
     @Override
     public void onKYCFormSubmittedSuccessfully() {
+        viewModel.kycSubmitSucessForPopUp();
+    }
+
+    @Override
+    public void exitView() {
         Intent returnIntent = new Intent();
         setResult(Activity.RESULT_OK, returnIntent);
         finish();

app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java

@@ -142,7 +142,7 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present
         kycv3ViewModel = new ViewModelProvider(requireActivity()).get(KYCV3ViewModel.class);
 
         customerDetailViewBinding = new CustomerDetailViewLiveData.CustomerDetailViewBinding(
-                RxTextView.textChanges(ed_employerName).skipInitialValue(),
+                RxTextView.textChanges(ed_employerName),
                 occupationSelectSubject,
                 sourceOfFundSelectSubject,
                 monthlyIncomeSelectSubject,

app/src/main/java/com/swifttech/remit/android/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2Presenter.java

@@ -20,6 +20,7 @@ import com.swifttech.remit.android.utils.Constants;
 import com.swifttech.remit.android.utils.https.GenericApiObserverResponse;
 import com.swifttech.remit.android.utils.https.GenericApiObserverResponseV2;
 import com.swifttech.remit.android.utils.https.GenericResponseDataModel;
+import com.swifttech.remit.android.utils.other.Utility;
 
 
 import java.lang.reflect.Type;
@@ -350,8 +351,8 @@ public class ExistingCustomerRegisterV2Presenter extends BaseViewModel implement
         }
 
         public boolean validatePassword(CharSequence password) {
-            if (password == null || password.length() < 1) {
-                existingRegisterSubmitViewLiveData.setNewPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.empty_field_error_text)));
+            if (password == null || password.length() < 1 || Utility.trim(password).length()<1) {
+                existingRegisterSubmitViewLiveData.setNewPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.password_policy_text)));
                 this.password = null;
                 return false;
             } else {
@@ -362,8 +363,8 @@ public class ExistingCustomerRegisterV2Presenter extends BaseViewModel implement
         }
 
         public boolean validateConfirmPassword(CharSequence confirmPassword) {
-            if (confirmPassword == null || confirmPassword.length() < 1) {
-                existingRegisterSubmitViewLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.empty_field_error_text)));
+            if (confirmPassword == null || confirmPassword.length() < 1 || Utility.trim(confirmPassword).length()<1) {
+                existingRegisterSubmitViewLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.confirm_password_policy_text)));
                 this.confirmPassword = null;
                 return false;
             } else {

app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/NewRegisterViewModelFactory.java

@@ -11,10 +11,10 @@ import com.swifttech.remit.android.features.registerv2.newcustomer.presenter.New
 
 public class NewRegisterViewModelFactory implements ViewModelProvider.Factory {
 
-    private final NewRegisterV2PresenterInterface.ExistingRegisterV2ContractInterface view;
+    private final NewRegisterV2PresenterInterface.NewRegisterV2ContractInterface view;
 
 
-    public NewRegisterViewModelFactory(NewRegisterV2PresenterInterface.ExistingRegisterV2ContractInterface view) {
+    public NewRegisterViewModelFactory(NewRegisterV2PresenterInterface.NewRegisterV2ContractInterface view) {
         this.view=view;
 
     }

app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/gateway/NewRegisterV2Gateway.java

@@ -18,7 +18,7 @@ import java.util.List;
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;
 
-public class NewRegisterV2Gateway extends PrivilegedGateway implements NewRegisterV2InteractorInterface.ExistingRegister2GatewayInterface {
+public class NewRegisterV2Gateway extends PrivilegedGateway implements NewRegisterV2InteractorInterface.NewRegister2GatewayInterface {
 
 
 

app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/presenter/NewRegisterV2InteractorInterface.java

@@ -15,7 +15,7 @@ import okhttp3.ResponseBody;
 public interface NewRegisterV2InteractorInterface extends BaseInteractorInterface {
 
 
-     interface ExistingRegister2GatewayInterface extends PrivilegedGatewayInterface
+     interface NewRegister2GatewayInterface extends PrivilegedGatewayInterface
     {
 
 

app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java

@@ -22,6 +22,7 @@ import com.swifttech.remit.android.utils.https.GenericApiObserverResponse;
 import com.swifttech.remit.android.utils.https.GenericApiObserverResponseV2;
 import com.swifttech.remit.android.utils.https.GenericResponseDataModel;
 import com.swifttech.remit.android.utils.https.MessageResponseDataModel;
+import com.swifttech.remit.android.utils.other.Utility;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -36,8 +37,8 @@ import io.reactivex.schedulers.Schedulers;
 
 public class NewRegisterV2Presenter extends BaseViewModel implements NewRegisterV2PresenterInterface, NewRegisterV2InteractorInterface {
 
-    private final ExistingRegister2GatewayInterface registerGateway;
-    private final ExistingRegisterV2ContractInterface view;
+    private final NewRegister2GatewayInterface registerGateway;
+    private final NewRegisterV2ContractInterface view;
     private final LoginV2InteractorInterface.Login2GatewayInterface loginGateway;
 
     private final CompositeDisposable useCaseCompositeDisposable;
@@ -54,7 +55,7 @@ public class NewRegisterV2Presenter extends BaseViewModel implements NewRegister
     private RemitAuthManager remitAuthManager;
     private String residenceID;
 
-    public NewRegisterV2Presenter(ExistingRegisterV2ContractInterface view, ExistingRegister2GatewayInterface registerGateway, LoginV2InteractorInterface.Login2GatewayInterface loginGateway) {
+    public NewRegisterV2Presenter(NewRegisterV2ContractInterface view, NewRegister2GatewayInterface registerGateway, LoginV2InteractorInterface.Login2GatewayInterface loginGateway) {
         this.view = view;
         useCaseCompositeDisposable = new CompositeDisposable();
         viewEventCompositeDisposable = new CompositeDisposable();
@@ -290,9 +291,8 @@ public class NewRegisterV2Presenter extends BaseViewModel implements NewRegister
         }
 
         private boolean validatePassword(CharSequence password) {
-
-            if (password == null || password.length() < 1) {
-                newExistingRegisterViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.password_empty_error)));
+            if (password == null || password.length() < 6|| Utility.trim(password).length()<1) {
+                newExistingRegisterViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.password_policy_text)));
                 this.password = null;
                 return false;
             } else {
@@ -304,15 +304,15 @@ public class NewRegisterV2Presenter extends BaseViewModel implements NewRegister
 
         }
 
-        public boolean validateConfirmPassword(CharSequence phoneNumber) {
+        public boolean validateConfirmPassword(CharSequence confirmPassWord) {
 
-            if (phoneNumber == null || phoneNumber.length() < 1) {
-                newExistingRegisterViewLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.confirm_passowrd_empty_error)));
+            if (confirmPassWord == null || confirmPassWord.length() < 1 || Utility.trim(confirmPassWord).length()<1) {
+                newExistingRegisterViewLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.confirm_password_policy_text)));
                 this.confirmPassword = null;
                 return false;
             } else {
                 newExistingRegisterViewLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(true, ""));
-                this.confirmPassword = phoneNumber.toString();
+                this.confirmPassword = confirmPassWord.toString();
                 return true;
             }
         }

app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/presenter/NewRegisterV2PresenterInterface.java

@@ -37,7 +37,7 @@ public interface NewRegisterV2PresenterInterface extends BasePresenterInterface
     void verifyResidenceId();
 
 
-    interface ExistingRegisterV2ContractInterface extends BaseContractInterface {
+    interface NewRegisterV2ContractInterface extends BaseContractInterface {
 
 
 
@@ -57,6 +57,7 @@ public interface NewRegisterV2PresenterInterface extends BasePresenterInterface
 
         void redirectToDashboard();
 
+
         void showResidienceIdVerifyScreen(boolean action,boolean useAnimation);
     }
 }

app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/view/NewRegisterV2Activity.java

@@ -37,7 +37,7 @@ import butterknife.OnClick;
 
 import static com.swifttech.remit.android.features.kyc.newCustomer.view.KYCV3Activity.KYC_FORM_REQUEST_CODE;
 
-public class NewRegisterV2Activity extends BaseActivity implements NewRegisterV2PresenterInterface.ExistingRegisterV2ContractInterface {
+public class NewRegisterV2Activity extends BaseActivity implements NewRegisterV2PresenterInterface.NewRegisterV2ContractInterface {
 
 
     private static final String REFERENCE_ID = "Ref_Id_Bundle_Key";

app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java

@@ -86,8 +86,6 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
     View ammendmentOperationViewContainer;
     @BindView(R.id.toolbar_title)
     GmeTextView toolbarTitle;
-    @BindView(R.id.coupon_fee_divider)
-    View coupon_fee_divider;
     @BindView(R.id.coupon_fee_layout)
     View coupon_fee_layout;
     @BindView(R.id.tv_coupon)

app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenter.java

@@ -70,7 +70,6 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen
 
     @Override
     public boolean checkSafety() {
-
             return true;
     }
 

app/src/main/java/com/swifttech/remit/android/features/splashscreen/view/SplashScreen.java

@@ -185,7 +185,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
 
     private void performDefaultAction(Bundle savedInstanceState) {
 
-        languageViewTransitionManager.underlineTitleText(true);
+        languageViewTransitionManager.underlineTitleText(false);
         splashPresenter.checkCurrentSelectedLanguage();
         exRatePresenter.getExrateRelatedData();
     }
@@ -440,7 +440,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
 
             transferFeeTxtView.setVisibility(View.VISIBLE);
             exchangeRateTxtView.setVisibility(View.VISIBLE);
-            gmeExratePC.setVisibility(View.VISIBLE);
+            gmeExratePC.setVisibility(View.GONE);
 
 
             transferFeeTxtView.setText(chargeAmount);
@@ -560,7 +560,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
                                 @Override
                                 public void onAnimationEnd(View view) {
                                     super.onAnimationEnd(view);
-
                                     exRateViewContainer.setVisibility(View.INVISIBLE);
                                 }
                             })
@@ -602,7 +601,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
                 @Override
                 public void onTransitionStart(@NonNull Transition transition) {
                     super.onTransitionStart(transition);
-                    underlineTitleText(true);
+                    underlineTitleText(false);
                     userNavigatedToLanguageView = true;
                     isAnimationOnProgress = true;
                     ViewCompat.animate(exRateViewContainer).withLayer().alpha(1f).setDuration(FADE_IN_OUT_DURATION).setInterpolator(accelerateDecelerateInterpolator)

app/src/main/java/com/swifttech/remit/android/utils/other/Utility.java

@@ -192,5 +192,24 @@ public class Utility {
         return extension;
     }
 
+    public static CharSequence trim(CharSequence str) {
+        if (str == null || str.length() == 0) {
+            return "";
+        }
+        int len = str.length();
+        int start = 0;
+        int end = len - 1;
+        while (Character.isWhitespace(str.charAt(start)) && start < len) {
+            start++;
+        }
+        while (Character.isWhitespace(str.charAt(end)) && end > 0) {
+            end--;
+        }
+        if (end > start) {
+            return str.subSequence(start, end + 1);
+        }
+        return "";
+    }
+
 
 }

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="line">
+    <stroke
+        android:color="@color/darkgray2"
+        android:dashWidth="15px"
+        android:dashGap="10px"
+        android:width="2dp"/>
+</shape>

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

@@ -2,11 +2,11 @@
     android:viewportWidth="72" android:width="70dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000"
         android:pathData="M35,1.5L37,1.5A33.5,33.5 0,0 1,70.5 35L70.5,35A33.5,33.5 0,0 1,37 68.5L35,68.5A33.5,33.5 0,0 1,1.5 35L1.5,35A33.5,33.5 0,0 1,35 1.5z"
-        android:strokeColor="#8c96a0" android:strokeWidth="3"/>
-    <path android:fillColor="#8c96a0" android:pathData="M56.026,42.892h-11.3a6.77,6.77 0,0 1,0 -13.541h11.3a2.976,2.976 0,0 1,2.972 2.972v7.6A2.976,2.976 0,0 1,56.026 42.892ZM44.726,31.878a4.243,4.243 0,0 0,0 8.486h11.3a0.446,0.446 0,0 0,0.445 -0.445v-7.6a0.446,0.446 0,0 0,-0.445 -0.445h-11.3Z"/>
-    <path android:fillColor="#8c96a0" android:pathData="M52.69,54.369L19.658,54.369A5.117,5.117 0,0 1,14.547 49.258L14.547,22.984a5.116,5.116 0,0 1,5.111 -5.111L52.69,17.873a5.117,5.117 0,0 1,5.111 5.111v2.333a1.264,1.264 0,0 1,-2.527 0L55.274,22.984a2.586,2.586 0,0 0,-2.583 -2.583L19.658,20.401a2.586,2.586 0,0 0,-2.583 2.583L17.075,49.258a2.586,2.586 0,0 0,2.583 2.583L52.69,51.841A2.586,2.586 0,0 0,55.273 49.258L55.273,46.736a1.264,1.264 0,0 1,2.527 0L57.8,49.258A5.116,5.116 0,0 1,52.69 54.369Z"/>
-    <path android:fillColor="#8c96a0" android:pathData="M45.376,37.385L44.113,37.385a1.264,1.264 0,1 1,0 -2.527h1.264a1.264,1.264 0,1 1,0 2.527Z"/>
-    <path android:fillColor="#8c96a0" android:pathData="M56.026,42.892h-11.3a6.77,6.77 0,0 1,0 -13.541h11.3a2.976,2.976 0,0 1,2.972 2.972v7.6A2.976,2.976 0,0 1,56.026 42.892ZM44.726,31.878a4.243,4.243 0,0 0,0 8.486h11.3a0.446,0.446 0,0 0,0.445 -0.445v-7.6a0.446,0.446 0,0 0,-0.445 -0.445h-11.3Z"/>
+        android:strokeColor="@color/darkgray2" android:strokeWidth="3"/>
+    <path android:fillColor="@color/darkgray2" android:pathData="M56.026,42.892h-11.3a6.77,6.77 0,0 1,0 -13.541h11.3a2.976,2.976 0,0 1,2.972 2.972v7.6A2.976,2.976 0,0 1,56.026 42.892ZM44.726,31.878a4.243,4.243 0,0 0,0 8.486h11.3a0.446,0.446 0,0 0,0.445 -0.445v-7.6a0.446,0.446 0,0 0,-0.445 -0.445h-11.3Z"/>
+    <path android:fillColor="@color/darkgray2" android:pathData="M52.69,54.369L19.658,54.369A5.117,5.117 0,0 1,14.547 49.258L14.547,22.984a5.116,5.116 0,0 1,5.111 -5.111L52.69,17.873a5.117,5.117 0,0 1,5.111 5.111v2.333a1.264,1.264 0,0 1,-2.527 0L55.274,22.984a2.586,2.586 0,0 0,-2.583 -2.583L19.658,20.401a2.586,2.586 0,0 0,-2.583 2.583L17.075,49.258a2.586,2.586 0,0 0,2.583 2.583L52.69,51.841A2.586,2.586 0,0 0,55.273 49.258L55.273,46.736a1.264,1.264 0,0 1,2.527 0L57.8,49.258A5.116,5.116 0,0 1,52.69 54.369Z"/>
+    <path android:fillColor="@color/darkgray2" android:pathData="M45.376,37.385L44.113,37.385a1.264,1.264 0,1 1,0 -2.527h1.264a1.264,1.264 0,1 1,0 2.527Z"/>
+    <path android:fillColor="@color/darkgray2" android:pathData="M56.026,42.892h-11.3a6.77,6.77 0,0 1,0 -13.541h11.3a2.976,2.976 0,0 1,2.972 2.972v7.6A2.976,2.976 0,0 1,56.026 42.892ZM44.726,31.878a4.243,4.243 0,0 0,0 8.486h11.3a0.446,0.446 0,0 0,0.445 -0.445v-7.6a0.446,0.446 0,0 0,-0.445 -0.445h-11.3Z"/>
     <path android:fillColor="#00000000" android:pathData="M44.723,41.628a5.507,5.507 0,0 1,-5.507 -5.507h0a5.507,5.507 0,0 1,5.507 -5.507h4.232v-2.74a1.155,1.155 0,0 0,-1.155 -1.155L24.548,26.719a1.156,1.156 0,0 0,-1.155 1.155L23.393,44.368a1.155,1.155 0,0 0,1.155 1.155h23.251a1.156,1.156 0,0 0,1.155 -1.155v-2.74h-4.232Z"/>
     <path android:fillColor="#8c96a0" android:pathData="M47.797,46.787L24.548,46.787a2.422,2.422 0,0 1,-2.419 -2.419L22.129,27.874a2.422,2.422 0,0 1,2.419 -2.419L47.797,25.455a2.422,2.422 0,0 1,2.419 2.419v2.74a1.264,1.264 0,0 1,-1.264 1.264h-4.232a4.243,4.243 0,0 0,0 8.486h4.232a1.264,1.264 0,0 1,1.264 1.264v2.74A2.422,2.422 0,0 1,47.797 46.787ZM24.656,44.26h23.034v-1.368h-2.969a6.771,6.771 0,0 1,0 -13.541h2.969v-1.368L24.656,27.983Z"/>
 </vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="54dp"
+    android:height="49.5dp"
+    android:viewportWidth="54"
+    android:viewportHeight="54">
+    <path
+        android:pathData="M15.75,47.25h-9L6.75,22.5h9ZM31.5,22.5h-9L22.5,47.25h9ZM47.25,22.5h-9L38.25,47.25h9ZM51.75,49.5L2.25,49.5L2.25,54h49.5ZM0,20.25L54,20.25L27,0Z"
+        android:fillColor="@color/darkgray2"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="66dp"
+    android:height="49.5dp"
+    android:viewportWidth="66"
+    android:viewportHeight="49.5">
+    <path
+        android:pathData="M66,33.027C47.143,43.865 31.9,29.112 12.375,49.5L0,22.083l3.856,-4.023L14.325,41.176l-0.006,0.019c20.474,-15.386 30.786,-3.234 49.8,-12.548 0.809,1.782 1.554,3.663 1.881,4.381ZM41.514,15.95a7.857,7.857 0,0 0,-8.063 -4.5,4.382 4.382,0 0,0 -3.385,6.4 7.8,7.8 0,0 0,8.508 4.408C41.429,21.555 42.746,18.818 41.514,15.95ZM37.532,19.7l0.286,0.63 -0.6,0.124 -0.267,-0.6a4.682,4.682 0,0 1,-1.977 -0.074L34.8,18.711a5.3,5.3 0,0 0,1.713 0.055l0.344,-0.113c0.608,-0.3 0.421,-1.064 -0.484,-1.246 -0.671,-0.149 -2.456,-0.038 -3.121,-1.518a1.478,1.478 0,0 1,0.979 -2.106l-0.3,-0.657 0.6,-0.124 0.286,0.63a6.207,6.207 0,0 1,1.548 -0.047l0.239,1.053a4.491,4.491 0,0 0,-1.408 -0.022l-0.165,0.044c-0.85,0.226 -0.578,1.031 0.176,1.226 1.246,0.289 2.734,0.382 3.322,1.683A1.471,1.471 0,0 1,37.532 19.7ZM53.053,6.452 L59.7,20.782c-11.767,6.281 -27.145,-0.935 -41.25,6.878L12.089,13.731c10.651,-7.409 25.292,-0.1 40.964,-7.279ZM55.534,0C38.541,11.011 19.764,-0.874 6.168,12.249L16.522,34.854C31.092,22.5 50.949,34.2 65.89,22.6L55.533,0Z"
+        android:fillColor="@color/darkgray2"/>
+</vector>

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

@@ -0,0 +1,47 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="38"
+    android:viewportHeight="38">
+  <path
+      android:pathData="M19,1L19,1A18,18 0,0 1,37 19L37,19A18,18 0,0 1,19 37L19,37A18,18 0,0 1,1 19L1,19A18,18 0,0 1,19 1z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#8c96a0"/>
+  <path
+      android:pathData="M18.637,14.364l1.1,2.69 2.977,0.27 -2.248,1.968 0.692,2.825 -2.518,-1.559L16.116,22.113l0.692,-2.825 -2.248,-1.968 2.977,-0.27Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M18.638,14.364l1.1,2.69 2.977,0.27 -2.248,1.968 0.692,2.825L18.638,20.558Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M22.741,16.973l-2.775,-0.253 -1.013,-2.5a0.338,0.338 0,0 0,-0.624 0l-1.019,2.518L14.528,16.973a0.338,0.338 0,0 0,-0.192 0.591L16.428,19.393l-0.641,2.643a0.338,0.338 0,0 0,0.51 0.368L18.64,20.952l2.343,1.448a0.338,0.338 0,0 0,0.5 -0.368l-0.641,-2.626 2.093,-1.829a0.338,0.338 0,0 0,-0.192 -0.608ZM20.241,19.022a0.338,0.338 0,0 0,-0.1 0.338l0.5,2.025 -1.816,-1.124a0.338,0.338 0,0 0,-0.354 0l-1.826,1.134 0.5,-2.025a0.338,0.338 0,0 0,-0.1 -0.338l-1.654,-1.448 2.194,-0.2a0.338,0.338 0,0 0,0.28 -0.209l0.786,-1.924 0.787,1.924a0.337,0.337 0,0 0,0.28 0.209l2.194,0.2Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M21.142,12.018a7.162,7.162 0,0 1,0.709 0.311,0.338 0.338,0 1,0 0.3,-0.6 7.7,7.7 0,0 0,-0.776 -0.338,0.338 0.338,0 1,0 -0.236,0.631Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M18.661,8.872a9.789,9.789 0,1 0,3.746 0.745A9.788,9.788 0,0 0,18.661 8.872ZM18.661,27.772a9.113,9.113 0,1 1,6.444 -2.669A9.113,9.113 0,0 1,18.661 27.774Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M18.661,25.074a0.337,0.337 0,0 0,-0.338 0.338v0.675a0.338,0.338 0,1 0,0.675 0v-0.675a0.337,0.337 0,0 0,-0.338 -0.338Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M20.684,25.101a0.338,0.338 0,0 0,-0.651 0.176l0.176,0.651a0.339,0.339 0,0 0,0.655 -0.179Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M15.539,24.237a0.338,0.338 0,0 0,-0.462 0.125l-0.338,0.584a0.338,0.338 0,0 0,0.584 0.338l0.338,-0.584a0.338,0.338 0,0 0,-0.122 -0.462Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M22.245,24.362a0.338,0.338 0,0 0,-0.584 0.338l0.338,0.584a0.338,0.338 0,0 0,0.584 -0.338Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M17.044,24.861a0.338,0.338 0,0 0,-0.412 0.24l-0.176,0.648a0.338,0.338 0,1 0,0.651 0.176L17.282,25.273a0.338,0.338 0,0 0,-0.24 -0.412Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M13.648,13.648a7.112,7.112 0,0 1,6.14 -1.988A0.342,0.342 0,0 0,19.898 10.985,7.763 7.763,0 0,0 13.172,24.149a0.338,0.338 0,0 0,0.476 -0.476,7.088 7.088,0 0,1 0,-10.025Z"
+      android:fillColor="#8c96a0"/>
+  <path
+      android:pathData="M24.15,13.172a7.885,7.885 0,0 0,-0.705 -0.628,0.338 0.338,0 1,0 -0.415,0.53 7.206,7.206 0,0 1,0.645 0.574,7.088 7.088,0 0,1 0,10.025 0.338,0.338 0,1 0,0.476 0.476,7.763 7.763,0 0,0 0,-10.977Z"
+      android:fillColor="#8c96a0"/>
+</vector>

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

@@ -69,6 +69,7 @@
                 style="@style/MFormLink"
                 android:id="@+id/txvPrivacyPolicy"
                 android:layout_width="wrap_content"
+                android:paddingLeft="0dp"
                 android:text="@string/privacyAndPolicy1_text"
                 android:layout_marginBottom="@dimen/_5sdp"
                 android:textColor="@color/bluebg"

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

@@ -23,6 +23,7 @@
                 android:id="@+id/currentPassword_TxtInputLayout"
                 app:errorEnabled="true"
                 style="@style/MTextInputLayoutForm"
+                app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                 app:endIconMode="password_toggle"
                 android:hint="@string/current_password_text"
                 app:startIconDrawable="@drawable/icv_vd_lock"

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

@@ -129,7 +129,7 @@
                 android:id="@+id/middleBoundaryViewContainer"
                 android:layout_width="1dp"
                 android:layout_height="@dimen/_35sdp"
-                android:background="@color/black"
+                android:background="@color/gray"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="@+id/guideline7"
                 app:layout_constraintStart_toStartOf="@+id/guideline7"
@@ -299,7 +299,7 @@
                 android:layout_width="1dp"
                 android:layout_height="@dimen/_35sdp"
                 android:layout_marginEnd="18dp"
-                android:background="@color/black"
+                android:background="@color/gray"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="@+id/guideline8"
                 app:layout_constraintStart_toStartOf="@+id/guideline8"

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

@@ -32,6 +32,7 @@
 
                 <com.swifttech.remit.android.common.view.MTextInputLayout
                     android:id="@+id/usernameId_TxtInputLayout"
+                    app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                     style="@style/MTextInputLayoutForm"
                     android:layout_marginTop="@dimen/form_initial_input_margin_top"
                     app:endIconMode="clear_text"

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

@@ -531,7 +531,7 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="@dimen/_15sdp"
                 android:layout_marginBottom="@dimen/_15sdp"
-                android:text="@string/submit_text"
+                android:text="@string/save_text"
             />
 
         </LinearLayout>

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

@@ -148,7 +148,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="10dp"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="@dimen/_20sdp"
                     android:layout_gravity="center"
                     >
 

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

@@ -206,11 +206,14 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/_8sdp"
-                android:background="@drawable/ic_rectangle_white_extra_corners">
+                android:background="@drawable/ic_rectangle_white_extra_corners"
+                android:orientation="vertical">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -221,7 +224,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="@dimen/_8sdp"
-                        android:text="@string/transaction_date_text"
+                        android:text="@string/transaction_text"
                         android:textColor="@color/darkgray"
                         android:textSize="@dimen/_11ssp" />
 
@@ -234,17 +237,17 @@
                         android:gravity="end"
                         android:padding="@dimen/_8sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
-                        app:txtfontName="@string/semibold" />
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
+                        app:txtfontName="@string/bold" />
                 </LinearLayout>
-            </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/_8sdp"
-                android:background="@drawable/ic_rectangle_white_extra_corners"
-                android:orientation="vertical">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="5dp"
+                    android:background="@drawable/bg_dotted"
+                    />
+
 
                 <LinearLayout
                     android:id="@+id/nameContainer"
@@ -269,15 +272,11 @@
                         android:gravity="end"
                         android:padding="@dimen/_8sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         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"
@@ -301,16 +300,11 @@
                         android:padding="@dimen/_8sdp"
                         android:singleLine="true"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/receiver_label"
-                    android:background="@color/gray" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -334,17 +328,11 @@
                         android:gravity="end"
                         android:padding="@dimen/_8sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/mobile_label"
-                    android:background="@color/gray" />
-
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -369,17 +357,11 @@
                         android:singleLine="false"
                         android:text=""
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
 
-                <View
-                    android:id="@+id/account_no_container_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/gray"
-                    android:visibility="gone" />
-
                 <LinearLayout
                     android:id="@+id/account_no_container"
                     android:layout_width="match_parent"
@@ -406,17 +388,11 @@
                         android:singleLine="false"
                         android:text=""
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
 
-
-                <View
-                    android:id="@+id/total_sent_amount_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/gray" />
-
                 <LinearLayout
                     android:id="@+id/total_sent_amount_layout"
                     android:layout_width="match_parent"
@@ -439,16 +415,12 @@
                         android:padding="@dimen/_8sdp"
                         android:text=""
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
 
-                <!---->
-                <View
-                    android:id="@+id/service_fee_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/gray" />
+
 
                 <LinearLayout
                     android:id="@+id/service_fee_layout"
@@ -471,20 +443,17 @@
                         android:gravity="end"
                         android:padding="@dimen/_8sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
-                <!---->
-                <View
-                    android:id="@+id/coupon_fee_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/gray" />
 
                 <LinearLayout
                     android:id="@+id/coupon_fee_layout"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    >
 
                     <com.swifttech.remit.android.common.customwidgets.GmeTextView
                         android:layout_width="wrap_content"
@@ -504,19 +473,12 @@
                         android:paddingBottom="@dimen/_8sdp"
                         android:paddingEnd="@dimen/_8sdp"
                         android:paddingStart="@dimen/_17sdp"
-
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold"
                         tools:text="Some really really long coupon name for testing the UI. Some really really long coupon name for testing the UI." />
                 </LinearLayout>
-                <!---->
-                <View
-                    android:id="@+id/exrate_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-
-                    android:background="@color/gray" />
 
                 <LinearLayout
                     android:id="@+id/exrate_layout"
@@ -539,17 +501,11 @@
                         android:gravity="end"
                         android:padding="@dimen/_8sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
 
-                <View
-                    android:id="@+id/total_amount_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-
-                    android:background="@color/gray" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -571,7 +527,8 @@
                         android:gravity="end"
                         android:padding="@dimen/_8sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
             </LinearLayout>

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

@@ -78,6 +78,7 @@
             android:layout_marginEnd="@dimen/_8sdp"
             android:paddingTop="@dimen/_11sdp"
             android:paddingBottom="@dimen/_11sdp"
+            android:fontFamily="@font/san_francisco_text_regular"
             android:text="@string/select_language_text"
             android:textColor="@color/black"
             android:textSize="@dimen/text_big"
@@ -232,7 +233,7 @@
                     android:id="@+id/middleBoundaryViewContainer"
                     android:layout_width="1dp"
                     android:layout_height="@dimen/_35sdp"
-                    android:background="@color/black"
+                    android:background="@color/gray"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="@+id/guideline7"
                     app:layout_constraintStart_toStartOf="@+id/guideline7"
@@ -290,7 +291,6 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:padding="@dimen/_4sdp"
-
                 android:gravity="center_vertical"
                 android:textColor="@color/darkgray2"
                 android:textSize="@dimen/_10ssp" />
@@ -401,7 +401,7 @@
                     android:layout_width="1dp"
                     android:layout_height="@dimen/_35sdp"
                     android:layout_marginEnd="18dp"
-                    android:background="@color/black"
+                    android:background="@color/gray"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="@+id/guideline8"
                     app:layout_constraintStart_toStartOf="@+id/guideline8"

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

@@ -97,7 +97,7 @@
                     android:id="@+id/middleBoundaryViewContainer"
                     android:layout_width="1dp"
                     android:layout_height="@dimen/_35sdp"
-                    android:background="@color/black"
+                    android:background="@color/gray"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="@+id/guideline7"
                     app:layout_constraintStart_toStartOf="@+id/guideline7"
@@ -266,7 +266,7 @@
                     android:layout_width="1dp"
                     android:layout_height="@dimen/_35sdp"
                     android:layout_marginEnd="18dp"
-                    android:background="@color/black"
+                    android:background="@color/gray"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="@+id/guideline8"
                     app:layout_constraintStart_toStartOf="@+id/guideline8"

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

@@ -36,6 +36,7 @@
             app:endIconMode="clear_text"
             app:errorEnabled="true"
             android:hint="@string/referralcode_placeholder_text"
+            app:startIconDrawable="@drawable/icv_referal_icon"
             >
             <com.swifttech.remit.android.common.view.MTextInputEditText
                 android:id="@+id/referralCode_edTxt"
@@ -51,6 +52,7 @@
             style="@style/MTextInputLayoutForm"
             app:endIconMode="clear_text"
             android:hint="@string/customerName_text"
+            app:startIconDrawable="@drawable/icv_vd_user"
             >
             <com.swifttech.remit.android.common.view.MTextInputEditText
                 android:id="@+id/userId_edTxt"
@@ -69,6 +71,7 @@
             style="@style/MTextInputLayoutForm"
             app:endIconMode="password_toggle"
             android:hint="@string/new_password_text"
+            app:startIconDrawable="@drawable/icv_vd_lock"
             >
             <com.swifttech.remit.android.common.view.MTextInputEditText
                 android:inputType="textPassword"
@@ -86,6 +89,7 @@
             style="@style/MTextInputLayoutForm"
             app:endIconMode="password_toggle"
             android:hint="@string/confirm_password_text"
+            app:startIconDrawable="@drawable/icv_vd_lock"
             >
             <com.swifttech.remit.android.common.view.MTextInputEditText
                 android:inputType="textPassword"
@@ -103,6 +107,7 @@
             app:endIconMode="password_toggle"
             android:maxLength="6"
             android:hint="@string/newPin_text"
+            app:startIconDrawable="@drawable/icv_vd_lock"
             >
             <com.swifttech.remit.android.common.view.MTextInputEditText
                 android:inputType="textPassword"
@@ -120,6 +125,7 @@
             style="@style/MTextInputLayoutForm"
             app:endIconMode="password_toggle"
             android:hint="@string/confirmPin_text"
+            app:startIconDrawable="@drawable/icv_vd_lock"
             >
             <com.swifttech.remit.android.common.view.MTextInputEditText
                 android:inputType="textPassword"

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

@@ -59,7 +59,6 @@
 
             <com.swifttech.remit.android.common.view.MTextInputLayout
                 android:id="@+id/occupationSelectionWrapper"
-                android:hint="@string/select_occupation_text"
                 style="@style/MTextInputLayoutFormDropDown"
                 app:endIconMode="dropdown_menu"
                 app:errorEnabled="true">
@@ -67,8 +66,9 @@
                 <com.swifttech.remit.android.common.view.MAutoCompleteTextView
                     android:id="@+id/ed_occupation"
                     style="@style/MAutoCompleteDropDown"
-                    android:imeOptions="actionDone"
-                    />
+                    android:hint="@string/select_occupation_text"
+                    android:layout_height="46dp"
+                    android:imeOptions="actionDone" />
             </com.swifttech.remit.android.common.view.MTextInputLayout>
 
             <com.swifttech.remit.android.common.view.MTextInputLayout

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

@@ -536,11 +536,12 @@
                     android:layout_marginBottom="@dimen/_5sdp"
                     android:padding="@dimen/_5sdp"
                     android:text="@string/view_sample_text"
-                    android:visibility="gone"
+                    android:visibility="invisible"
                     android:textColor="@color/m_blue_text_link"
                     app:layout_constraintTop_toBottomOf="@+id/additionalIDImageview"
                     app:layout_constraintBottom_toTopOf="@+id/additionalIdTypeHintTxtView"
-                    app:layout_constraintEnd_toEndOf="parent" />
+                    app:layout_constraintEnd_toEndOf="parent"
+                    />
 
 
                 <com.swifttech.remit.android.common.view.MTextView
@@ -579,7 +580,7 @@
                 <ImageView
                     android:id="@+id/additionalIDBackImageview"
                     android:layout_width="@dimen/_80sdp"
-                    android:layout_height="@dimen/_80sdp"
+                    android:layout_height="@dimen/_72sdp"
                     android:layout_marginStart="@dimen/_20sdp"
                     android:layout_marginEnd="@dimen/_20sdp"
                     android:scaleType="centerCrop"
@@ -608,6 +609,7 @@
                     android:layout_marginTop="@dimen/_6sdp"
                     android:layout_marginBottom="@dimen/_6sdp"
                     android:background="@color/gray"
+                    android:visibility="visible"
                     app:layout_constraintBottom_toTopOf="@+id/additionalIdBackTypeHintTxtView"
                     app:layout_constraintEnd_toStartOf="@+id/additionalIdBackTypeLabelTxtView"
                     app:layout_constraintHorizontal_bias="0.5"
@@ -638,6 +640,7 @@
                     android:text="@string/view_sample_text"
                     android:visibility="invisible"
                     android:textColor="@color/m_blue_text_link"
+                    app:layout_constraintTop_toBottomOf="@+id/additionalIDBackImageview"
                     app:layout_constraintBottom_toTopOf="@+id/additionalIdBackTypeHintTxtView"
                     app:layout_constraintEnd_toEndOf="parent" />
 

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

@@ -130,6 +130,13 @@
                     app:txtfontName="@string/semibold" />
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="5dp"
+                android:background="@drawable/bg_dotted"
+                android:layout_marginTop="@dimen/_12sdp"
+                />
+
 
             <com.swifttech.remit.android.common.customwidgets.GmeTextView
                 android:layout_width="match_parent"
@@ -361,6 +368,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/_16sdp"
             android:gravity="center"
+            android:visibility="gone"
             android:paddingTop="@dimen/_4sdp"
             android:paddingBottom="@dimen/_4sdp"
             android:text="@string/jme_fraud_warning_text"

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

@@ -16,8 +16,8 @@
 
     <ImageView
         android:layout_marginTop="@dimen/_10sdp"
-        android:layout_width="@dimen/_60sdp"
-        android:layout_height="@dimen/_45sdp"
+        android:layout_width="@dimen/_55sdp"
+        android:layout_height="@dimen/_40sdp"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
         app:srcCompat="@drawable/vd_jme_logo_only" />

app/src/main/res/values-bn/strings.xml

@@ -730,7 +730,6 @@
     <string name="cancel_coupon_text">বাতিল</string>
     <string name="jme_fraud_warning_text">2. জালিয়াতি সতর্কতা</string>
     <string name="amount_max_error_text">প্রেরণের পরিমাণ  6,500,000 উয়ন এর বেশি হবে না</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-hdpi/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-in/strings.xml

@@ -696,7 +696,6 @@
     <string name="cancel_coupon_text">Batal</string>
     <string name="jme_fraud_warning_text">2. Peringatan Penipuan</string>
     <string name="amount_max_error_text">Jumlah uang yang dikirim tidak boleh melebihi 6,500,000 KRW</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-km/strings.xml

@@ -766,7 +766,6 @@
     <string name="cancel_coupon_text">លុបចោល</string>
     <string name="jme_fraud_warning_text">2. សូមប្រយ័ត្នទៅលើការឆបោកទៅលើការផ្ទេរប្រាក់</string>
     <string name="amount_max_error_text">ការផ្ញើរមិនអាចលើសពី  6,500,000 វ៉ុន</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-ko/strings.xml

@@ -768,7 +768,6 @@
     <string name="jme_fraud_warning_text">2.  송금 사기 주의</string>
     <string name="amount_max_error_text">송금 금액이 6,500,000 KRW을 넘을 수 없습니다.</string>
     <string name="buying_coupon_success_msg_text">수수료 무료 쿠폰을 이용해 해외송금을 이용할 수 있습니다.</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-mn/strings.xml

@@ -760,7 +760,6 @@
     <string name="cancel_coupon_text">Цуцлах</string>
     <string name="jme_fraud_warning_text">2. Залилангаас сэрэмжлэх</string>
     <string name="amount_max_error_text">Шилжүүлэх боломжит дүнгийн дээд хэмжээ 6,500,000 вон</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-my/strings.xml

@@ -440,7 +440,6 @@
     <string name="cancel_coupon_text">ဖ်က္သိမ္းရန္</string>
     <string name="jme_fraud_warning_text">2. ေငြေၾကးဆိုင္ရာ လိမ္လည္မွုမ်ားသတိျပဳရန္</string>
     <string name="amount_max_error_text">ပေးပို့သည့်ပမာဏမှာ ၀မ် 6,500,000 ထက်မပိုရပါ</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-ne/strings.xml

@@ -763,7 +763,6 @@
     <string name="cancel_coupon_text">रद्द गर्नु</string>
     <string name="jme_fraud_warning_text">2. रेमिट्यान्स फ्रड सावधानी</string>
     <string name="amount_max_error_text">पठाउने रकम ६,५०००,००० KRW भन्दा बढि हुनु हुँदैन।</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-ru/strings.xml

@@ -733,7 +733,6 @@
     <string name="cancel_coupon_text">Отмена</string>
     <string name="jme_fraud_warning_text">2. Предупреждение о мошенничествах</string>
     <string name="amount_max_error_text">Сумма отправки не должна превышать 6,500,000 вон</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-si/strings.xml

@@ -755,7 +755,6 @@
     <string name="cancel_coupon_text">අවලංගු කරන්න</string>
     <string name="jme_fraud_warning_text">2. වංචා අනතුරු ඇඟවීම</string>
     <string name="amount_max_error_text">මුදල් ප්‍රමාණය 6,500,000 KRW නොඉක්මවිය යුතුය</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-th/strings.xml

@@ -719,7 +719,6 @@
     <string name="cancel_coupon_text">ยกเลิก</string>
     <string name="jme_fraud_warning_text">2. ประกาศเตือนภัยมิจฉาชีพ</string>
     <string name="amount_max_error_text">ยอดโอนเงินควรไม่เกิน 6,500,000 วอน</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-ur/strings.xml

@@ -558,7 +558,6 @@
     <string name="cancel_coupon_text">منسوخ کریں</string>
     <string name="jme_fraud_warning_text">2. فراڈ کی وارننگ</string>
     <string name="amount_max_error_text">رقم 6،500،000 KRW سے زیادہ نہیں ہونی چاہئے</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-uz/strings.xml

@@ -718,7 +718,6 @@
     <string name="verification_completed_title_text">Tasdiqlanish to\'liq yakunlandi</string>
     <string name="jme_fraud_warning_text">2. Firibgarliklar haqida ogohlantirish</string>
     <string name="amount_max_error_text">Jo\'natish miqdori 6,500,000 KRWdan oshmasligi shart</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

app/src/main/res/values-vi/strings.xml

@@ -757,7 +757,6 @@
     <string name="cancel_coupon_text">Từ chối</string>
     <string name="jme_fraud_warning_text">"2. Cảnh báo lừa đảo "</string>
     <string name="amount_max_error_text">Số tiền không được vượt quá 6,500,000 KRW</string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>

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

@@ -38,8 +38,8 @@
     <dimen name="form_input_padding_bottom">@dimen/_8sdp</dimen>
     <dimen name="form_input_padding_start">@dimen/_4sdp</dimen>
     <dimen name="form_input_padding_end">@dimen/_4sdp</dimen>
-    <dimen name="form_input_margin_top">@dimen/_3sdp</dimen>
-    <dimen name="form_input_margin_bottom">@dimen/_3sdp</dimen>
+    <dimen name="form_input_margin_top">@dimen/_2sdp</dimen>
+    <dimen name="form_input_margin_bottom">@dimen/_2sdp</dimen>
     <dimen name="form_initial_input_margin_top">@dimen/_20sdp</dimen>
     <dimen name="form_input_text_size">@dimen/_14ssp</dimen>
 

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

@@ -111,7 +111,7 @@
     <string name="jme_account_statement_text">Account Statement</string>
     <string name="home_text">Home</string>
     <string name="profile_text">Profile</string>
-    <string name="help_you_text">We are there to help you (Available time 10:00AM - 12:00AM)</string>
+    <string name="help_you_text">We are there to help you \n (Available time 10:00AM - 12:00AM)</string>
     <string name="cancel_text">Cancel</string>
     <string name="reward_point_text">Reward Point</string>
 
@@ -206,7 +206,7 @@
     <string name="bank_empty_error">Please select a bank</string>
     <string name="payment_mode_empty_error">Please select a payment mode</string>
     <string name="terms_and_condition_title_text"><![CDATA[Terms & Condition]]></string>
-    <string name="terms_and_condition_title_text1"><![CDATA[<u>Terms & Condition</u>]]></string>
+    <string name="terms_and_condition_title_text1"><u>Terms and Conditions</u></string>
     <string name="no_payout_currency_defined_error">No payout currency defined, please contact support.</string>
     <string name="select_bank_first_text">Please select a bank first</string>
 
@@ -249,7 +249,7 @@
     <string name="setting_text">Setting</string>
     <string name="change_password_text">Change Password</string>
 
-    <string name="about_me_description_text" translatable="false">Japan Money Expresstance is an innovative solution developed by young Nepali Engineers to enable the digital channel for customers to access the Remittance products and services that addresses consumer’s remittance needs in real-time basis using digital channels.
+    <string name="about_me_description_text" translatable="false">Japan Money Express is an innovative solution developed by young Nepali Engineers to enable the digital channel for customers to access the Remittance products and services that addresses consumer’s remittance needs in real-time basis using digital channels.
 
 All the configurations are done from backend web application system which allows operation users to manage all configurations and make right decisions.</string>
     <string name="app_version_text">App Version</string>
@@ -264,7 +264,8 @@ All the configurations are done from backend web application system which allows
     <string name="confirm_new_password_placeholder_text">Confirm Your Password</string>
     <string name="save_password_text">Save</string>
     <string name="password_policy_text">Password must be at least 6 characters</string>
-    <string name="confirm_password_mismatch_error_text">Confirm password does not match with new password</string>
+    <string name="confirm_password_policy_text">Confirm password must be at least 6 characters</string>
+    <string name="confirm_password_mismatch_error_text">Password does not match confirm password</string>
     <string name="success_text">Success</string>
     <string name="confirm_passowrd_empty_error">Confirm password cannot be empty</string>
 
@@ -514,7 +515,7 @@ All the configurations are done from backend web application system which allows
     <string name="token_renewal_placeholder_text">Select Language for Token Renewal</string>
     <string name="later_text">Later</string>
     <string name="renewal_text">Renew</string>
-    <string name="userid_placeholder_text">Enter your ID for using Japan Money Express</string>
+    <string name="userid_placeholder_text">Enter your ID for using JME</string>
     <string name="userid_error_text">ID must be in between 4 to 50 characters</string>
     <string name="live_chat_text">Live Chat</string>
     <string name="login_user_credential_title_text">User ID / Email / Mobile Number</string>
@@ -796,7 +797,6 @@ All the configurations are done from backend web application system which allows
     <string name="amount_max_error_text">Sending amount should not exceed 6,500,000 KRW</string>
     <string name="buying_coupon_success_msg_text">You can now use free service charge coupon while sending money overseas.</string>
     <string name="existing_jme_users_without_app_login"><u>Existing JME Users without App Login</u></string>
-    <string name="employerName_text">Employer Name</string>
     <string name="referralcode_placeholder_text">Referral Code(if any)</string>
     <string name="customerName_text">Create an USERNAME to use JME</string>
     <string name="mobile_prefix">+81</string>
@@ -994,6 +994,7 @@ All the configurations are done from backend web application system which allows
     <string name="requestedAmt_text">Requested Amount</string>
     <string name="confirmSendingAmt_text">Confirm sending amount</string>
     <string name="general_enquiry_thank_you">Thank you for contacting us.</string>
-
-
+    <string name="employerName_text">Employer Name (Optional)</string>
+    <string name="kycSubmitSucessMessage_text">Thank you for registering for Japan Money Express. We are verifying your information Once approved, you will receive SMS</string>
+    <string name="transaction_text">Transaction</string>
 </resources>

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

@@ -9,10 +9,8 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="bottomSheetDialogTheme">@style/RoundedBottomSheetDialog</item>
         <item name="alertDialogTheme">@style/MAlertDialog</item>
-
     </style>
 
-
     <style name="AppTheme.Launcher">
         <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="windowActionBar">false</item>
@@ -284,21 +282,20 @@
         <item name="hintTextAppearance">@style/MTextInpuLayoutHintStyle</item>
     </style>
 
+
     <style name="MTextInpuLayoutHintStyle" parent="TextAppearance.Design.Hint">
         <item name="android:textColor">@color/textinput_hint_color</item>
+        <item name="android:fontFamily">@font/san_francisco_text_regular</item>
 
     </style>
 
     <style name="MTextInpuLayoutErrorStyle" parent="TextAppearance.Design.Error">
         <item name="android:textColor">@color/colorPrimary</item>
     </style>
-
     <style name="MTextInputLayoutForm" parent="MTextInputLayout">
         <item name="android:layout_marginTop">@dimen/form_input_margin_top</item>
         <item name="android:layout_marginBottom">@dimen/form_input_margin_bottom</item>
-
     </style>
-
     <style name="MTextInputLayoutFormDropDown" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
         <item name="android:focusable">false</item>
         <item name="android:clickable">true</item>
@@ -306,8 +303,6 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_marginTop">@dimen/form_input_margin_top</item>
         <item name="android:layout_marginBottom">@dimen/form_input_margin_bottom</item>
-
-
     </style>
 
     <style name="MAutoCompleteDropDown">
@@ -318,6 +313,7 @@
         <item name="android:cursorVisible">false</item>
         <item name="android:clickable">false</item>
         <item name="android:textSize">@dimen/form_input_text_size</item>
+        <item name="android:fontFamily">@font/san_francisco_text_regular</item>
     </style>
 
     <style name="MTextInputEditText">

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Nov 20 14:16:23 NPT 2019
+#Tue Oct 13 21:19:47 NPT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip