ekyc changes and minor ui changes

app/src/main/java/com/remit/jmecustomer/features/homeV3/adpaters/IndicatorAdapter.kt

@@ -0,0 +1,45 @@
+package com.remit.jmecustomer.features.homeV3.adpaters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.remit.jmecustomer.R
+
+
+class IndicatorAdapter(private val items: List<Any>) :
+    RecyclerView.Adapter<IndicatorAdapter.IndicatorViewHolder>() {
+    private var selectedPosition = 0
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): IndicatorViewHolder {
+        val itemView: View =
+            LayoutInflater.from(parent.context).inflate(R.layout.item_indicator, parent, false)
+        return IndicatorViewHolder(itemView)
+    }
+
+    override fun onBindViewHolder(holder: IndicatorViewHolder, position: Int) {
+        // Set indicator appearance based on selected/unselected state
+        if (position == selectedPosition) {
+            holder.viewIndicator.setBackgroundResource(R.drawable.circle_black_bullet)
+        } else {
+            holder.viewIndicator.setBackgroundResource(R.drawable.grey_border_dark_indicator)
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return items.size
+    }
+
+    fun setSelectedPosition(selectedPosition: Int) {
+        this.selectedPosition = selectedPosition
+        notifyDataSetChanged()
+    }
+
+    inner class IndicatorViewHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView) {
+        var viewIndicator: View
+
+        init {
+            viewIndicator = itemView.findViewById<View>(R.id.viewIndicator)
+        }
+    }
+}

app/src/main/java/com/remit/jmecustomer/features/homeV3/adpaters/SendTypeAdapter.kt

@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.remit.jmecustomer.R
 import com.remit.jmecustomer.databinding.RowSendTypeBinding
-import com.remit.jmecustomer.features.exrate.adapter.PaymentModeRvAdapter
 import com.remit.jmecustomer.features.exrate.model.PaymentModeMapper
 import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode
 
@@ -33,7 +32,7 @@ class SendTypeAdapter(private var items: MutableList<PaymentMode> , listener : O
                     ?.let { binding.ivText.setTextColor(it) }
             }
             binding.rowMain.setOnClickListener {
-                mListener?.onPaymentModeSelected(item)
+                mListener?.onPaymentModeSelected(item , position)
                 item.isSelected = true
                 notifyDataSetChanged()
 
@@ -72,6 +71,6 @@ class SendTypeAdapter(private var items: MutableList<PaymentMode> , listener : O
     }
 
     interface OnPaymentModeSelectionListener {
-        fun onPaymentModeSelected(selectedData: PaymentMode?)
+        fun onPaymentModeSelected(selectedData: PaymentMode? , position: Int)
     }
 }

app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt

@@ -143,12 +143,12 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
 
         // Add tabs with icons
         val tab1: TabLayout.Tab =
-            binding.tabLayout.newTab().setIcon(R.drawable.ic_home_selected).setText("Home")
+            binding.tabLayout.newTab().setIcon(R.drawable.ic_home_selected).setText(getString(R.string.home_text))
         val tab2: TabLayout.Tab =
             binding.tabLayout.newTab().setIcon(R.drawable.ic_transfers_unselected)
-                .setText("Receiver")
+                .setText(getString(R.string.receiver_text))
         val tab3: TabLayout.Tab =
-            binding.tabLayout.newTab().setIcon(R.drawable.profile_unselected).setText("Account")
+            binding.tabLayout.newTab().setIcon(R.drawable.profile_unselected).setText(getString(R.string.profile_text))
 
 
 // Add tabs to the TabLayout

app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt

@@ -40,7 +40,6 @@ import com.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher
 import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog
 import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog
 import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog.GenericEditTextPromptListener
-import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog
 import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper
 import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog
 import com.remit.jmecustomer.databinding.FragmentHomeNewBinding
