refactoring

app/src/main/java/com/swifttech/remit/jmecustomer/RemitApplication.java

@@ -15,7 +15,6 @@ import java.net.SocketException;
 
 import io.reactivex.exceptions.UndeliverableException;
 import io.reactivex.plugins.RxJavaPlugins;
-import okhttp3.OkHttpClient;
 
 import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE;
 
@@ -85,7 +84,7 @@ public class RemitApplication extends MultiDexApplication {
         if (stringExtractor == null)
             stringExtractor = new StringExtractor(getResources());
 
-        mSharedPreferences = this.getSharedPreferences(getString(R.string.gme_sharedpreferences_key), Context.MODE_PRIVATE);
+        mSharedPreferences = this.getSharedPreferences(getString(R.string.jme_sharedpreferences_key), Context.MODE_PRIVATE);
     }
 
     @Override

app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseActivity.java

@@ -43,7 +43,7 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
     private boolean shouldEnableAppScreenShot = true;
     private boolean shouldallowDefaultActivityTransition = false;
 
-    private MutableLiveData<Boolean> gmeLoaderLiveData;
+    private MutableLiveData<Boolean> jmeLoaderLiveData;
     private MutableLiveData<CustomAlertDialog.Param> popUpMessageLiveData;
 
 
@@ -59,9 +59,9 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
     }
 
     private void init() {
-        gmeLoaderLiveData = new MutableLiveData<>();
+        jmeLoaderLiveData = new MutableLiveData<>();
         popUpMessageLiveData = new MutableLiveData<>();
-        gmeLoaderLiveData.observe(this, this::showGMELoader);
+        jmeLoaderLiveData.observe(this, this::showGMELoader);
         popUpMessageLiveData.observe(this, this::showPopUpinDialog);
     }
 
@@ -103,7 +103,7 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
 
     @Override
     public void showProgressBar(boolean action, String message) {
-        gmeLoaderLiveData.postValue(action);
+        jmeLoaderLiveData.postValue(action);
     }
 
     private void showGMELoader(boolean action) {

app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GMEFormInputField.java

@@ -60,7 +60,7 @@ public class GMEFormInputField extends GMETextInputLayout {
     }
 
     private void addEditText(Context context) {
-         editTextView= new GmeEditText(new ContextThemeWrapper(context, R.style.gme_form_edit_txt));
+         editTextView= new GmeEditText(new ContextThemeWrapper(context, R.style.jme_form_edit_txt));
          editTextView.setHint(textHint);
          editTextView.setShouldApplyAsciiFilter(false);
          editTextView.setEnabled(edIsEnabled);

app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeTextView.java → app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/JmeTextView.java

@@ -13,18 +13,18 @@ import com.swifttech.remit.jmecustomer.R;
  * Created by frantic on 12/14/17.
  */
 
-public class GmeTextView extends AppCompatTextView{
-    public GmeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+public class JmeTextView extends AppCompatTextView{
+    public JmeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         init(context, attrs);
     }
 
-    public GmeTextView(Context context, AttributeSet attrs) {
+    public JmeTextView(Context context, AttributeSet attrs) {
         super(context, attrs);
         init(context, attrs);
     }
 
-    public GmeTextView(Context context) {
+    public JmeTextView(Context context) {
         super(context);
         init(context,null);
     }

app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/RemitLoaderDialog.java

@@ -18,7 +18,7 @@ import butterknife.ButterKnife;
 public class RemitLoaderDialog extends DialogFragment {
 
     @BindView(R.id.imageView)
-    AppCompatImageView gmeLoaderImageView;
+    AppCompatImageView jmeLoaderImageView;
 
     private AnimatedVectorDrawableCompat logo;
 
@@ -30,7 +30,7 @@ public class RemitLoaderDialog extends DialogFragment {
         ButterKnife.bind(this, view);
         setCancelable(false);
         logo = AnimatedVectorDrawableCompat.create(getActivity(), R.drawable.avd_progressbar_indeterminant);
-        gmeLoaderImageView.setImageDrawable(logo);
+        jmeLoaderImageView.setImageDrawable(logo);
         Dialog dialog= builder.create();
         Window window = dialog.getWindow();
         if (window != null) {

app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericEditTextPromptDialog.java

@@ -133,7 +133,7 @@ public class GenericEditTextPromptDialog extends DialogFragment implements View.
                     if (listener != null)
                         listener.onEmailCodePositiveBtnPressed(emailCode);
                 }else{
-                    emailCodeWrapper.setError(getString(R.string.enterCodeFromEmail));
+                    emailCodeWrapper.setError(getString(R.string.enterCodeFromEmail_text));
                 }
                 break;
             case R.id.btnLater:

app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java

@@ -2,7 +2,6 @@ package com.swifttech.remit.jmecustomer.features.aboutscreen.view;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.Html;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -52,7 +51,7 @@ public class AboutJMERemit extends BaseActivity implements AboutUsPresenterInter
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about_gme);
+        setContentView(R.layout.activity_about_jme);
 
         init();
     }

app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/gateway/AgentListV2Gateway.java

@@ -9,10 +9,6 @@ import okhttp3.ResponseBody;
 
 public class AgentListV2Gateway extends PrivilegedGateway implements AgentListV2InteractorInterface.AgentListV2GatewayInterface {
 
-
-
-
-
     @Override
     public Observable<ResponseBody> getBranchInfo(String auth) {
         return HttpClientV2.getInstance().getBranchInfo(auth);

app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/view/AgentListV2Activity.java

@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
 import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.agentslisting.adapter.AgentListV2RvAdapter;
 import com.swifttech.remit.jmecustomer.features.agentslisting.gateway.AgentListV2Gateway;
 import com.swifttech.remit.jmecustomer.features.agentslisting.model.AgentInfoModel;
@@ -37,7 +37,7 @@ public class AgentListV2Activity extends BaseActivity implements AgentListV2RvAd
     View iv_cancel;
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
     private AgentListV2RvAdapter agentListAdapter;
     private AgentListV2PresenterInterface presenter;
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/appupdate/AppUpdateActivity.java

@@ -24,7 +24,7 @@ public class AppUpdateActivity extends AppCompatActivity implements View.OnClick
     @BindView(R.id.not_now_view)
     View notNowView;
 
-    @BindView(R.id.gmeTextViewDetail)
+    @BindView(R.id.jmeTextViewDetail)
     TextView updateMessageBody;
 
     @BindView(R.id.btn_update)

app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestActivity.java

@@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModelProvider;
 
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.balancerequest.BalanceRequestViewModelFactory;
 import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter;
 import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface;
@@ -20,7 +20,7 @@ public class BalanceRequestActivity extends BaseActivity implements BalanceReque
 
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     private BalanceRequestPresenter viewModel;
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendActivity.java

@@ -8,7 +8,7 @@ import android.os.Bundle;
 
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.balancesend.BalanceSendViewModelFactory;
 import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter;
 import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenterInterface;
@@ -20,7 +20,7 @@ public class BalanceSendActivity extends BaseActivity implements BalanceSendPres
 
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
     private BalanceSendPresenter viewModel;
     private BalanceSendQRScanFragment balanceSendQrView;
     private FragmentManager fm;

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

@@ -142,7 +142,7 @@ public class ChangePassNPinViewModel extends BaseViewModel implements ChangePass
                 return true;
             } else {
                 this.currentPin = null;
-                changePassNPinLiveData.setCurrentPinInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.pin_empty_error)));
+                changePassNPinLiveData.setCurrentPinInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.pin_empty_error_txt)));
                 return false;
             }
 
@@ -155,7 +155,7 @@ public class ChangePassNPinViewModel extends BaseViewModel implements ChangePass
                 return true;
             } else {
                 this.newPin = null;
-                changePassNPinLiveData.setNewPinInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.pin_empty_error)));
+                changePassNPinLiveData.setNewPinInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.pin_empty_error_txt)));
                 return false;
             }
 
@@ -168,7 +168,7 @@ public class ChangePassNPinViewModel extends BaseViewModel implements ChangePass
                 return true;
             } else {
                 this.confirmNewPin = null;
-                changePassNPinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.pin_empty_error)));
+                changePassNPinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.pin_empty_error_txt)));
                 return false;
             }
 

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

@@ -215,7 +215,7 @@ public class ChangePassNPinActivity extends BaseActivity implements ChangePassNP
     private void performDefaultAction(Bundle savedInstanceState) {
         if(savedInstanceState==null)
         {
-            toolbarTitle.setText(R.string.changePassNPin);
+            toolbarTitle.setText(R.string.changePassNPin_text);
             iv_cancel.setVisibility(View.INVISIBLE);
         }
     }

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

@@ -24,7 +24,7 @@ import android.widget.TextView;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
 import com.swifttech.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper;
 import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog;
 import com.swifttech.remit.jmecustomer.features.exrate.adapter.PaymentModeRvAdapter;
@@ -51,7 +51,7 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
     RecyclerView paymentModeRv;
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     @BindView(R.id.countrySelectionSpinner)
     View countrySelectionSpinner;
@@ -96,8 +96,8 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
     Button exRateCalculateButton;
 
 
-    @BindView(R.id.gmeExratePC)
-    TextView gmeExratePC;
+    @BindView(R.id.jmeExratePC)
+    TextView jmeExratePC;
 
 
     private ExchangeRateCurrencyListingDialog countryListingDialog;
@@ -229,18 +229,18 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
             this.transferFeeTxtView.setVisibility(View.VISIBLE);
             ViewCompat.animate(this.transferFeeTxtView).translationY(0).setDuration(550).setInterpolator(this.interpolator).start();
 
-            gmeExratePC.setVisibility(View.INVISIBLE);
-            gmeExratePC.setAlpha(0f);
-            gmeExratePC.setText(formattedExRate);
-            gmeExratePC.setVisibility(View.INVISIBLE);
-            gmeExratePC.animate().alpha(1f).setDuration(500).withLayer().start();
+            jmeExratePC.setVisibility(View.INVISIBLE);
+            jmeExratePC.setAlpha(0f);
+            jmeExratePC.setText(formattedExRate);
+            jmeExratePC.setVisibility(View.INVISIBLE);
+            jmeExratePC.animate().alpha(1f).setDuration(500).withLayer().start();
 
 
 
         } else {
             transferFeeTxtView.setText(chargeAmount);
             exchangeRateTxtView.setText(exRate);
-            gmeExratePC.setText(formattedExRate);
+            jmeExratePC.setText(formattedExRate);
         }
     }
     @Override

app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java

@@ -78,8 +78,8 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
     DrawerLayout drawer_home;
     @BindView(R.id.btn_withdraw)
     TextView btn_withdraw;
-    @BindView(R.id.view_about_gme)
-    View about_gme;
+    @BindView(R.id.view_about_jme)
+    View about_jme;
     //    @BindView(R.id.view_support)
 //    View support;
     @BindView(R.id.view_setting)
@@ -203,7 +203,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         viewModel.getRequiredData();
     }
 