@@ -59,6 +58,7 @@ import com.remit.jmecustomer.features.home.model.HomeViewRelatedDTOV2
 import com.remit.jmecustomer.features.home.presenter.HomeViewModel
 import com.remit.jmecustomer.features.home.view.notifications.*
 import com.remit.jmecustomer.features.homeV3.adpaters.BannerViewAdapter
+import com.remit.jmecustomer.features.homeV3.adpaters.IndicatorAdapter
 import com.remit.jmecustomer.features.homeV3.adpaters.SendTypeAdapter
 import com.remit.jmecustomer.features.myTransfers.view.MyTransfersFragment
 import com.remit.jmecustomer.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel
@@ -116,6 +116,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
 
     private val paymentModeRvAdapter: PaymentModeRvAdapter? = null
     private var sendTypeAdapter: SendTypeAdapter? = null
+    private var indicatorAdapter: IndicatorAdapter? = null
     private var viewModel: UserProfilePresenterV2? = null
     private var homeViewModel: HomeViewModel? = null
 
@@ -147,7 +148,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
             if (binding.swiperefresh.isRefreshing) {
                 binding.swiperefresh.isRefreshing = false
             }
-            Glide.with(context!!)
+            Glide.with(requireContext())
                 .load(homeViewRelatedDTOV2.profileImage)
                 .apply(options.signature(ObjectKey(System.currentTimeMillis())))
                 .fitCenter().apply(options.circleCrop())
@@ -203,7 +204,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
         sendTypeAdapter = SendTypeAdapter(list, this)
         binding.rvSendType.adapter = sendTypeAdapter
         viewModel!!.subscribeToUserProfileInfoFetchEvent().observe(
-            this
+            viewLifecycleOwner
         ) { body: UserProfile? ->
 //            this.displayUserInfo(
 //                body!!
@@ -376,6 +377,11 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
     ) {
         serviceAvailable[0].isSelected = true
         sendTypeAdapter?.setData(serviceAvailable)
+        indicatorAdapter = IndicatorAdapter(serviceAvailable)
+        indicatorAdapter?.setSelectedPosition(0)
+        val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
+        binding.indicatorSendMethod.layoutManager = layoutManager
+        binding.indicatorSendMethod.adapter = indicatorAdapter
 //        sendTypeAdapter.setSelectedItem(selectedIndex)
     }
 
@@ -430,6 +436,11 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
         } catch (exception: java.lang.Exception) {
             exception.printStackTrace()
         }
+
+        Handler().postDelayed(Runnable {
+            Constants.ENTERED_SENDING_AMOUNT =
+                Utils.removeCommaFromAmount(binding.sendAmountEdTxt.text.toString())
+        }, 500)
     }
 
     override fun showExrateView(task: Runnable?) {
@@ -452,8 +463,9 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
 //        }
     }
 