-    @OnClick({R.id.iv_help, R.id.iv_nav, R.id.btn_withdraw, R.id.view_about_gme, R.id.view_setting, R.id.view_logout, R.id.iv_close, R.id.iv_notification})
+    @OnClick({R.id.iv_help, R.id.iv_nav, R.id.btn_withdraw, R.id.view_about_jme, R.id.view_setting, R.id.view_logout, R.id.iv_close, R.id.iv_notification})
     public void onClick(View view) {
 
         switch (view.getId()) {
@@ -216,7 +216,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
                 showDrawer(true);
                 break;
 
-            case R.id.view_about_gme:
+            case R.id.view_about_jme:
                 startActivity(new Intent(this, AboutJMERemit.class));
                 break;
 
@@ -434,7 +434,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         TextView txtUserEmail = nav_drawer.findViewById(R.id.txt_user_email);
         TextView txtBalance = nav_drawer.findViewById(R.id.txt_balance);
         TextView txtContact = nav_drawer.findViewById(R.id.txt_contact);
-        TextView txtGmeControlNumber = nav_drawer.findViewById(R.id.tv_gme_control_no);
+        TextView txtGmeControlNumber = nav_drawer.findViewById(R.id.tv_jme_control_no);
         ImageView profileTextImageView = nav_drawer.findViewById(R.id.text_profile_image);
 
         setWalletNo(txtGmeControlNumber, walletNumber, bankName);
@@ -548,8 +548,8 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         if (bankName != null && bankName.length() > 1)
             bankName = " (" + bankName + ") ";
 
-        String gmeWalletNo = getString(R.string.jme_wallet_no_text);
-        controlNo.setText(Html.fromHtml(gmeWalletNo + "\n <b><font color='#ed1c24'> " + walletNumber + "</font></b>" + bankName));
+        String jmeWalletNo = getString(R.string.jme_wallet_no_text);
+        controlNo.setText(Html.fromHtml(jmeWalletNo + "\n <b><font color='#ed1c24'> " + walletNumber + "</font></b>" + bankName));
     }
 
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeMenuItemViewHolderV2.java

@@ -5,7 +5,7 @@ import android.view.View;
 import android.widget.ImageView;
 
 import com.swifttech.remit.jmecustomer.R;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -15,7 +15,7 @@ public class HomeMenuItemViewHolderV2 extends RecyclerView.ViewHolder {
     @BindView(R.id.image)
     ImageView imageView;
     @BindView(R.id.title)
-    GmeTextView titleView;
+    JmeTextView titleView;
 
     public HomeMenuItemViewHolderV2(final View itemView) {
         super(itemView);

app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/view/InboundRemitReceiptActivity.java

@@ -37,7 +37,7 @@ public class InboundRemitReceiptActivity extends BaseActivity implements Inbound
 
 
     @BindView(R.id.tv_control_no)
-    TextView tv_gme_control_no;
+    TextView tv_jme_control_no;
 
 
     @BindView(R.id.tv_transaction_date)
@@ -134,7 +134,7 @@ public class InboundRemitReceiptActivity extends BaseActivity implements Inbound
     @Override
     public void showReciept(TxnReceiptViewModel receiptViewModel) {
         tv_receiver_name2.setText(receiptViewModel.getSenderName());
-        tv_gme_control_no.setText(receiptViewModel.getTxnNo());
+        tv_jme_control_no.setText(receiptViewModel.getTxnNo());
         tv_transaction_date.setText(receiptViewModel.getTxnDate());
         tv_mobile_no.setText(receiptViewModel.getMobileNo());
         tv_total_sent_amount.setText(receiptViewModel.getTotalSendAmount());

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

@@ -18,8 +18,6 @@ import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.Exist
 import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeFragment;
 import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeViewLiveData;
 import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.personal.ExistingCustomerDetailViewLiveData;
-import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO;
-import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.PersonalInfoDTO;
 import com.swifttech.remit.jmecustomer.features.login.model.LoginV2DataApiResponse;
 import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface;
 import com.swifttech.remit.jmecustomer.utils.Constants;
@@ -732,7 +730,7 @@ public class ExistingKYCV3ViewModel extends BaseViewModel implements ExistingKYC
                     existingKycRelatedDataDTO.setPersonalInformation(new ExistingPersonalInfoDTO());
 
                 if (shouldPromptToInputAnswer(data)) {
-                    view.promptToInputAnswer(view.getContext().getResources().getString(R.string.specifyIdType), answer -> {
+                    view.promptToInputAnswer(view.getContext().getResources().getString(R.string.specifyIdType_text), answer -> {
                         existingKycRelatedDataDTO.getPersonalInformation().setIdType("");
                         existingKycRelatedDataDTO.getPersonalInformation().setOtherIdType(answer);
                         customerDetailLiveData.getIdTypeLiveData().postValue(new FormInputStateDTO<>(true, null, ExistingIDTextDTO.createFromUserAnswerInput(answer)));

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

@@ -17,8 +17,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
 import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
-import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog;
 import com.swifttech.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment;
 import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.ExistingKYCV3ViewModelFactory;
@@ -61,7 +60,7 @@ public class ExistingKYCV3Activity extends BaseActivity implements ExistingKYCV3
 
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     private ExistingCustomerDetailFragment existingCustomerDetailFragment;
     private ExistingKYCIDTypeFragment documentFragment;

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

@@ -986,7 +986,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
                     kycRelatedDataDTO.setPersonalInformation(new PersonalInfoDTO());
 
                 if (shouldPromptToInputAnswer(data)) {
-                    view.promptToInputAnswer(view.getContext().getResources().getString(R.string.specifyIdType), answer -> {
+                    view.promptToInputAnswer(view.getContext().getResources().getString(R.string.specifyIdType_text), answer -> {
                         kycRelatedDataDTO.getPersonalInformation().setIdType("");
                         kycRelatedDataDTO.getPersonalInformation().setOtherIdType(answer);
                         customerDetailLiveData.getIdTypeLiveData().postValue(new FormInputStateDTO<>(true, null, IDTextDTO.createFromUserAnswerInput(answer)));

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

@@ -18,7 +18,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
 import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog;
 import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog;
 import com.swifttech.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment;
@@ -60,7 +60,7 @@ public class KYCV3Activity extends BaseActivity implements KYCV3PresenterInterfa
     TextView page3TxtView;
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     private CustomerDetailFragment customerDetailFragment;
     private KYCIDTypeFragment documentFragment;

app/src/main/java/com/swifttech/remit/jmecustomer/features/login/view/LoginV2Activity.java

@@ -18,6 +18,7 @@ import com.facebook.shimmer.ShimmerFrameLayout;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.firebase.installations.FirebaseInstallations;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.jakewharton.rxbinding3.widget.RxTextView;
 import com.swifttech.remit.jmecustomer.BuildConfig;
 import com.swifttech.remit.jmecustomer.R;
@@ -86,15 +87,7 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene
     }
 
     private void registerFcmToken() {
-       /* FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(this, instanceIdResult -> {
-            String newToken = instanceIdResult.getToken();
-            if (BuildConfig.DEBUG) {
-                Log.d("Token", " : " + newToken);
-            }
-            presenter.setNewToken(newToken);
-        });
-*/
-        FirebaseInstallations.getInstance().getId()
+        FirebaseMessaging.getInstance().getToken()
                 .addOnCompleteListener(task -> {
                     if (task.isSuccessful()) {
                         String token = task.getResult();

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/ValidationRuleModel.java

@@ -175,7 +175,7 @@ public class ValidationRuleModel {
 //        return "Value must be less or equal to "+getMaxFieldLength()+" digits";
 //        return "Field size must be less or equal to " + getMaxFieldLength() + " characters in length";
 
-        String errorString = RemitApplication.getStringExtractor().getStringFromStringId(R.string.max_length_error_text);
+        String errorString = RemitApplication.getStringExtractor().getStringFromStringId(R.string.max_length_error_txt);
 
         return errorString.replace("xxx", getMaxFieldLength() + "");
     }

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java

@@ -243,7 +243,7 @@ public class RecipientDetailValidator {
             if (recipientInfo.getAgent() == null) {
                 view.getRecipientAddEditContractInterface().setSubmitButtonEnabled(false);
                 validationRuleModel.updateValidity(false);
-                view.getRecipientAddEditContractInterface().setErrorOnWidgetAccountNo(stringExtractor.getStringFromStringId(R.string.select_bank_first));
+                view.getRecipientAddEditContractInterface().setErrorOnWidgetAccountNo(stringExtractor.getStringFromStringId(R.string.select_bank_first_txt));
             } else if (error == null) {
                 recipientInfo.getAgent().setAccountNo(text);
                 view.getRecipientAddEditContractInterface().setErrorOnWidgetAccountNo(null);

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditFragment.java

@@ -388,7 +388,6 @@ public class BeneficiaryAddEditFragment  extends BaseFragment implements Recipie
         }
     }
 
-
     public class IDTypeSelectionClickListener implements View.OnClickListener {
 
         @Override

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientAddEditActivity.java

@@ -11,7 +11,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
 import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel;
 import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface;
 import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2;
@@ -31,7 +31,7 @@ public class RecipientAddEditActivity extends BaseActivity implements RecipientA
     public static String RECIPIENT_INFO_BUNDLE_KEY = "recipientInfoKey";
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     @BindView(R.id.iv_back)
     View iv_back;
@@ -177,9 +177,9 @@ public class RecipientAddEditActivity extends BaseActivity implements RecipientA
     public void onPageSelected(int position) {
         if(position==0){
             if(recipientToBeEdited!=null){
-                toolbarTitle.setText(getString(R.string.edit_recipient_text));
+                toolbarTitle.setText(getString(R.string.editBeneficiary_text));
             }else{
-                toolbarTitle.setText(getString(R.string.add_recipient_text));
+                toolbarTitle.setText(getString(R.string.addBeneficiary_text));
             }
 
         }else{

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListingActivity.java

@@ -13,7 +13,7 @@ import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration;
 import com.swifttech.remit.jmecustomer.common.customwidgets.TextWatcherAdapter;
 import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog;
@@ -69,7 +69,7 @@ public class RecipientListingActivity extends BaseActivity
 
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     @BindView(R.id.searchEditText)
     EditText searchEditText;

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

@@ -175,7 +175,7 @@ public class ValidationRuleModel {
 //        return "Value must be less or equal to "+getMaxFieldLength()+" digits";
 //        return "Field size must be less or equal to " + getMaxFieldLength() + " characters in length";
 
-        String errorString = RemitApplication.getStringExtractor().getStringFromStringId(R.string.max_length_error_text);
+        String errorString = RemitApplication.getStringExtractor().getStringFromStringId(R.string.max_length_error_txt);
 
         return errorString.replace("xxx", getMaxFieldLength() + "");
     }

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java

@@ -16,7 +16,6 @@ import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipi
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.AgentV3Model;
-import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.BranchV3Model;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.PaymentMethodV3Model;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.utils.EditTextConfigurationFactory;
@@ -264,7 +263,7 @@ public class RecipientDetailValidatorV3 {
             if (recipientInfo.getAgent() == null) {
                 view.getRecipientAddEditV3ContractInterface().setSubmitButtonEnabled(false);
                 validationRuleModel.updateValidity(false);
-                view.getRecipientAddEditV3ContractInterface().setErrorOnWidgetAccountNo(stringExtractor.getStringFromStringId(R.string.select_bank_first));
+                view.getRecipientAddEditV3ContractInterface().setErrorOnWidgetAccountNo(stringExtractor.getStringFromStringId(R.string.select_bank_first_txt));
             } else if (error == null) {
                 recipientInfo.getAgent().setAccountNo(text);
                 view.getRecipientAddEditV3ContractInterface().setErrorOnWidgetAccountNo(null);

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

@@ -1263,8 +1263,6 @@ public class BeneficiaryAddEditV3Fragment extends BaseFragment implements Recipi
                 relationMethodListingDialog.show(getActivity().getSupportFragmentManager(), this.getClass().getSimpleName());
         }
     }
-
-
     public class IDTypeSelectionClickListener implements View.OnClickListener {
 
         @Override

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

@@ -11,8 +11,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
 import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
-import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface;
 import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2;
@@ -32,7 +31,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     @BindView(R.id.iv_back)
     View iv_back;
@@ -176,9 +175,9 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
     public void onPageSelected(int position) {
         if(position==0){
             if(recipientToBeEdited!=null){
-                toolbarTitle.setText(getString(R.string.edit_recipient_text));
+                toolbarTitle.setText(getString(R.string.editBeneficiary_text));
             }else{
-                toolbarTitle.setText(getString(R.string.add_recipient_text));
+                toolbarTitle.setText(getString(R.string.addBeneficiary_text));
             }
 
         }else{

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java

@@ -17,7 +17,7 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration;
 import com.swifttech.remit.jmecustomer.common.customwidgets.TextWatcherAdapter;
 import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog;
@@ -77,7 +77,7 @@ public class RecipientListingV3Activity extends BaseActivity
 
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     @BindView(R.id.searchEditText)
     EditText searchEditText;

app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java

@@ -13,6 +13,7 @@ import androidx.lifecycle.ViewModelProvider;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.firebase.installations.FirebaseInstallations;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.jakewharton.rxbinding3.widget.RxTextView;
 import com.swifttech.remit.jmecustomer.BuildConfig;
 import com.swifttech.remit.jmecustomer.R;
@@ -91,7 +92,7 @@ public class ExistingCustomerRegistrationSubmitFragment extends BaseFragment {
 
     }
     private void registerFcmToken() {
-        FirebaseInstallations.getInstance().getId()
+        FirebaseMessaging.getInstance().getToken()
                 .addOnCompleteListener(task -> {
                     if (task.isSuccessful()) {
                         String token = task.getResult();

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

@@ -18,6 +18,7 @@ import androidx.transition.TransitionManager;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.firebase.installations.FirebaseInstallations;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.jakewharton.rxbinding3.widget.RxTextView;
 import com.swifttech.remit.jmecustomer.BuildConfig;
 import com.swifttech.remit.jmecustomer.R;
@@ -112,7 +113,6 @@ public class NewRegisterV2Activity extends BaseActivity implements NewRegisterV2
 
     public static void showRegisterActivity(Context context) {
         Intent intent = new Intent(context, NewRegisterV2Activity.class);
-
         context.startActivity(intent);
     }
 
@@ -130,7 +130,7 @@ public class NewRegisterV2Activity extends BaseActivity implements NewRegisterV2
     }
 
     private void registerFcmToken() {
-        FirebaseInstallations.getInstance().getId()
+        FirebaseMessaging.getInstance().getToken()
                 .addOnCompleteListener(task -> {
                     if (task.isSuccessful()) {
                         String token = task.getResult();

app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2ViewModel.java

@@ -226,7 +226,7 @@ public class RenewIdV2ViewModel extends BaseViewModel implements RenewIdV2Presen
                 renewUserIdLiveData.setUserIdLiveData(new FormInputStateDTO<>(true, null, null));
                 return true;
             } else {
-                renewUserIdLiveData.setUserIdLiveData(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidUserId), null));
+                renewUserIdLiveData.setUserIdLiveData(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidUserId_text), null));
                 return false;
             }
         }

app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/view/RenewIdActivity.java

@@ -21,12 +21,11 @@ import androidx.core.content.FileProvider;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.material.snackbar.Snackbar;
-import com.google.firebase.iid.FirebaseInstanceId;
 import com.jakewharton.rxbinding3.widget.RxTextView;
 import com.swifttech.remit.jmecustomer.BuildConfig;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO;
 import com.swifttech.remit.jmecustomer.common.view.MTextInputEditText;
 import com.swifttech.remit.jmecustomer.common.view.MTextInputLayout;
@@ -63,7 +62,7 @@ public class RenewIdActivity extends BaseActivity implements RenewIdV2PresenterI
     private static final int COMPRESS_QUALITY = 70;
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolBarTitle;
+    JmeTextView toolBarTitle;
 
     @BindView(R.id.iv_back)
     ImageView imageBack;
@@ -81,10 +80,10 @@ public class RenewIdActivity extends BaseActivity implements RenewIdV2PresenterI
     ImageView backIDImageview;
 
     @BindView(R.id.frontIdSampleTextView)
-    GmeTextView frontIdSampleTextView;
+    JmeTextView frontIdSampleTextView;
 
     @BindView(R.id.backIdSampleTextView)
-    GmeTextView backIdSampleTextView;
+    JmeTextView backIdSampleTextView;
 
     @BindView(R.id.userIdWrapper)
     MTextInputLayout userIdWrapper;

app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2Presenter.java

@@ -72,12 +72,12 @@ public class ResetPassV2Presenter extends BaseViewModel implements ResetPassV2Pr
 
                     @Override
                     public void onNext(Boolean aBoolean) {
-                        resetPassViewLiveData.setAllFormValidLiveData(new FormInputStateDTO(false, view.getContext().getString(R.string.invalidUserId)));
+                        resetPassViewLiveData.setAllFormValidLiveData(new FormInputStateDTO(false, view.getContext().getString(R.string.invalidUserId_text)));
                     }
 
                     @Override
                     public void onError(Throwable e) {
-                        resetPassViewLiveData.setAllFormValidLiveData(new FormInputStateDTO(false, view.getContext().getString(R.string.invalidUserId)));
+                        resetPassViewLiveData.setAllFormValidLiveData(new FormInputStateDTO(false, view.getContext().getString(R.string.invalidUserId_text)));
                     }
 
                     @Override

app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManager.java

@@ -78,9 +78,9 @@ public class RemitAuthManager {
             throw new IllegalArgumentException("Txn Param cannot be null");
 
         if (checkIfUserHasEnabledBiometric())
-            remitTxnParam.setGmeTxnAuthType(RemitTxnParam.GMETxnAuthType.BIOMETRIC);
+            remitTxnParam.setJmeTxnAuthType(RemitTxnParam.GMETxnAuthType.BIOMETRIC);
         else
-            remitTxnParam.setGmeTxnAuthType(RemitTxnParam.GMETxnAuthType.PASSWORD);
+            remitTxnParam.setJmeTxnAuthType(RemitTxnParam.GMETxnAuthType.PASSWORD);
         return this;
     }
 
@@ -247,7 +247,7 @@ public class RemitAuthManager {
 
 
     private void startTXNRelatedAuth() {
-        switch (remitTxnParam.getGmeTxnAuthType()) {
+        switch (remitTxnParam.getJmeTxnAuthType()) {
             case OTP:
                 showOTPTxnPrompt();
                 break;

app/src/main/java/com/swifttech/remit/jmecustomer/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java

@@ -39,10 +39,10 @@ public class RemitTxnPinPromptBottomSheetDialog extends BottomSheetDialogFragmen
 
 
     public static RemitTxnPinPromptBottomSheetDialog showPromptView(GMETxnOTPUserSubmitListener listener) {
-        RemitTxnPinPromptBottomSheetDialog gmeUserPasswordPromptBottomSheetDialog = new RemitTxnPinPromptBottomSheetDialog();
-        gmeUserPasswordPromptBottomSheetDialog.setListener(listener);
-        gmeUserPasswordPromptBottomSheetDialog.setCurrentCountDownValue(1234);
-        return gmeUserPasswordPromptBottomSheetDialog;
+        RemitTxnPinPromptBottomSheetDialog jmeUserPasswordPromptBottomSheetDialog = new RemitTxnPinPromptBottomSheetDialog();
+        jmeUserPasswordPromptBottomSheetDialog.setListener(listener);
+        jmeUserPasswordPromptBottomSheetDialog.setCurrentCountDownValue(1234);
+        return jmeUserPasswordPromptBottomSheetDialog;
     }
 
 
@@ -67,7 +67,7 @@ public class RemitTxnPinPromptBottomSheetDialog extends BottomSheetDialogFragmen
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.gme_txn_pin_prompt_modal, container, false);
+        View v = inflater.inflate(R.layout.jme_txn_pin_prompt_modal, container, false);
         ButterKnife.bind(this, v);
         init();
         performDefaultAction();

app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitTxnParam.java

@@ -3,7 +3,7 @@ package com.swifttech.remit.jmecustomer.features.security.model;
 public class RemitTxnParam
 {
     private String paymentSource;
-    private GMETxnAuthType gmeTxnAuthType;
+    private GMETxnAuthType jmeTxnAuthType;
     private boolean enableFallbackOption;
 
     public RemitTxnParam() {
@@ -30,14 +30,14 @@ public class RemitTxnParam
     public static RemitTxnParam forBiometricAuth()
     {
         RemitTxnParam remitTxnParam =new RemitTxnParam();
-        remitTxnParam.setGmeTxnAuthType(GMETxnAuthType.BIOMETRIC);
+        remitTxnParam.setJmeTxnAuthType(GMETxnAuthType.BIOMETRIC);
         return remitTxnParam;
     }
 
     public static RemitTxnParam forPasswordAuth()
     {
         RemitTxnParam remitTxnParam =new RemitTxnParam();
-        remitTxnParam.setGmeTxnAuthType(GMETxnAuthType.PASSWORD);
+        remitTxnParam.setJmeTxnAuthType(GMETxnAuthType.PASSWORD);
         return remitTxnParam;
     }
 
@@ -46,12 +46,12 @@ public class RemitTxnParam
         return paymentSource;
     }
 
-    public GMETxnAuthType getGmeTxnAuthType() {
-        return gmeTxnAuthType;
+    public GMETxnAuthType getJmeTxnAuthType() {
+        return jmeTxnAuthType;
     }
 
-    public void setGmeTxnAuthType(GMETxnAuthType gmeTxnAuthType) {
-        this.gmeTxnAuthType = gmeTxnAuthType;
+    public void setJmeTxnAuthType(GMETxnAuthType jmeTxnAuthType) {
+        this.jmeTxnAuthType = jmeTxnAuthType;
     }
 
     public enum GMETxnAuthType {

app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2ViewModel.java

@@ -15,7 +15,6 @@ import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalc
 import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationModel;
 import com.swifttech.remit.jmecustomer.features.home.model.UserInfoModelV2;
 import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO;
-import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.KYCRelatedDataDTO;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model;
 import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager;
 import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult;
@@ -42,14 +41,11 @@ import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.functions.Function;
 import io.reactivex.observers.DisposableObserver;
 import io.reactivex.schedulers.Schedulers;
 
@@ -623,7 +619,7 @@ public class SendMoneyV2ViewModel extends BaseViewModel implements SendMoneyV2Pr
 
         private boolean validatePurposeOfRemit(IDTextDTO data) {
             if(data==null){
-                ccidDetailViewLiveData.getPurposeOfRemittanceLiveData().setValue(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidPurposeOfRemittance), null));
+                ccidDetailViewLiveData.getPurposeOfRemittanceLiveData().setValue(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidPrpseOfRemitt_text), null));
                 return false;
             }
             if (shouldPromptToInputAnswer(data)) {
@@ -650,7 +646,7 @@ public class SendMoneyV2ViewModel extends BaseViewModel implements SendMoneyV2Pr
                 ccidDetailViewLiveData.getPurposeOfRemittanceLiveData().postValue(new FormInputStateDTO<>(true, null, null));
                 return true;
             } else {
-                ccidDetailViewLiveData.getPurposeOfRemittanceLiveData().setValue(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidPurposeOfRemittance), null));
+                ccidDetailViewLiveData.getPurposeOfRemittanceLiveData().setValue(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidPrpseOfRemitt_text), null));
                 return false;
             }
         }

app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java

@@ -22,7 +22,7 @@ import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2;
 import com.swifttech.remit.jmecustomer.features.sendmoney.gateway.SendMoneyTransactionCompleteV2Gateway;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel;
@@ -48,8 +48,8 @@ public class SendMoneyRequestSummaryActivity  extends BaseActivity implements Se
 
     @BindView(R.id.tv_payout_amount)
     TextView payoutAmountTextView;
-    @BindView(R.id.tv_gme_control_no)
-    TextView gmeControlNumberTextView;
+    @BindView(R.id.tv_jme_control_no)
+    TextView jmeControlNumberTextView;
     @BindView(R.id.transaction_date)
     TextView transactionDateTextView;
     @BindView(R.id.tv_receiver)
@@ -83,7 +83,7 @@ public class SendMoneyRequestSummaryActivity  extends BaseActivity implements Se
     @BindView(R.id.ammendmentOperationViewContainer)
     View ammendmentOperationViewContainer;
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
     @BindView(R.id.coupon_fee_layout)
     View coupon_fee_layout;
     @BindView(R.id.tv_coupon)
@@ -188,13 +188,13 @@ public class SendMoneyRequestSummaryActivity  extends BaseActivity implements Se
 
         payoutAmountTextView.setText(recieptData.getPayOutAmount());
         if (isRequestedBySendMoney) {
-            gmeControlNumberTextView.setVisibility(View.GONE);
+            jmeControlNumberTextView.setVisibility(View.GONE);
             txv_note.setVisibility(View.GONE);
 
         } else {
-            gmeControlNumberTextView.setText(getString(R.string.jmeControlNum_text)+String.format(" %s", recieptData.getControlNo()));
+            jmeControlNumberTextView.setText(getString(R.string.jmeControlNum_text)+String.format(" %s", recieptData.getControlNo()));
             controlId=recieptData.getControlNo();
-            gmeControlNumberTextView.setVisibility(View.VISIBLE);
+            jmeControlNumberTextView.setVisibility(View.VISIBLE);
             txv_note.setVisibility(View.VISIBLE);
         }
         transactionDateTextView.setText(recieptData.getTrnDate());

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

@@ -22,7 +22,7 @@ import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2;
 import com.swifttech.remit.jmecustomer.features.sendmoney.gateway.SendMoneyTransactionCompleteV2Gateway;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel;
@@ -50,8 +50,8 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
     TextView receiverNameTextView;
     @BindView(R.id.tv_payout_amount)
     TextView payoutAmountTextView;
-    @BindView(R.id.tv_gme_control_no)
-    TextView gmeControlNumberTextView;
+    @BindView(R.id.tv_jme_control_no)
+    TextView jmeControlNumberTextView;
     @BindView(R.id.transaction_date)
     TextView transactionDateTextView;
     @BindView(R.id.tv_receiver)
@@ -83,7 +83,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
     @BindView(R.id.ammendmentOperationViewContainer)
     View ammendmentOperationViewContainer;
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
     @BindView(R.id.coupon_fee_layout)
     View coupon_fee_layout;
     @BindView(R.id.tv_coupon)
@@ -178,10 +178,10 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
 
         payoutAmountTextView.setText(recieptData.getPAmount());
         if (isRequestedBySendMoney) {
-            gmeControlNumberTextView.setVisibility(View.GONE);
+            jmeControlNumberTextView.setVisibility(View.GONE);
 
         } else {
-            gmeControlNumberTextView.setText(getString(R.string.jmeControlNum_text)+String.format(" %s", recieptData.getControlNo()));
+            jmeControlNumberTextView.setText(getString(R.string.jmeControlNum_text)+String.format(" %s", recieptData.getControlNo()));
             controlId=recieptData.getControlNo();
         }
         transactionDateTextView.setText(recieptData.getTrnDate());

app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java

@@ -28,7 +28,7 @@ import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseFragment;
 import com.swifttech.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher;
 import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel;
@@ -58,7 +58,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
     TextView exchangeRateTxtView;
 
     @BindView(R.id.recepientCurrencyTextView)
-    GmeTextView recepientCurrencyTextView;
+    JmeTextView recepientCurrencyTextView;
 
     @BindView(R.id.countrySelectionSpinnerArrow)
     ImageView countrySelectionSpinnerArrow;

app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/ccdi/CCDISendMoneyFragment.java

@@ -227,7 +227,7 @@ public class CCDISendMoneyFragment extends BaseFragment implements View.OnClickL
             }
         }else{
             binding.receiverTransferReasonSelectionWrapper.setErrorEnabled(true);
-            binding.receiverTransferReasonSelectionWrapper.setError(getString(R.string.invalidPurposeOfRemittance));
+            binding.receiverTransferReasonSelectionWrapper.setError(getString(R.string.invalidPrpseOfRemitt_text));
         }
     }
 }

app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/LanguageSelectionItemViewHolder.java

@@ -6,7 +6,7 @@ import android.view.View;
 import android.widget.ImageView;
 
 import com.swifttech.remit.jmecustomer.R;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -17,7 +17,7 @@ public class LanguageSelectionItemViewHolder extends RecyclerView.ViewHolder {
     ImageView countryFlag;
 
     @BindView(R.id.countryLanguageText)
-    GmeTextView countryName;
+    JmeTextView countryName;
 
     public LanguageSelectionItemViewHolder(@NonNull View itemView) {
         super(itemView);

app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/PayoutModeSelectionItemViewHolder.java

@@ -5,14 +5,14 @@ import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import com.swifttech.remit.jmecustomer.R;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class PayoutModeSelectionItemViewHolder extends RecyclerView.ViewHolder {
     @BindView(R.id.paymentModeTitleTxt)
-    GmeTextView paymentModeTitle;
+    JmeTextView paymentModeTitle;
 
 
 

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

@@ -41,7 +41,7 @@ import androidx.transition.TransitionManager;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
 import com.swifttech.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper;
 import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog;
 import com.swifttech.remit.jmecustomer.features.exrate.gateway.ExchangeRateGateway;
@@ -125,14 +125,14 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
     TextView exchangeRateTxtView;
 
 
-    @BindView(R.id.gmeExratePC)
-    TextView gmeExratePC;
+    @BindView(R.id.jmeExratePC)
+    TextView jmeExratePC;
 
     @BindView(R.id.countrySelectionSpinner)
     View countrySelectionSpinner;
 
     @BindView(R.id.recepientCurrencyTextView)
-    GmeTextView recepientCurrencyTextView;
+    JmeTextView recepientCurrencyTextView;
 
     @BindView(R.id.countrySelectionSpinnerArrow)
     ImageView countrySelectionSpinnerArrow;
@@ -442,31 +442,31 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
         if (playAnimation) {
             transferFeeTxtView.setVisibility(View.INVISIBLE);
             exchangeRateTxtView.setVisibility(View.INVISIBLE);
-            gmeExratePC.setVisibility(View.INVISIBLE);
+            jmeExratePC.setVisibility(View.INVISIBLE);
 
             transferFeeTxtView.setAlpha(0f);
             exchangeRateTxtView.setAlpha(0f);
-            gmeExratePC.setAlpha(0f);
+            jmeExratePC.setAlpha(0f);
 
             transferFeeTxtView.setVisibility(View.VISIBLE);
             exchangeRateTxtView.setVisibility(View.VISIBLE);
-            gmeExratePC.setVisibility(View.GONE);
+            jmeExratePC.setVisibility(View.GONE);
 
 
             transferFeeTxtView.setText(chargeAmount);
             exchangeRateTxtView.setText(exRate);
-            gmeExratePC.setText(formattedExRate);
+            jmeExratePC.setText(formattedExRate);
 
             transferFeeTxtView.animate().alpha(1f).setDuration(500).withLayer().withStartAction(
                     () -> exchangeRateTxtView.animate().alpha(1f).setDuration(500).withLayer().start()
             ).start();
 
-            gmeExratePC.animate().alpha(1f).setDuration(500).withLayer().start();
+            jmeExratePC.animate().alpha(1f).setDuration(500).withLayer().start();
 
         } else {
             transferFeeTxtView.setText(chargeAmount);
             exchangeRateTxtView.setText(exRate);
-            gmeExratePC.setText(formattedExRate);
+            jmeExratePC.setText(formattedExRate);
 
         }
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAnimatedViewPagerFragment.java

@@ -28,7 +28,7 @@ public abstract class SplashAnimatedViewPagerFragment extends BaseFragment {
     public abstract String setupInfoText();
 
 
-    @BindView(R.id.gmeTextView2)
+    @BindView(R.id.jmeTextView2)
     TextView infoText;
     @BindView(R.id.avdMobileImage)
     ImageView avdImageView;

app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/RemitTransactionHistoryActivity.java

@@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelProvider;
 
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.transactionhistory.RemitTransactionViewModelFactory;
 import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter;
 import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2PresenterInterface;
@@ -22,7 +22,7 @@ import butterknife.OnClick;
 public class RemitTransactionHistoryActivity extends BaseActivity implements TransactionHistoryV2PresenterInterface.TransactionHistoryV2ContractInterface {
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     @BindView(R.id.iv_back)
     ImageView ivBack;

app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/TransactionItemViewHolder.java

@@ -5,7 +5,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.swifttech.remit.jmecustomer.R;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -13,15 +13,15 @@ import butterknife.ButterKnife;
 public class TransactionItemViewHolder extends RecyclerView.ViewHolder{
 
     @BindView(R.id.tv_date)
-    GmeTextView tvDate;
-    @BindView(R.id.tv_gme_control_no)
-    GmeTextView tv_gme_control_no;
+    JmeTextView tvDate;
+    @BindView(R.id.tv_jme_control_no)
+    JmeTextView tv_jme_control_no;
     @BindView(R.id.tv_user_id)
-    GmeTextView tv_user_id;
+    JmeTextView tv_user_id;
     @BindView(R.id.tv_amount)
-    GmeTextView tvAmount;
+    JmeTextView tvAmount;
     @BindView(R.id.tv_payment_mode)
-    GmeTextView tv_payment_mode;
+    JmeTextView tv_payment_mode;
     @BindView(R.id.tv_status)
     TextView tvStatus;
     @BindView(R.id.tv_bank_name)
@@ -38,9 +38,9 @@ public class TransactionItemViewHolder extends RecyclerView.ViewHolder{
         tvDate.setText(date);
     }
 
-    public void setGMEControlNo(String  status)
+    public void setJMEControlNo(String  status)
     {
-        tv_gme_control_no.setText(status);
+        tv_jme_control_no.setText(status);
     }
 
     public void setAmount(String amount)

app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java

@@ -41,7 +41,7 @@ public class InternationalInboundTransactionHistoryRVAdapter extends RecyclerVie
 
         holder.showPayoutAgent(false);
 
-        holder.setGMEControlNo(transactionItem.getAccountNo());
+        holder.setJMEControlNo(transactionItem.getAccountNo());
         holder.setStatus(transactionItem.getStatus().toUpperCase());
         holder.setUserId(transactionItem.getSenderName().toUpperCase());
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalOutboundTransactionHistoryRVAdapter.java

@@ -47,7 +47,7 @@ public class InternationalOutboundTransactionHistoryRVAdapter extends RecyclerVi
 
         holder.showPayoutAgent(hasAgent);
 
-        holder.setGMEControlNo(transactionItem.getControlNo());
+        holder.setJMEControlNo(transactionItem.getControlNo());
         holder.setStatus(transactionItem.getPayStatus().toUpperCase());
         holder.setUserId(transactionItem.getUser().toUpperCase().toUpperCase());
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java

@@ -3,6 +3,7 @@ package com.swifttech.remit.jmecustomer.features.userprofile.view;
 import android.os.Bundle;
 
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.userprofile.UserProfileViewModelFactory;
 import com.swifttech.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterInterface;
 import com.swifttech.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterV2;
@@ -15,7 +16,6 @@ import android.view.View;
 import android.widget.ImageView;
 
 import com.swifttech.remit.jmecustomer.R;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
 import com.swifttech.remit.jmecustomer.features.userprofile.model.UserProfile;
 import com.swifttech.remit.jmecustomer.utils.Utils;
 
@@ -28,29 +28,29 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente
 
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
     @BindView(R.id.iv_cancel)
-    GmeTextView ivCancel;
+    JmeTextView ivCancel;
     @BindView(R.id.profile_image)
     CircleImageView profileImage;
     @BindView(R.id.text_profile_image)
     ImageView textProfileImage;
 
     @BindView(R.id.tv_user_name)
-    GmeTextView tvUserName;
+    JmeTextView tvUserName;
     @BindView(R.id.tv_phone_number)
-    GmeTextView tvPhoneNumber;
+    JmeTextView tvPhoneNumber;
     @BindView(R.id.tv_email)
-    GmeTextView tvEmail;
+    JmeTextView tvEmail;
     @BindView(R.id.tv_wallet_no)
-    GmeTextView tvBalance;
+    JmeTextView tvBalance;
     @BindView(R.id.tv_wallet_number)
-    GmeTextView tvWalletNumber;
+    JmeTextView tvWalletNumber;
 
     @BindView(R.id.tv_yearly_remaining)
-    GmeTextView tv_yearly_remaining;
+    JmeTextView tv_yearly_remaining;
     @BindView(R.id.tv_referral)
-    GmeTextView tv_referral;
+    JmeTextView tv_referral;
     private UserProfilePresenterV2 viewModel;
 
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/view/WalletStatementItemViewHolder.java

@@ -5,7 +5,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.swifttech.remit.jmecustomer.R;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -13,11 +13,11 @@ import butterknife.ButterKnife;
 public class WalletStatementItemViewHolder extends RecyclerView.ViewHolder {
 
     @BindView(R.id.tv_date)
-    GmeTextView tvDate;
+    JmeTextView tvDate;
     @BindView(R.id.tv_particular)
-    GmeTextView tv_particular;
+    JmeTextView tv_particular;
     @BindView(R.id.tv_amount)
-    GmeTextView tvAmount;
+    JmeTextView tvAmount;
     @BindView(R.id.tv_wallet_status)
     TextView tv_wallet_status;
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/WebBrowserFragmentV2.java

@@ -60,7 +60,7 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment implements View.
     GmeButton btnProceed;
     @BindView(R.id.llBottom)
     LinearLayout llBottom;
-    private GMEWebViewClient gmeWebViewClient;
+    private GMEWebViewClient jmeWebViewClient;
     private RemitChromeClient remitChromeClient;
     private WebRequestModel webRequestModel;
     private ValueCallback<Uri[]> mFilePathCallback;
@@ -125,9 +125,9 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment implements View.
 
 
     private void setupWebView() {
-        gmeWebViewClient = new GMEWebViewClient();
+        jmeWebViewClient = new GMEWebViewClient();
         remitChromeClient = new RemitChromeClient();
-        webView.setWebViewClient(gmeWebViewClient);
+        webView.setWebViewClient(jmeWebViewClient);
         webView.setWebChromeClient(remitChromeClient);
 
         webView.getSettings().setSaveFormData(false);

app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/WebBrowserV2Activity.java

@@ -33,10 +33,10 @@ import androidx.core.widget.NestedScrollView;
 
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.common.customwidgets.GmeButton;
+import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
 import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog;
-import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView;
 import com.swifttech.remit.jmecustomer.utils.https.HTTPConstants;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 
@@ -49,7 +49,7 @@ public abstract class  WebBrowserV2Activity extends BaseActivity implements View
     protected  View ivBack;
 
     @BindView(R.id.toolbar_title)
-    GmeTextView toolbarTitle;
+    JmeTextView toolbarTitle;
 
     @BindView(R.id.webView)
     WebView webView;

app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawActivity.java

@@ -29,8 +29,6 @@ public class WithdrawActivity extends BaseActivity implements WithdrawPresenterI
     @BindView(R.id.withdrawViewPager)
     ViewPager viewPager;
 
-
-
     @BindView(R.id.toolbar_title)
     TextView toolbarTitle;
 

app/src/main/java/com/swifttech/remit/jmecustomer/utils/Utils.java

@@ -169,8 +169,8 @@ public class Utils {
             imgStatus.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.alert));
         } else if (type.equals(INTERNET)) {
             imgStatus.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.no_internet));
-            dialogTitle.setText(context.getString(R.string.no_internet_title));
-            dialogDescription.setText(context.getString(R.string.no_internet_message));
+            dialogTitle.setText(context.getString(R.string.no_internet_title_txt));
+            dialogDescription.setText(context.getString(R.string.no_internet_message_txt));
         } else if (type.equals(SERVER_ERROR)) {
             imgStatus.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.server_errror));
         } else {

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

@@ -1,7 +1,7 @@
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     xmlns:tools="http://schemas.android.com/tools"
-    android:drawable="@drawable/vd_gme_loader"
+    android:drawable="@drawable/vd_jme_loader"
     tools:ignore="NewApi">
     <target android:name="outer_circle">
         <aapt:attr name="android:animation">

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/background_gray"
-    android:orientation="vertical">
-    <include layout="@layout/layout_sendmoney_toolbar" />
-    <LinearLayout
-        android:id="@+id/addReceipient"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/_60sdp"
-        android:layout_marginBottom="@dimen/_4sdp"
-        android:layout_marginLeft="@dimen/_8sdp"
-        android:layout_marginRight="@dimen/_8sdp"
-        android:layout_marginTop="@dimen/_6sdp"
-        android:background="@drawable/ic_rounded_white"
-        android:clickable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/iv_passport_id"
-            android:layout_width="@dimen/_44sdp"
-            android:layout_height="@dimen/_44sdp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/_15sdp"
-            android:scaleType="centerCrop"
-            app:srcCompat="@drawable/icv_recipient_image" />
-
-        <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
-            android:id="@+id/userName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/_6sdp"
-            android:layout_toRightOf="@id/iv_passport_id"
-            android:padding="@dimen/_1sdp"
-            android:paddingStart="@dimen/_4sdp"
-            android:paddingEnd="@dimen/_4sdp"
-            android:text="@string/new_recipient_text"
-            android:textColor="@color/darkgray"
-            android:textSize="@dimen/_13ssp" />
-    </LinearLayout>
-    <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
-        android:id="@+id/recipientHintTextView"
-        android:visibility="invisible"
-        android:padding="@dimen/_8sdp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@null"
-        android:enabled="false"
-        android:gravity="center"
-        android:hint="@string/edit_delete_hint_android_text"
-        android:imeActionLabel="Done"
-        android:inputType="textMultiLine"
-        android:textSize="14sp"/>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recipientListRv"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:clipToPadding="false"/>
-
-</LinearLayout>

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

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:id="@+id/coordinatorRootView"
-    >
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        app:layout_behavior="com.swifttech.remit.jmecustomer.common.customwidgets.CustomAppBarLayoutBehavior">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsingToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
-            <LinearLayout
-                android:id="@+id/addReceipient"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/_60sdp"
-                android:layout_marginLeft="@dimen/_8sdp"
-                android:layout_marginRight="@dimen/_8sdp"
-                android:layout_marginTop="@dimen/_8sdp"
-                android:layout_marginBottom="@dimen/_4sdp"
-                android:background="@drawable/ic_rounded_white"
-                android:clickable="true"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/iv_passport_id"
-                    android:layout_width="@dimen/_44sdp"
-                    android:layout_height="@dimen/_44sdp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="@dimen/_15sdp"
-                    android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/icv_recipient_image" />
-
-                <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
-                    android:id="@+id/userName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="@dimen/_6sdp"
-                    android:layout_toRightOf="@id/iv_passport_id"
-                    android:padding="@dimen/_1sdp"
-                    android:paddingStart="@dimen/_4sdp"
-                    android:paddingEnd="@dimen/_4sdp"
-                    android:text="@string/new_recipient_text"
-                    android:textColor="@color/darkgray"
-                    android:textSize="@dimen/_13ssp" />
-            </LinearLayout>
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/recipientHintTextViewContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:contentInsetEnd="0dp"
-            android:contentInsetLeft="0dp"
-            android:contentInsetRight="0dp"
-            android:contentInsetStart="0dp"
-            app:contentInsetEnd="0dp"
-            app:contentInsetLeft="0dp"
-            app:contentInsetRight="0dp"
-            app:contentInsetStart="0dp"
-            app:layout_collapseMode="pin">
-            <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
-                android:id="@+id/recipientHintTextView"
-                android:padding="@dimen/_8sdp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@null"
-                android:enabled="false"
-                android:gravity="center"
-                android:hint="@string/edit_delete_hint_android_text"
-                android:imeActionLabel="Done"
-                android:inputType="textMultiLine"
-                android:textSize="14sp"/>
-        </androidx.appcompat.widget.Toolbar>
-
-
-    </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:id="@+id/recipientListRv"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"/>
-
-
-
-
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -45,7 +45,7 @@
             android:orientation="vertical">
 
 
-            <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
+            <com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
                 android:layout_marginTop="32dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
                 android:text="@string/about_me_description_text"
                 android:textSize="@dimen/text_small" />
 
-            <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
+            <com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
                 style="@style/MFormLink"
                 android:id="@+id/txvTermsAndCondition"
                 android:layout_width="wrap_content"
@@ -66,7 +66,7 @@
                 android:layout_marginBottom="@dimen/_5sdp"
                 />
 
-            <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
+            <com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
                 style="@style/MFormLink"
                 android:id="@+id/txvPrivacyPolicy"
                 android:layout_width="wrap_content"
@@ -89,7 +89,7 @@
                 android:paddingBottom="15dp"
                 android:paddingTop="13dp">
 
-                <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
+                <com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/app_version_text"
@@ -101,7 +101,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
+                    <com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
                         android:id="@+id/txt_app_version"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
                         android:text=""
                         android:textSize="@dimen/text_small" />
 
-                    <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
+                    <com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
                         android:id="@+id/btn_check_update"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -136,7 +136,7 @@
                 android:paddingBottom="20dp"
                 android:paddingTop="11dp">
 
-                <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
+                <com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="11dp"