-    override fun onPaymentModeSelected(selectedData: PaymentMode?) {
+    override fun onPaymentModeSelected(selectedData: PaymentMode?, position: Int) {
         presenter.setPaymentMode(selectedData)
+        indicatorAdapter?.setSelectedPosition(position)
     }
 
     override fun onStart() {
@@ -468,6 +480,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
         binding.agreeButton.setOnClickListener(this)
         binding.linUploadSlip.setOnClickListener(this)
         binding.relSwitch.setOnClickListener(this)
+        binding.clCountry.setOnClickListener(this)
     }
 
     override fun onEditorAction(v: TextView, actionId: Int, event: KeyEvent?): Boolean {

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

@@ -245,15 +245,51 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
         jsonObject.addProperty("RegistrationType", registrationType);
         jsonObject.addProperty("Code", code);
         compositeDisposable.add(
-                this.gateway.getKycSettings(gateway.getAuth(), jsonObject)
+                this.gateway.saveKycSettings(gateway.getAuth(), jsonObject)
                         .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .doFinally(() -> view.showProgressBar(false, ""))
-                        .subscribeWith(null)
+                        .subscribeWith(new SaveKycSettingObserver())
         );
     }
 
+
+    public class SaveKycSettingObserver extends GenericApiObserverResponseV2<KycSettingData> {
+
+        @Override
+        protected Type getDataType() {
+            return TypeToken.getParameterized(KycSettingData.class).getType();
+        }
+
+        @Override
+        protected void onSuccess(GenericResponseDataModel<KycSettingData> t) {
+
+            if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
+
+            } else
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
+        }
+
+        @Override
+        public void onFailed(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+        }
+
+        @Override
+        protected void onConnectionNotEstablished(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+
+        }
+
+        @Override
+        protected void unauthorizedAccess(String message) {
+            gateway.clearAllUserData();
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout());
+
+        }
+    }
+
     public class KycSettingObserver extends GenericApiObserverResponseV2<KycSettingData> {
 
         @Override
@@ -851,7 +887,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
 
     @Override
     public void sendFullKYCDataUpdate() {
-        postKYCFormToServer(validator.getKycRelatedDataDTO(), validator.getKycRelatedDataDTO().getForm1PostData(gateway.getUserID(), trustDockId), view::showDocumentDetailForm);
+        postKYCFormToServer(validator.getKycRelatedDataDTO(), validator.getKycRelatedDataDTO().getForm1PostData(gateway.getUserID(), trustDockId), view::showTermsAndCondition);
     }
 
     private void postKYCFormToServer(KYCRelatedDataDTO kycRelatedDataDTO, KYCRequestDataDTO requestDataDTO, Runnable endWithTask) {

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

@@ -20,7 +20,7 @@ import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragme
 import com.remit.jmecustomer.features.kyc.newCustomer.model.kycSetting.Option;
 import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface;
 import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel;
-import com.remit.jmecustomer.features.newkyc.newCustomer.view.choose.ChooseKycFragment;
+import com.remit.jmecustomer.features.kyc.newCustomer.view.choose.ChooseKycFragment;
 import com.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeFragment;
 import com.remit.jmecustomer.features.kyc.newCustomer.view.personal.CustomerDetailFragment;
 import com.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition.NewKycTermsAndConditionFragment;
@@ -281,7 +281,7 @@ public class KYCV3Activity extends BaseActivity implements KYCV3PresenterInterfa
 
     @Override
     public void showTermsAndCondition() {
-        kycFormViewPager.setCurrentItem(2);
+        kycFormViewPager.setCurrentItem(3);
     }
 
     @Override

app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/choose/ChooseKycFragment.kt

@@ -34,6 +34,7 @@ class ChooseKycFragment(private var options: List<Option>? = null) : BaseFragmen
         val layoutManagerVertical = LinearLayoutManager(requireActivity())
         binding.rvChooseKyc.layoutManager = layoutManagerVertical
         kycv3ViewModel = ViewModelProvider(requireActivity())[KYCV3ViewModel::class.java]
+        options?.get(0)?.isSelected = true
         val adapter = KycTypeAdapter(options!!)
         binding.rvChooseKyc.adapter = adapter
         adapter.setOnItemClickListener(object : KycTypeAdapter.ItemClickListener {

app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java

@@ -40,6 +40,7 @@ import com.google.android.material.snackbar.Snackbar;
 import com.remit.jmecustomer.RemitApplication;
 import com.remit.jmecustomer.base.PrefKeys;
 import com.remit.jmecustomer.features.homeV3.view.HomeActivityV3;
+import com.remit.jmecustomer.features.kyc.newCustomer.model.kycSetting.Option;
 import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface;
 import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel;
 import com.remit.jmecustomer.BuildConfig;
@@ -812,16 +813,15 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
     }
 
     public void onFragmentedSelection() {
-        if (kycv3ViewModel.getKycSelectedOption().getCode().equals("MANUAL_KYC")) {
+        if (kycv3ViewModel.getKycSelectedOption().getType().equals("MKYC")) {
             subscribeToIdTypeImageLiveData(getIDTypeViewBinding(), kycv3ViewModel.getBackAdditionalRequired());
             if (kycv3ViewModel.getBackAdditionalRequired()) {
                 additionalIDBackImageViewContainer.setVisibility(View.VISIBLE);
             } else {
                 additionalIDBackImageViewContainer.setVisibility(View.GONE);
             }
-            btnSubmit3.setEnabled(false);
         }
-        if (kycv3ViewModel.getKycSelectedOption().getCode().equals("MANUAL_KYC")) {
+        if (kycv3ViewModel.getKycSelectedOption().getCode().equals("MKYC")) {
             rootView.setVisibility(View.VISIBLE);
             ekycView.setVisibility(View.GONE);
         } else {
@@ -912,23 +912,33 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
         String selectedNationality = RemitApplication.getStorage().getString(PrefKeys.SELECTED_NATIONALITY, "");
         String useNFC = RemitApplication.getStorage().getString(PrefKeys.USE_NFC, "");
 
-        List plan = null;
-        if (retryNFC || useNFC.equalsIgnoreCase("N")) {
-            plan = CollectionsKt.listOf(new TrustdockPlan(BuildConfig.ResidenceCardWithoutNFCPlanId, (String) null, (List) null));
-            //plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan("9390019a-d41f-42a8-b044-0f41a9825847", (String) null, (List) null), new TrustdockPlan("ee46f7fd-3988-49cd-a972-1056e498302f", "9390019a-d41f-42a8-b044-0f41a9825847", (List) null)});
-        } else if (selectedNationality.equalsIgnoreCase(FOREIGNER_TYPE)) {
-            //plan = CollectionsKt.listOf(new TrustdockPlan("b1da18ee-fabe-42f0-b7f6-0d375e1f505d", (String) null, (List) null));
-            plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan(BuildConfig.ResidenceCardWithNFCPlanId, (String) null, (List) null), new TrustdockPlan(BuildConfig.SelfieVerificationPlanId, BuildConfig.ResidenceCardWithNFCPlanId, (List) null)});
-        }
-//        else if (selectedNationality.equalsIgnoreCase("0")){
-//            plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan("e103a0db-ae3c-4eda-8dcb-6fff06cdfcc9", (String) null, (List) null), new TrustdockPlan("ee46f7fd-3988-49cd-a972-1056e498302f", "e103a0db-ae3c-4eda-8dcb-6fff06cdfcc9", (List) null)});
+//        List plan = null;
+//        if (kycv3ViewModel.getKycSelectedOption().getSelfieRequired().equalsIgnoreCase("N")) {
+//            plan = CollectionsKt.listOf(new TrustdockPlan(BuildConfig.ResidenceCardWithoutNFCPlanId, (String) null, (List) null));
+//            //plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan("9390019a-d41f-42a8-b044-0f41a9825847", (String) null, (List) null), new TrustdockPlan("ee46f7fd-3988-49cd-a972-1056e498302f", "9390019a-d41f-42a8-b044-0f41a9825847", (List) null)});
+//        } else if (selectedNationality.equalsIgnoreCase(FOREIGNER_TYPE)) {
+//            //plan = CollectionsKt.listOf(new TrustdockPlan("b1da18ee-fabe-42f0-b7f6-0d375e1f505d", (String) null, (List) null));
+//            plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan(BuildConfig.ResidenceCardWithNFCPlanId, (String) null, (List) null), new TrustdockPlan(BuildConfig.SelfieVerificationPlanId, BuildConfig.ResidenceCardWithNFCPlanId, (List) null)});
 //        }
-        else {
-            //plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan("e103a0db-ae3c-4eda-8dcb-6fff06cdfcc9", (String) null, (List) null), new TrustdockPlan("ee46f7fd-3988-49cd-a972-1056e498302f", "e103a0db-ae3c-4eda-8dcb-6fff06cdfcc9", (List) null)});
-            //plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan("f8d1f271-7c95-43bf-bdf8-f84ebe96671d", (String) null, (List) null), new TrustdockPlan("ee46f7fd-3988-49cd-a972-1056e498302f", "f8d1f271-7c95-43bf-bdf8-f84ebe96671d", (List) null)});
-            plan = CollectionsKt.listOf(new TrustdockPlan(BuildConfig.ResidenceCardWithoutNFCPlanId, (String) null, (List) null));
+////        else if (selectedNationality.equalsIgnoreCase("0")){
+////            plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan("e103a0db-ae3c-4eda-8dcb-6fff06cdfcc9", (String) null, (List) null), new TrustdockPlan("ee46f7fd-3988-49cd-a972-1056e498302f", "e103a0db-ae3c-4eda-8dcb-6fff06cdfcc9", (List) null)});
+////        }
+//        else {
+//            //plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan("e103a0db-ae3c-4eda-8dcb-6fff06cdfcc9", (String) null, (List) null), new TrustdockPlan("ee46f7fd-3988-49cd-a972-1056e498302f", "e103a0db-ae3c-4eda-8dcb-6fff06cdfcc9", (List) null)});
+//            //plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan("f8d1f271-7c95-43bf-bdf8-f84ebe96671d", (String) null, (List) null), new TrustdockPlan("ee46f7fd-3988-49cd-a972-1056e498302f", "f8d1f271-7c95-43bf-bdf8-f84ebe96671d", (List) null)});
+//            plan = CollectionsKt.listOf(new TrustdockPlan(BuildConfig.ResidenceCardWithoutNFCPlanId, (String) null, (List) null));
+//        }
+
+
+        List plan = null;
+        Option selectedOption = kycv3ViewModel.getKycSelectedOption();
+        if (selectedOption.getSelfieRequired().equalsIgnoreCase("N")) {
+            plan = CollectionsKt.listOf(new TrustdockPlan(selectedOption.getPlanId(), (String) null, (List) null));
+        } else {
+            plan = CollectionsKt.listOf(new TrustdockPlan[]{new TrustdockPlan(selectedOption.getPlanId(), (String) null, (List) null), new TrustdockPlan(selectedOption.getSelfiePlanId(), selectedOption.getPlanId(), (List) null)});
         }
 
+
         kycv3ViewModel.requestWithSomeHttpHeaders(plan);
     }
 

app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/view/choose/ChooseKycFragment.kt

@@ -1,52 +0,0 @@
-package com.remit.jmecustomer.features.newkyc.newCustomer.view.choose
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.remit.jmecustomer.base.BaseFragment
-import com.remit.jmecustomer.databinding.FragmentChooseKycBinding
-import com.remit.jmecustomer.features.kyc.newCustomer.model.kycSetting.Option
-import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel
-import com.remit.jmecustomer.features.kyc.newCustomer.view.adapter.KycTypeAdapter
-
-class ChooseKycFragment(private var options: List<Option>? = null) : BaseFragment() {
-
-    private var _binding: FragmentChooseKycBinding? = null
-    private val binding get() = _binding!!
-    private var kycv3ViewModel: KYCV3ViewModel? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        _binding = FragmentChooseKycBinding.inflate(inflater, container, false)
-        init()
-        return binding.root
-    }
-
-    fun onFragmentedSelected() {}
-
-    fun init() {
-        val layoutManagerVertical = LinearLayoutManager(requireActivity())
-        binding.rvChooseKyc.layoutManager = layoutManagerVertical
-        kycv3ViewModel = ViewModelProvider(requireActivity())[KYCV3ViewModel::class.java]
-        val adapter = KycTypeAdapter(options!!)
-        binding.rvChooseKyc.adapter = adapter
-        adapter.setOnItemClickListener(object : KycTypeAdapter.ItemClickListener{
-            override fun onItemClicked(option: Option) {
-                kycv3ViewModel?.setSelectedOption(option)
-            }
-
-        })
-
-        binding.btnSubmit1.setOnClickListener {
-            kycv3ViewModel?.redirectToInformation()
-        }
-
-    }
-
-}

app/src/main/java/com/remit/jmecustomer/features/registerv3/newcustomer/view/NewRegisterV3Activity.java

@@ -434,7 +434,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
     public void redirectToTermsAndConditionScreen() {
         String userId = presenter.getLastRegisteredUserId();
         String userPwd = presenter.getLastRegisteredUserPwd();
-        KYCV4Activity.startActivityForResult(this, false, userId, userPwd);
+        KYCV3Activity.startActivityForResult(this, false, userId, userPwd);
 
     }
 

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/black"/>
+        </shape>
+    </item>
+</selector>

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

@@ -22,8 +22,8 @@
       android:id="@+id/cl_bottom_layout"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintBottom_toBottomOf="parent"
-      android:layout_marginLeft="@dimen/_20sdp"
-      android:layout_marginRight="@dimen/_20sdp"
+      android:layout_marginLeft="@dimen/_60sdp"
+      android:layout_marginRight="@dimen/_60sdp"
       android:layout_marginBottom="@dimen/_20sdp"
       android:background="@drawable/rounded_white_border"
       android:layout_width="match_parent"

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

@@ -6,9 +6,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.recyclerview.widget.RecyclerView
+        app:layout_constraintBottom_toTopOf="@id/btn_submit1"
         android:id="@+id/rv_choose_kyc"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/_10sdp"
+        android:layout_height="0dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -20,7 +22,7 @@
         style="@style/MButton"
         android:layout_gravity="center"
         android:layout_marginTop="@dimen/_15sdp"
-        android:layout_marginBottom="@dimen/_15sdp"
+        android:layout_marginBottom="@dimen/_50sdp"
         android:enabled="true"
         android:text="@string/next_text" />
 

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

@@ -150,15 +150,27 @@
                         android:id="@+id/rv_send_type"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/_18sdp"
+                        android:layout_marginTop="@dimen/_10sdp"
+                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                         />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:layout_marginTop="@dimen/_6sdp"
+                        android:id="@+id/indicator_send_method"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintStart_toStartOf="parent"
+                        android:gravity="center"
+                        app:layout_constraintTop_toBottomOf="@+id/rv_send_type"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/const_send_receive"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/rv_send_type">
+                        app:layout_constraintTop_toBottomOf="@id/indicator_send_method">
 
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/const_send"
@@ -493,6 +505,7 @@
                                 android:orientation="horizontal"
                                 android:paddingLeft="@dimen/_5sdp"
                                 android:paddingRight="@dimen/_5sdp"
+                                android:layoutDirection="rtl"
                                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
                             <me.relex.circleindicator.CircleIndicator2

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_marginHorizontal="@dimen/_5sdp"
+    android:layout_width="8dp"
+    android:layout_height="8dp">
+
+    <RelativeLayout
+        android:gravity="center"
+        android:id="@+id/viewIndicator"
+        android:layout_width="8dp"
+        android:layout_height="8dp"
+        android:background="@drawable/grey_border_dark_indicator" />
+</LinearLayout>

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

@@ -58,7 +58,6 @@
             android:layout_width="@dimen/_20sdp"
             android:layout_height="@dimen/_20sdp"
             android:layout_marginRight="@dimen/_16sdp"
-            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/cl_notification"
             app:layout_constraintEnd_toStartOf="@+id/cl_notification"
             app:layout_constraintTop_toTopOf="@+id/cl_notification"

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

@@ -364,7 +364,7 @@
     </style>
 
     <style name="homeNavigationTextStyle" parent="TextAppearance.Design.Tab">
-        <item name="android:textSize">@dimen/_10ssp</item>
+        <item name="android:textSize">@dimen/_9ssp</item>
         <item name="android:fontFamily">@font/lato_regular</item>
         <item name="android:textAllCaps">false</item>
         <item name="textAllCaps">false</item>