From ac21ebecaa87c356aa9107750c10b269b05499e9 Mon Sep 17 00:00:00 2001
From: Hemant Khadase <hemantkhadase@Hemants-MacBook-Air.local>
Date: Fri, 16 Dec 2022 13:17:58 +0530
Subject: [PATCH] changes in Classes and Models

---
 app/src/main/AndroidManifest.xml              |   1 +
 .../api/{RetrofitInstance.kt => ApiClient.kt} |  14 +-
 .../bajajfd/interface/ApiInterface.kt         |  30 +
 .../ui/activity/BajajFdMainActivity.kt        |  10 +-
 ...Fragment.kt => StepFiveBajajFDFragment.kt} |  27 +-
 ...Fragment.kt => StepFourBajajFDFragment.kt} |  19 +-
 ...tFragment.kt => StepOneBajajFDFragment.kt} |  16 +-
 ...ragment.kt => StepThreeBajajFDFragment.kt} |  19 +-
 ...eFragment.kt => StepTwoBajajFDFragment.kt} |  26 +-
 .../bajajfd/viewModel/StepFiveViewModel.kt    |  18 +
 .../bajajfd/viewModel/StepOneViewModel.kt     |  21 +-
 .../bajajfd/viewModel/StepStartViewModel.kt   |   7 -
 .../bajajfd/viewModel/StepTwoViewModel.kt     |   7 +
 .../res/layout/fragment_bajajfd_step_five.xml | 200 ++++
 .../res/layout/fragment_bajajfd_step_four.xml | 422 +++++---
 .../res/layout/fragment_bajajfd_step_one.xml  |   2 +-
 .../layout/fragment_bajajfd_step_three.xml    | 414 +++-----
 .../res/layout/fragment_bajajfd_step_two.xml  | 925 ++++++++++++++----
 app/src/main/res/layout/fragment_step_one.xml | 830 ----------------
 19 files changed, 1518 insertions(+), 1490 deletions(-)
 rename app/src/main/java/com/nivesh/production/bajajfd/api/{RetrofitInstance.kt => ApiClient.kt} (71%)
 rename app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/{StepTwoFragment.kt => StepFiveBajajFDFragment.kt} (60%)
 rename app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/{StepFourFragment.kt => StepFourBajajFDFragment.kt} (82%)
 rename app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/{StepStartFragment.kt => StepOneBajajFDFragment.kt} (74%)
 rename app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/{StepThreeFragment.kt => StepThreeBajajFDFragment.kt} (82%)
 rename app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/{StepOneFragment.kt => StepTwoBajajFDFragment.kt} (60%)
 create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveViewModel.kt
 delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepStartViewModel.kt
 create mode 100644 app/src/main/res/layout/fragment_bajajfd_step_five.xml
 delete mode 100644 app/src/main/res/layout/fragment_step_one.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9a65401..1a75794 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/api/RetrofitInstance.kt b/app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt
similarity index 71%
rename from app/src/main/java/com/nivesh/production/bajajfd/api/RetrofitInstance.kt
rename to app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt
index 8b467b0..72f55f3 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/api/RetrofitInstance.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt
@@ -1,21 +1,22 @@
 package com.nivesh.production.bajajfd.api
 
+import com.nivesh.production.bajajfd.`interface`.ApiInterface
 import com.nivesh.production.bajajfd.util.Constants.Companion.BASE_URL
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
-class RetrofitInstance {
-    companion object{
-        private val retrofit by  lazy {
+class ApiClient {
+    companion object {
+        private val client by lazy {
             //lazy means  we only initialize this here once
-            val logging=HttpLoggingInterceptor()
+            val logging = HttpLoggingInterceptor()
             //loggingInterceptor use for  see making request and for see what responses are
             logging.setLevel(HttpLoggingInterceptor.Level.BODY)
             //see the body of  response
             //create client for  retrofit
-            val  client=OkHttpClient.Builder()
+            val client = OkHttpClient.Builder()
                 .addInterceptor(logging)
                 .retryOnConnectionFailure(true)
                 .build()
@@ -25,5 +26,8 @@ class RetrofitInstance {
                 .client(client)
                 .build()
         }
+        private val getApiClient by lazy {
+            client.create(ApiInterface::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interface/ApiInterface.kt b/app/src/main/java/com/nivesh/production/bajajfd/interface/ApiInterface.kt
index aac0e97..c707383 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/interface/ApiInterface.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/interface/ApiInterface.kt
@@ -1,6 +1,36 @@
 package com.nivesh.production.bajajfd.`interface`
 
+import okhttp3.RequestBody
+import retrofit2.http.Body
+import retrofit2.http.POST
+
 interface ApiInterface {
 
+    @POST("GetRates")
+    suspend fun getRates(@Body requestBody: RequestBody)
+
+    @POST("CheckFDCKYC")
+    suspend fun checkFDKYC(@Body requestBody: RequestBody)
+
+    @POST("CreateFDApplication")
+    suspend fun createFDApp(@Body requestBody: RequestBody)
+
+    @POST("DocumentsUpload")
+    suspend fun documentsUpload(@Body requestBody: RequestBody)
+
+    @POST("SaveFDOtherData")
+    suspend fun saveFDOtherData(@Body requestBody: RequestBody)
+
+    @POST("GetFDDetails")
+    suspend fun getFDDetails(@Body requestBody: RequestBody)
+
+    @POST("UpdateFDPaymentStatus")
+    suspend fun updateFDPaymentStatus(@Body requestBody: RequestBody)
+
+    @POST("FinaliseFD")
+    suspend fun finaliseFD(@Body requestBody: RequestBody)
+
+    @POST("FinaliseKYC")
+    suspend fun finaliseKYC(@Body requestBody: RequestBody)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
index b54ae9c..db6de24 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
@@ -35,11 +35,11 @@ class BajajFdMainActivity : AppCompatActivity(),BajajFDInterface {
         // set viewPager
         val sectionsPagerAdapter = SectionsPagerAdapter(this@BajajFdMainActivity, supportFragmentManager)
         val viewPager: ViewPager = binding.viewPager
-        sectionsPagerAdapter.addFragment(StepStartFragment.getInstance(this@BajajFdMainActivity))
-        sectionsPagerAdapter.addFragment(StepOneFragment.getInstance(this@BajajFdMainActivity))
-        sectionsPagerAdapter.addFragment(StepTwoFragment.getInstance(this@BajajFdMainActivity))
-        sectionsPagerAdapter.addFragment(StepThreeFragment.getInstance(this@BajajFdMainActivity))
-        sectionsPagerAdapter.addFragment(StepFourFragment.getInstance(this@BajajFdMainActivity))
+        sectionsPagerAdapter.addFragment(StepOneBajajFDFragment.getInstance(this@BajajFdMainActivity))
+        sectionsPagerAdapter.addFragment(StepTwoBajajFDFragment.getInstance(this@BajajFdMainActivity))
+        sectionsPagerAdapter.addFragment(StepThreeBajajFDFragment.getInstance(this@BajajFdMainActivity))
+        sectionsPagerAdapter.addFragment(StepFourBajajFDFragment.getInstance(this@BajajFdMainActivity))
+        sectionsPagerAdapter.addFragment(StepFiveBajajFDFragment.getInstance(this@BajajFdMainActivity))
         viewPager.adapter = sectionsPagerAdapter
 
         viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt
similarity index 60%
rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoFragment.kt
rename to app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt
index e1b62e6..0c24fb4 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt
@@ -4,25 +4,24 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
-import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepTwoBinding
-import com.nivesh.production.bajajfd.viewModel.StepTwoViewModel
+import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFiveBinding
+import com.nivesh.production.bajajfd.viewModel.StepFiveViewModel
 
-class StepTwoFragment : Fragment() {
+class StepFiveBajajFDFragment : Fragment() {
 
-    private lateinit var stepTwoFragment: StepTwoViewModel
-    private var _binding: FragmentBajajfdStepTwoBinding? = null
+    private lateinit var stepFourViewModel: StepFiveViewModel
+    private var _binding: FragmentBajajfdStepFiveBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var bajajFDInterface: BajajFDInterface
     companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepTwoFragment {
-            val stepTwoFragment = StepTwoFragment()
-            stepTwoFragment.setApi(fdInterface)
-            return stepTwoFragment
+        fun getInstance(fdInterface: BajajFDInterface): StepFiveBajajFDFragment {
+            val stepFourFragment = StepFiveBajajFDFragment()
+            stepFourFragment.setApi(fdInterface)
+            return stepFourFragment
         }
     }
     private fun setApi(bajajFDInterfaces: BajajFDInterface) {
@@ -31,7 +30,7 @@ class StepTwoFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        stepTwoFragment = ViewModelProvider(this)[StepTwoViewModel::class.java].apply {
+        stepFourViewModel = ViewModelProvider(this)[StepFiveViewModel::class.java].apply {
 
         }
     }
@@ -41,16 +40,16 @@ class StepTwoFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
 
-        _binding = FragmentBajajfdStepTwoBinding.inflate(inflater, container, false)
+        _binding = FragmentBajajfdStepFiveBinding.inflate(inflater, container, false)
         val root = binding.root
 
 //        val textView: TextView = binding.sectionLabel
-//        stepTwoFragment.text.observe(viewLifecycleOwner) {
+//        stepFourViewModel.text.observe(viewLifecycleOwner) {
 //            textView.text = it
 //        }
 //
 //        binding.btnClick.setOnClickListener {
-//            bajajFDInterface.stepTwoApi("stepTwoResponse")
+//            bajajFDInterface.stepFourApi("stepFourResponse")
 //        }
 
         return root
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
similarity index 82%
rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourFragment.kt
rename to app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
index a90ba7b..a680f6d 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
@@ -4,14 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
 import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFourBinding
 import com.nivesh.production.bajajfd.viewModel.StepFourViewModel
 
-class StepFourFragment : Fragment() {
+class StepFourBajajFDFragment : Fragment() {
 
     private lateinit var stepFourViewModel: StepFourViewModel
     private var _binding: FragmentBajajfdStepFourBinding? = null
@@ -19,16 +18,17 @@ class StepFourFragment : Fragment() {
 
     private lateinit var bajajFDInterface: BajajFDInterface
     companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepFourFragment {
-            val stepFourFragment = StepFourFragment()
-            stepFourFragment.setApi(fdInterface)
-            return stepFourFragment
+        fun getInstance(fdInterface: BajajFDInterface): StepFourBajajFDFragment {
+            val stepThreeFragment = StepFourBajajFDFragment()
+            stepThreeFragment.setApi(fdInterface)
+            return stepThreeFragment
         }
     }
     private fun setApi(bajajFDInterfaces: BajajFDInterface) {
         bajajFDInterface = bajajFDInterfaces
     }
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         stepFourViewModel = ViewModelProvider(this)[StepFourViewModel::class.java].apply {
@@ -45,14 +45,13 @@ class StepFourFragment : Fragment() {
         val root = binding.root
 
 //        val textView: TextView = binding.sectionLabel
-//        stepFourViewModel.text.observe(viewLifecycleOwner) {
+//        stepThreeViewModel.text.observe(viewLifecycleOwner) {
 //            textView.text = it
 //        }
-//
+
 //        binding.btnClick.setOnClickListener {
-//            bajajFDInterface.stepFourApi("stepFourResponse")
+//            bajajFDInterface.stepThreeApi("stepThreeResponse")
 //        }
-
         return root
     }
 
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
similarity index 74%
rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt
rename to app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
index 42ba659..368e6d3 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
@@ -6,22 +6,20 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.nivesh.production.bajajfd.R
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
 import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding
-import com.nivesh.production.bajajfd.viewModel.StepStartViewModel
+import com.nivesh.production.bajajfd.viewModel.StepOneViewModel
 
-class StepStartFragment : Fragment() {
-    private lateinit var viewModel: StepStartViewModel
-    private lateinit var stepStartViewModel: StepStartViewModel
+class StepOneBajajFDFragment : Fragment() {
+    private lateinit var stepOneViewModel: StepOneViewModel
     private var _binding: FragmentBajajfdStepOneBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var bajajFDInterface: BajajFDInterface
 
     companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepStartFragment{
-            val stepStartFragment = StepStartFragment()
+        fun getInstance(fdInterface: BajajFDInterface): StepOneBajajFDFragment{
+            val stepStartFragment = StepOneBajajFDFragment()
             stepStartFragment.setApi(fdInterface)
             return stepStartFragment
         }
@@ -33,7 +31,7 @@ class StepStartFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        stepStartViewModel = ViewModelProvider(this)[StepStartViewModel::class.java].apply {
+        stepOneViewModel = ViewModelProvider(this)[StepOneViewModel::class.java].apply {
 
         }
     }
@@ -41,7 +39,7 @@ class StepStartFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         _binding = FragmentBajajfdStepOneBinding.inflate(inflater,container,false)
         val root = binding.root
 
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
similarity index 82%
rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeFragment.kt
rename to app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
index aae61b8..d1763b4 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
@@ -4,14 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
 import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepThreeBinding
 import com.nivesh.production.bajajfd.viewModel.StepThreeViewModel
 
-class StepThreeFragment : Fragment() {
+class StepThreeBajajFDFragment : Fragment() {
 
     private lateinit var stepThreeViewModel: StepThreeViewModel
     private var _binding: FragmentBajajfdStepThreeBinding? = null
@@ -19,17 +18,16 @@ class StepThreeFragment : Fragment() {
 
     private lateinit var bajajFDInterface: BajajFDInterface
     companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepThreeFragment {
-            val stepThreeFragment = StepThreeFragment()
-            stepThreeFragment.setApi(fdInterface)
-            return stepThreeFragment
+        fun getInstance(fdInterface: BajajFDInterface): StepThreeBajajFDFragment {
+            val stepTwoFragment = StepThreeBajajFDFragment()
+            stepTwoFragment.setApi(fdInterface)
+            return stepTwoFragment
         }
     }
     private fun setApi(bajajFDInterfaces: BajajFDInterface) {
         bajajFDInterface = bajajFDInterfaces
     }
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         stepThreeViewModel = ViewModelProvider(this)[StepThreeViewModel::class.java].apply {
@@ -46,13 +44,14 @@ class StepThreeFragment : Fragment() {
         val root = binding.root
 
 //        val textView: TextView = binding.sectionLabel
-//        stepThreeViewModel.text.observe(viewLifecycleOwner) {
+//        stepTwoFragment.text.observe(viewLifecycleOwner) {
 //            textView.text = it
 //        }
-
+//
 //        binding.btnClick.setOnClickListener {
-//            bajajFDInterface.stepThreeApi("stepThreeResponse")
+//            bajajFDInterface.stepTwoApi("stepTwoResponse")
 //        }
+
         return root
     }
 
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
similarity index 60%
rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneFragment.kt
rename to app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
index 1ea2fc9..846b62f 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
@@ -7,19 +7,19 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
-import com.nivesh.production.bajajfd.databinding.FragmentStepOneBinding
-import com.nivesh.production.bajajfd.viewModel.StepOneViewModel
+import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepTwoBinding
+import com.nivesh.production.bajajfd.viewModel.StepTwoViewModel
 
-class StepOneFragment : Fragment() {
-    private lateinit var stepOneViewModel: StepOneViewModel
-    private var _binding: FragmentStepOneBinding? = null
+class StepTwoBajajFDFragment : Fragment() {
+    private lateinit var stepTwoViewModel: StepTwoViewModel
+    private var _binding: FragmentBajajfdStepTwoBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var bajajFDInterface: BajajFDInterface
 
     companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepOneFragment {
-            val stepOneFragment = StepOneFragment()
+        fun getInstance(fdInterface: BajajFDInterface): StepTwoBajajFDFragment {
+            val stepOneFragment = StepTwoBajajFDFragment()
             stepOneFragment.setApi(fdInterface)
             return stepOneFragment
         }
@@ -32,7 +32,7 @@ class StepOneFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        stepOneViewModel = ViewModelProvider(this)[StepOneViewModel::class.java].apply {
+        stepTwoViewModel = ViewModelProvider(this)[StepTwoViewModel::class.java].apply {
 
         }
     }
@@ -42,22 +42,22 @@ class StepOneFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
 
-        _binding = FragmentStepOneBinding.inflate(inflater,container,false)
+        _binding = FragmentBajajfdStepTwoBinding.inflate(inflater,container,false)
         val root = binding.root
 
-        stepOneViewModel.text.observe(viewLifecycleOwner) {
+        stepTwoViewModel.text.observe(viewLifecycleOwner) {
         }
 
         binding.tvPersonalDetails.setOnClickListener {
-            stepOneViewModel.setUpVisibility(binding.llPersonalDetail)
+            stepTwoViewModel.setUpVisibility(binding.llPersonalDetail)
         }
 
         binding.tvNomineeDetails.setOnClickListener {
-            stepOneViewModel.setUpVisibility(binding.llNomineeDetail)
+            stepTwoViewModel.setUpVisibility(binding.llNomineeDetail)
         }
 
         binding.tvBankDetails.setOnClickListener {
-            stepOneViewModel.setUpVisibility(binding.llBankDetails)
+            stepTwoViewModel.setUpVisibility(binding.llBankDetails)
         }
 
         return root
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveViewModel.kt
new file mode 100644
index 0000000..e7e5b49
--- /dev/null
+++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveViewModel.kt
@@ -0,0 +1,18 @@
+package com.nivesh.production.bajajfd.viewModel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
+import androidx.lifecycle.ViewModel
+
+class StepFiveViewModel : ViewModel() {
+
+    private val _index = MutableLiveData<Int>()
+    val text: LiveData<String> = Transformations.map(_index) {
+        "Step : $it"
+    }
+
+    fun setIndex(index: Int) {
+        _index.value = index
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneViewModel.kt
index 5ea6043..63e7664 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneViewModel.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneViewModel.kt
@@ -1,26 +1,7 @@
 package com.nivesh.production.bajajfd.viewModel
 
-import android.view.View
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 
 class StepOneViewModel : ViewModel() {
-
-    private val _index = MutableLiveData<Int>()
-    val text: LiveData<String> = Transformations.map(_index) {
-        "Step : $it"
-    }
-
-    fun setIndex(index: Int) {
-        _index.value = index
-    }
-
-    fun setUpVisibility(ll: LinearLayout) {
-        if(ll.visibility== View.VISIBLE) ll.visibility = View.GONE
-        else  ll.visibility = View.VISIBLE
-    }
+    // TODO: Implement the ViewModel
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepStartViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepStartViewModel.kt
deleted file mode 100644
index 03fd0ed..0000000
--- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepStartViewModel.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.nivesh.production.bajajfd.viewModel
-
-import androidx.lifecycle.ViewModel
-
-class StepStartViewModel : ViewModel() {
-    // TODO: Implement the ViewModel
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoViewModel.kt
index aada84f..198610e 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoViewModel.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoViewModel.kt
@@ -1,5 +1,7 @@
 package com.nivesh.production.bajajfd.viewModel
 
+import android.view.View
+import android.widget.LinearLayout
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
@@ -15,4 +17,9 @@ class StepTwoViewModel : ViewModel() {
     fun setIndex(index: Int) {
         _index.value = index
     }
+
+    fun setUpVisibility(ll: LinearLayout) {
+        if(ll.visibility== View.VISIBLE) ll.visibility = View.GONE
+        else  ll.visibility = View.VISIBLE
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_five.xml b/app/src/main/res/layout/fragment_bajajfd_step_five.xml
new file mode 100644
index 0000000..c21dee4
--- /dev/null
+++ b/app/src/main/res/layout/fragment_bajajfd_step_five.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/constraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="@dimen/margin_10"
+    android:background="@color/color_EFEFEF"
+    tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFiveBajajFDFragment">
+
+    <LinearLayout
+        android:id="@+id/linearLayoutTwo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/cardViewOne"
+            style="@style/CustomCardViewTopStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/margin_5"
+            android:layout_marginTop="@dimen/margin_5"
+            android:layout_marginRight="@dimen/margin_5"
+            android:padding="@dimen/margin_10">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="12dp"
+                android:background="@color/white"
+                android:padding="@dimen/margin_5"
+                app:layout_constraintBottom_toTopOf="@+id/tvCongrats"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="1.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="1.0">
+
+                <ImageView
+                    android:id="@+id/logo"
+                    android:layout_width="@dimen/margin_150"
+                    android:layout_height="18dp"
+                    android:layout_marginTop="8dp"
+                    android:contentDescription="@string/content_description"
+                    android:src="@drawable/bajaj_logo"
+                    app:layout_constraintBottom_toTopOf="@+id/tvFdRating"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tvFdRating"
+                    style="@style/regularStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
+                    android:textColor="@color/light_text"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/logo"
+                    app:layout_constraintVertical_bias="0.0" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/cardViewTwo"
+            style="@style/CustomCardViewBottomStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/margin_5"
+            android:layout_marginRight="@dimen/margin_5"
+            android:layout_marginBottom="@dimen/margin_5"
+            android:padding="@dimen/margin_10"
+            app:cardBackgroundColor="@color/bg_color"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cardViewOne"
+            app:layout_constraintVertical_bias="0.0">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/margin_10"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <TextView
+                    android:id="@+id/tvCongrats"
+                    style="@style/semiBoldStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:text="Congratulations"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_17"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.437"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tvSuccessMessage"
+                    style="@style/regularStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="Your transaction is successful."
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_16"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.419"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvCongrats" />
+
+                <TextView
+                    android:id="@+id/tvSuccessMsgDetail"
+                    style="@style/regularStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:text="You will receive fixed deposit certificate\nwithin 3 working days on email"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_14"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.393"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvSuccessMessage" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <include
+            android:id="@+id/fragmentStepFail"
+            layout="@layout/fragmnet_step_fail"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tvDownloadInvoice"
+        style="@style/semiBoldStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Download Invoice"
+        android:textColor="@color/blue"
+        android:textSize="@dimen/text_size_16"
+        app:layout_constraintBottom_toBottomOf="@+id/btnNext"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.152"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/btnNext" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnNext"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="16dp"
+        android:backgroundTint="@color/colorPrimary"
+        android:text="View order"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.545"
+        app:layout_constraintStart_toEndOf="@+id/tvDownloadInvoice"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayoutTwo"
+        app:layout_constraintVertical_bias="0.951" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/tvRetry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:backgroundTint="@color/blue"
+        android:text="Retry"
+        android:textColor="@color/white"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btnNext"
+        app:layout_constraintHorizontal_bias="0.607"
+        app:layout_constraintStart_toEndOf="@+id/tvDownloadInvoice"
+        app:layout_constraintTop_toTopOf="@+id/linearLayoutTwo"
+        app:layout_constraintVertical_bias="0.967" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_four.xml b/app/src/main/res/layout/fragment_bajajfd_step_four.xml
index f982d54..1b45c80 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_four.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_four.xml
@@ -5,165 +5,358 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="@dimen/margin_10"
-    android:background="@color/color_EFEFEF"
-    tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFourFragment">
+    android:background="@color/Nivesh_color_AppBg"
+    tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFourBajajFDFragment">
 
-    <LinearLayout
-        android:id="@+id/linearLayoutTwo"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="80dp"
+        android:background="@color/transparent"
+        android:fillViewport="true"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@id/btnNext">
 
         <com.google.android.material.card.MaterialCardView
-            android:id="@+id/cardViewOne"
-            style="@style/CustomCardViewTopStyle"
+            style="@style/CustomCardViewStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/margin_5"
-            android:layout_marginTop="@dimen/margin_5"
-            android:layout_marginRight="@dimen/margin_5"
-            android:padding="@dimen/margin_10">
+            android:foreground="?android:attr/selectableItemBackground"
+            android:padding="@dimen/margin_10"
+            app:cardElevation="1dp"
+            app:cardUseCompatPadding="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="12dp"
-                android:background="@color/white"
-                android:padding="@dimen/margin_5"
-                app:layout_constraintBottom_toTopOf="@+id/tvCongrats"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="1.0">
+                android:layout_height="match_parent"
+                android:paddingBottom="@dimen/margin_10">
 
                 <ImageView
                     android:id="@+id/logo"
                     android:layout_width="@dimen/margin_150"
                     android:layout_height="18dp"
                     android:layout_marginTop="8dp"
-                    android:contentDescription="@string/content_description"
                     android:src="@drawable/bajaj_logo"
-                    app:layout_constraintBottom_toTopOf="@+id/tvFdRating"
+                    app:layout_constraintHorizontal_bias="0.065"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:contentDescription="@string/content_description"/>
+
+                <TextView
+                    android:id="@+id/tvFDRating"
+                    style="@style/regularStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:paddingStart="@dimen/_5sdp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:text="Rating: FAAA by CRISIL"
+                    android:textColor="@color/light_text"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/logo" />
+
+                <TextView
+                    android:id="@+id/tvMakePayment"
+                    style="@style/semiBoldStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:background="@color/grey_bg"
+                    android:paddingStart="@dimen/_5sdp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:text="Make payment"
+                    android:textColor="@color/black"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvFDRating" />
 
                 <TextView
-                    android:id="@+id/tvFdRating"
+                    android:id="@+id/lblMakePayment"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
-                    android:textColor="@color/light_text"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
+                    android:layout_marginStart="10dp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:paddingStart="0dp"
+                    android:text="Invested Amount"
+                    android:textSize="@dimen/text_size_14"
+                    app:layout_constraintBottom_toTopOf="@id/lblTenure"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/logo"
+                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
                     app:layout_constraintVertical_bias="0.0" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/cardViewTwo"
-            style="@style/CustomCardViewBottomStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/margin_5"
-            android:layout_marginRight="@dimen/margin_5"
-            android:layout_marginBottom="@dimen/margin_5"
-            android:padding="@dimen/margin_10"
-            app:cardBackgroundColor="@color/bg_color"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cardViewOne"
-            app:layout_constraintVertical_bias="0.0">
+                <TextView
+                    android:id="@+id/tvInvestedAmount"
+                    style="@style/regularStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/_5sdp"
+                    android:layout_marginEnd="@dimen/_7sdp"
+                    android:paddingStart="@dimen/_5sdp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:text="Rs. 50,000"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_14"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/lblMakePayment"
+                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
+                    app:layout_constraintVertical_bias="0.0" />
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/margin_10"
-                app:layout_constraintBottom_toBottomOf="parent">
+                <TextView
+                    android:id="@+id/lblTenure"
+                    style="@style/regularStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:paddingStart="0dp"
+                    android:text="Tenure"
+                    android:textSize="@dimen/text_size_14"
+                    app:layout_constraintBottom_toTopOf="@+id/lblInterestPayout"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/lblMakePayment"
+                    app:layout_constraintVertical_bias="0.0" />
 
                 <TextView
-                    android:id="@+id/tvCongrats"
-                    style="@style/semiBoldStyle"
+                    android:id="@+id/tvTenure"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:text="Congratulations"
+                    android:text="2 Years"
+                    android:paddingStart="@dimen/_5sdp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:layout_marginTop="@dimen/_5sdp"
+                    android:layout_marginEnd="@dimen/_7sdp"
+                    android:layout_marginStart="@dimen/_5sdp"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/text_size_17"
+                    android:textSize="@dimen/text_size_14"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.437"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/lblTenure"
+                    app:layout_constraintTop_toBottomOf="@+id/tvInvestedAmount"
+                    app:layout_constraintVertical_bias="0.0" />
+
+                <TextView
+                    android:id="@+id/lblInterestPayout"
+                    style="@style/regularStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:paddingStart="0dp"
+                    android:text="Interest Payout"
+                    android:textSize="@dimen/text_size_14"
+                    app:layout_constraintBottom_toTopOf="@+id/lblRateOfInterest"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toBottomOf="@+id/lblTenure"
+                    app:layout_constraintVertical_bias="0.0" />
 
                 <TextView
-                    android:id="@+id/tvSuccessMessage"
+                    android:id="@+id/tvInterestPayout"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    android:text="Your transaction is successful."
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/text_size_16"
+                    android:layout_marginEnd="8dp"
+                    android:paddingStart="@dimen/_5sdp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:text="Monthly"
+                    android:textSize="@dimen/text_size_14"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.419"
+                    app:layout_constraintHorizontal_bias="0.9"
+                    app:layout_constraintStart_toEndOf="@+id/lblInterestPayout"
+                    app:layout_constraintTop_toBottomOf="@+id/tvTenure"
+                    app:layout_constraintVertical_bias="0.0" />
+
+                <TextView
+                    android:id="@+id/lblRateOfInterest"
+                    style="@style/regularStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:paddingEnd="@dimen/_5sdp"
+                    android:paddingStart="0dp"
+                    android:text="Rate of Interest"
+                    android:textSize="@dimen/text_size_14"
+                    app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvCongrats" />
+                    app:layout_constraintTop_toBottomOf="@+id/lblInterestPayout"
+                    app:layout_constraintVertical_bias="0.0" />
 
                 <TextView
-                    android:id="@+id/tvSuccessMsgDetail"
+                    android:id="@+id/tvRateOfInterest"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:gravity="center"
-                    android:text="You will receive fixed deposit certificate\nwithin 3 working days on email"
-                    android:textColor="@color/black"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="8dp"
+                    android:paddingStart="@dimen/_5sdp"
+                    android:paddingEnd="@dimen/_5sdp"
                     android:textSize="@dimen/text_size_14"
-                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:text="6.75%"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.9"
+                    app:layout_constraintStart_toEndOf="@+id/lblRateOfInterest"
+                    app:layout_constraintTop_toBottomOf="@+id/tvInterestPayout"
+                    app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
+                    app:layout_constraintVertical_bias="0.0" />
+
+                <TextView
+                    android:id="@+id/tvTermsCondition"
+                    style="@style/semiBoldStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="196dp"
+                    android:background="@color/grey_bg"
+                    android:paddingStart="@dimen/margin_10"
+                    android:paddingTop="@dimen/margin_3"
+                    android:paddingEnd="0dp"
+                    android:paddingBottom="@dimen/margin_3"
+                    android:text="Terms &amp; condition"
+                    android:textColor="@color/black"
+                    app:layout_constraintBottom_toTopOf="@+id/swDirectorBajajFinance"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvFDRating" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/swDirectorBajajFinance"
+                    style="@style/regularStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="5dp"
+                    android:text="Director of Bajaj Finance Ltd."
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvTermsCondition"
+                    app:layout_constraintVertical_bias="0.018" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    style="@style/regularStyle"
+                    android:id="@+id/swPromoterBajajFinance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="Promoter of Bajaj Finance Ltd."
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/swDirectorBajajFinance"
+                    app:layout_constraintVertical_bias="0.0" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/swRelativeDirector"
+                    style="@style/regularStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="Relative of director or promotor of Bajaj Finance Ltd."
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/swPromoterBajajFinance"
+                    app:layout_constraintVertical_bias="0.0" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/swShareholder"
+                    style="@style/regularStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="Shareholder of Bajaj Finance Ltd."
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.393"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvSuccessMessage" />
+                    app:layout_constraintTop_toBottomOf="@+id/swRelativeDirector" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/swPoliticallyExposed"
+                    style="@style/regularStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="Are you a politicallly exposed person"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/swShareholder" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/swCitizen"
+                    style="@style/regularStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="I am not a citizen, national or tax resident of any country outside of India"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/swPoliticallyExposed"
+                    app:layout_constraintVertical_bias="0.0" />
+
+                <CheckBox
+                    android:id="@+id/checkBox"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/swCitizen" />
+
+                <TextView
+                    android:id="@+id/tvTermsAndCondition"
+                    android:layout_width="322dp"
+                    android:layout_height="74dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginEnd="10dp"
+                    android:text="@string/terms_condition"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_10"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/checkBox"
+                    app:layout_constraintTop_toBottomOf="@+id/swCitizen" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </com.google.android.material.card.MaterialCardView>
 
-        <include
-            android:id="@+id/fragmentStepFail"
-            layout="@layout/fragmnet_step_fail"
-            android:visibility="gone" />
-
-    </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
-    <TextView
-        android:id="@+id/tvDownloadInvoice"
-        style="@style/semiBoldStyle"
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnBack"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Download Invoice"
-        android:textColor="@color/blue"
-        android:textSize="@dimen/text_size_16"
-        app:layout_constraintBottom_toBottomOf="@+id/btnNext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.152"
+        android:layout_gravity="center_vertical"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:backgroundTint="@color/blue"
+        android:text="@string/back"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btnNext"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/btnNext" />
+        app:layout_constraintVertical_bias="0.812" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnNext"
@@ -171,30 +364,29 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
         android:backgroundTint="@color/colorPrimary"
-        android:text="View order"
+        android:text="View Order"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.545"
-        app:layout_constraintStart_toEndOf="@+id/tvDownloadInvoice"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayoutTwo"
-        app:layout_constraintVertical_bias="0.951" />
+        app:layout_constraintStart_toEndOf="@+id/btnBack"
+        app:layout_constraintTop_toBottomOf="@+id/scrollView"
+        app:layout_constraintVertical_bias="0.812" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/tvRetry"
+    <TextView
+        android:id="@+id/tvOnceClick"
+        style="@style/regularStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:backgroundTint="@color/blue"
-        android:text="Retry"
-        android:textColor="@color/white"
+        android:layout_marginTop="8dp"
+        android:text="@string/once_you_click"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnNext"
-        app:layout_constraintHorizontal_bias="0.607"
-        app:layout_constraintStart_toEndOf="@+id/tvDownloadInvoice"
-        app:layout_constraintTop_toTopOf="@+id/linearLayoutTwo"
-        app:layout_constraintVertical_bias="0.967" />
+        app:layout_constraintBottom_toTopOf="@+id/btnBack"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_one.xml b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
index 720e0f9..d94df7e 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_EFEFEF"
-    tool:context="com.nivesh.production.bajajfd.ui.fragment.StepOneFragment">
+    tool:context="com.nivesh.production.bajajfd.ui.fragment.StepTwoBajajFDFragment">
 
     <ScrollView
         android:id="@+id/scrollView"
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_three.xml b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
index 7906d86..dbf9d9b 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_three.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
@@ -6,14 +6,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/Nivesh_color_AppBg"
-    tools:context="com.nivesh.production.bajajfd.ui.fragment.StepThreeFragment">
+    tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFourBajajFDFragment">
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="80dp"
-        android:background="@color/transparent"
+        android:background="@color/Nivesh_color_AppBg"
         android:fillViewport="true"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -34,17 +34,20 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/childConstraint"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:paddingBottom="@dimen/margin_10">
+                android:padding="@dimen/margin_10"
+                android:paddingBottom="@dimen/margin_30">
 
                 <ImageView
                     android:id="@+id/logo"
                     android:layout_width="@dimen/margin_150"
                     android:layout_height="18dp"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginTop="4dp"
                     android:src="@drawable/bajaj_logo"
-                    app:layout_constraintHorizontal_bias="0.065"
+                    app:layout_constraintBottom_toTopOf="@+id/tvFDRating"
+                    app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -55,288 +58,190 @@
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:paddingStart="@dimen/_5sdp"
-                    android:paddingEnd="@dimen/_5sdp"
                     android:text="Rating: FAAA by CRISIL"
                     android:textColor="@color/light_text"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toTopOf="@+id/tvUploadKYCDocument"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/logo" />
 
                 <TextView
-                    android:id="@+id/tvMakePayment"
+                    android:id="@+id/tvUploadKYCDocument"
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:background="@color/grey_bg"
-                    android:paddingStart="@dimen/_5sdp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:text="Make payment"
+                    android:layout_marginTop="7dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
+                    android:background="@color/grey_text_bg"
+                    android:padding="@dimen/margin_1"
+                    android:text="upload KYC Documents"
                     android:textColor="@color/black"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvFDRating" />
+                    app:drawableEndCompat="@drawable/svg_down_arrow"
+                    app:layout_constraintTop_toBottomOf="@+id/tvFDRating"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent" />
 
                 <TextView
-                    android:id="@+id/lblMakePayment"
+                    android:id="@+id/tvAddressProofType"
                     style="@style/regularStyle"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:paddingStart="0dp"
-                    android:text="Invested Amount"
-                    android:textSize="@dimen/text_size_14"
-                    app:layout_constraintBottom_toTopOf="@id/lblTenure"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
-                    app:layout_constraintVertical_bias="0.0" />
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:layout_marginTop="12dp"
+                    android:text="@string/address_proof_type"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent" />
 
-                <TextView
-                    android:id="@+id/tvInvestedAmount"
-                    style="@style/regularStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_5sdp"
-                    android:layout_marginEnd="@dimen/_7sdp"
-                    android:paddingStart="@dimen/_5sdp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:text="Rs. 50,000"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/text_size_14"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="1.0"
-                    app:layout_constraintStart_toEndOf="@+id/lblMakePayment"
-                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
-                    app:layout_constraintVertical_bias="0.0" />
+                <Spinner
+                    android:id="@+id/spAddressType"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/margin_45"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:background="@drawable/rounded_corner_with_line"
+                    android:entries="@array/address_type"
+                    app:layout_constraintTop_toBottomOf="@+id/tvAddressProofType"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent" />
 
                 <TextView
-                    android:id="@+id/lblTenure"
+                    android:id="@+id/tvAadhaarFront"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:paddingStart="0dp"
-                    android:text="Tenure"
-                    android:textSize="@dimen/text_size_14"
-                    app:layout_constraintBottom_toTopOf="@+id/lblInterestPayout"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/lblMakePayment"
-                    app:layout_constraintVertical_bias="0.0" />
+                    android:text="@string/aadhaar_front"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintStart_toStartOf="@+id/spAddressType"
+                    app:layout_constraintTop_toTopOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintVertical_bias="0.562" />
 
-                <TextView
-                    android:id="@+id/tvTenure"
-                    style="@style/regularStyle"
+                <Button
+                    android:id="@+id/btnAadhaarFrontUpload"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2 Years"
-                    android:paddingStart="@dimen/_5sdp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:layout_marginTop="@dimen/_5sdp"
-                    android:layout_marginEnd="@dimen/_7sdp"
-                    android:layout_marginStart="@dimen/_5sdp"
+                    android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    android:backgroundTint="@color/color_EFEFEF"
+                    android:paddingLeft="@dimen/margin_30"
+                    android:paddingRight="@dimen/margin_30"
+                    android:text="Upload File"
+                    android:textAllCaps="false"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/text_size_14"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintEnd_toEndOf="@+id/spAddressType"
                     app:layout_constraintHorizontal_bias="1.0"
-                    app:layout_constraintStart_toEndOf="@+id/lblTenure"
-                    app:layout_constraintTop_toBottomOf="@+id/tvInvestedAmount"
+                    app:layout_constraintStart_toEndOf="@+id/tvAadhaarFront"
+                    app:layout_constraintTop_toBottomOf="@+id/spAddressType"
                     app:layout_constraintVertical_bias="0.0" />
 
                 <TextView
-                    android:id="@+id/lblInterestPayout"
+                    android:id="@+id/tvAadhaarBack"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:paddingStart="0dp"
-                    android:text="Interest Payout"
-                    android:textSize="@dimen/text_size_14"
-                    app:layout_constraintBottom_toTopOf="@+id/lblRateOfInterest"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/lblTenure"
-                    app:layout_constraintVertical_bias="0.0" />
+                    android:layout_centerVertical="true"
+                    android:text="@string/aadhaar_back"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintStart_toStartOf="@+id/tvAadhaarFront"
+                    app:layout_constraintTop_toTopOf="@+id/btnAadhaarBackUpload" />
 
-                <TextView
-                    android:id="@+id/tvInterestPayout"
-                    style="@style/regularStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="8dp"
-                    android:paddingStart="@dimen/_5sdp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:text="Monthly"
-                    android:textSize="@dimen/text_size_14"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.9"
-                    app:layout_constraintStart_toEndOf="@+id/lblInterestPayout"
-                    app:layout_constraintTop_toBottomOf="@+id/tvTenure"
-                    app:layout_constraintVertical_bias="0.0" />
-
-                <TextView
-                    android:id="@+id/lblRateOfInterest"
-                    style="@style/regularStyle"
+                <Button
+                    android:id="@+id/btnAadhaarBackUpload"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:paddingStart="0dp"
-                    android:text="Rate of Interest"
-                    android:textSize="@dimen/text_size_14"
-                    app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/lblInterestPayout"
-                    app:layout_constraintVertical_bias="0.0" />
+                    android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="8dp"
+                    android:backgroundTint="@color/color_EFEFEF"
+                    android:paddingLeft="@dimen/margin_30"
+                    android:paddingRight="@dimen/margin_30"
+                    android:text="Upload File"
+                    android:textAllCaps="false"
+                    android:textColor="@color/black"
+                    app:layout_constraintBottom_toTopOf="@+id/btnPANUpload"
+                    app:layout_constraintEnd_toEndOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/tvAadhaarBack"
+                    app:layout_constraintTop_toBottomOf="@+id/btnAadhaarFrontUpload" />
 
                 <TextView
-                    android:id="@+id/tvRateOfInterest"
+                    android:id="@+id/tvPAN"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="8dp"
-                    android:paddingStart="@dimen/_5sdp"
-                    android:paddingEnd="@dimen/_5sdp"
-                    android:textSize="@dimen/text_size_14"
-                    android:text="6.75%"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.9"
-                    app:layout_constraintStart_toEndOf="@+id/lblRateOfInterest"
-                    app:layout_constraintTop_toBottomOf="@+id/tvInterestPayout"
-                    app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
-                    app:layout_constraintVertical_bias="0.0" />
-
-                <TextView
-                    android:id="@+id/tvTermsCondition"
-                    style="@style/semiBoldStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="196dp"
-                    android:background="@color/grey_bg"
-                    android:paddingStart="@dimen/margin_10"
-                    android:paddingTop="@dimen/margin_3"
-                    android:paddingEnd="0dp"
-                    android:paddingBottom="@dimen/margin_3"
-                    android:text="Terms &amp; condition"
-                    android:textColor="@color/black"
-                    app:layout_constraintBottom_toTopOf="@+id/swDirectorBajajFinance"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvFDRating" />
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/swDirectorBajajFinance"
-                    style="@style/regularStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:text="Director of Bajaj Finance Ltd."
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvTermsCondition"
-                    app:layout_constraintVertical_bias="0.018" />
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    style="@style/regularStyle"
-                    android:id="@+id/swPromoterBajajFinance"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="Promoter of Bajaj Finance Ltd."
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swDirectorBajajFinance"
-                    app:layout_constraintVertical_bias="0.0" />
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/swRelativeDirector"
-                    style="@style/regularStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="Relative of director or promotor of Bajaj Finance Ltd."
-                    app:layout_constraintEnd_toEndOf="parent"
+                    android:layout_centerVertical="true"
+                    android:text="@string/pan_upload"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnPANUpload"
+                    app:layout_constraintEnd_toStartOf="@+id/btnAadhaarBackUpload"
                     app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swPromoterBajajFinance"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintStart_toStartOf="@+id/tvAadhaarBack"
+                    app:layout_constraintTop_toTopOf="@+id/btnPANUpload"
+                    app:layout_constraintVertical_bias="0.468" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/swShareholder"
-                    style="@style/regularStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="Shareholder of Bajaj Finance Ltd."
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swRelativeDirector" />
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/swPoliticallyExposed"
-                    style="@style/regularStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
+                <Button
+                    android:id="@+id/btnPANUpload"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="6dp"
                     android:layout_marginBottom="8dp"
-                    android:text="Are you a politicallly exposed person"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swShareholder" />
+                    android:backgroundTint="@color/color_EFEFEF"
+                    android:paddingLeft="@dimen/margin_30"
+                    android:paddingRight="@dimen/margin_30"
+                    android:text="Upload File"
+                    android:textAllCaps="false"
+                    android:textColor="@color/black"
+                    app:layout_constraintBottom_toTopOf="@+id/btnPhotoUpload"
+                    app:layout_constraintEnd_toEndOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/tvPAN"
+                    app:layout_constraintTop_toBottomOf="@+id/btnAadhaarBackUpload" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/swCitizen"
+                <TextView
+                    android:id="@+id/tvPhotoUpload"
                     style="@style/regularStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:textSize="@dimen/margin_8"
-                    android:text="I am not a citizen, national or tax resident of any country outside of India"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swPoliticallyExposed"
-                    app:layout_constraintVertical_bias="0.0" />
-
-                <CheckBox
-                    android:id="@+id/checkBox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swCitizen" />
+                    android:layout_centerVertical="true"
+                    android:text="@string/photo_upload"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnPhotoUpload"
+                    app:layout_constraintStart_toStartOf="@+id/tvPAN"
+                    app:layout_constraintTop_toTopOf="@+id/btnPhotoUpload" />
 
-                <TextView
-                    android:id="@+id/tvTermsAndCondition"
-                    android:layout_width="322dp"
-                    android:layout_height="74dp"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginEnd="10dp"
-                    android:text="@string/terms_condition"
+                <Button
+                    android:id="@+id/btnPhotoUpload"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="10dp"
+                    android:backgroundTint="@color/color_EFEFEF"
+                    android:paddingLeft="@dimen/margin_30"
+                    android:paddingRight="@dimen/margin_30"
+                    android:text="Upload File"
+                    android:textAllCaps="false"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/margin_8"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/checkBox"
-                    app:layout_constraintTop_toBottomOf="@+id/swCitizen" />
+                    app:layout_constraintEnd_toEndOf="@+id/btnPANUpload"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/tvPhotoUpload"
+                    app:layout_constraintTop_toBottomOf="@+id/btnPANUpload" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -349,15 +254,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="15dp"
         android:backgroundTint="@color/blue"
         android:text="@string/back"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btnNext"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="0.812" />
+        app:layout_constraintTop_toBottomOf="@+id/scrollView"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnNext"
@@ -365,29 +270,14 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="15dp"
         android:backgroundTint="@color/colorPrimary"
-        android:text="View Order"
+        android:text="@string/next"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/btnBack"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView"
-        app:layout_constraintVertical_bias="0.812" />
-
-    <TextView
-        android:id="@+id/tvOnceClick"
-        style="@style/regularStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/once_you_click"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/btnBack"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintTop_toBottomOf="@+id/scrollView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml
index 1f60a42..0b6e85b 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml
@@ -5,8 +5,9 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
     android:background="@color/Nivesh_color_AppBg"
-    tools:context="com.nivesh.production.bajajfd.ui.fragment.StepThreeFragment">
+    tools:context=".ui.fragment.StepThreeBajajFDFragment">
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scrollView"
@@ -26,229 +27,776 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:foreground="?android:attr/selectableItemBackground"
-            android:padding="@dimen/margin_10"
             app:cardElevation="1dp"
-            app:cardUseCompatPadding="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:cardUseCompatPadding="true">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/childConstraint"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="@dimen/margin_10"
-                android:paddingBottom="@dimen/margin_30">
-
-                <ImageView
-                    android:id="@+id/logo"
-                    android:layout_width="@dimen/margin_150"
-                    android:layout_height="18dp"
-                    android:layout_marginTop="4dp"
-                    android:src="@drawable/bajaj_logo"
-                    app:layout_constraintBottom_toTopOf="@+id/tvFDRating"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    android:contentDescription="@string/content_description"/>
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/tvFDRating"
-                    style="@style/regularStyle"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="Rating: FAAA by CRISIL"
-                    android:textColor="@color/light_text"
-                    android:textSize="@dimen/text_size_12"
-                    app:layout_constraintBottom_toTopOf="@+id/tvUploadKYCDocument"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/logo" />
+                    android:orientation="vertical"
+                    android:padding="10dp">
+
+                    <ImageView
+                        android:id="@+id/logo"
+                        android:layout_width="@dimen/margin_150"
+                        android:layout_height="18dp"
+                        android:src="@drawable/bajaj_logo"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.02"
+                        android:contentDescription="@string/content_description"/>
+
+                    <TextView
+                        android:id="@+id/tvFDRating"
+                        style="@style/regularStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="1dp"
+                        android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
+                        android:textColor="@color/light_text"
+                        android:textSize="@dimen/text_size_12" />
+
+                    <TextView
+                        android:id="@+id/tvNote"
+                        style="@style/regularStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_20"
+                        android:layout_marginBottom="1dp"
+                        android:text="All fields are mandatory other then optional"
+                        android:textColor="@color/light_text"
+                        android:textSize="@dimen/text_size_14" />
+
+                </LinearLayout>
 
                 <TextView
-                    android:id="@+id/tvUploadKYCDocument"
+                    android:id="@+id/tvPersonalDetails"
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="7dp"
                     android:paddingStart="10dp"
                     android:paddingEnd="10dp"
-                    android:background="@color/grey_text_bg"
+                    android:background="@color/grey_bg"
                     android:padding="@dimen/margin_1"
-                    android:text="upload KYC Documents"
+                    android:text="Personal Details"
                     android:textColor="@color/black"
-                    app:drawableEndCompat="@drawable/svg_down_arrow"
-                    app:layout_constraintTop_toBottomOf="@+id/tvFDRating"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvFdRating"
+                    app:drawableEndCompat="@drawable/svg_down_arrow" />
 
-                <TextView
-                    android:id="@+id/tvAddressProofType"
-                    style="@style/regularStyle"
+                <LinearLayout
+                    android:id="@+id/llPersonalDetail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
-                    android:layout_marginTop="12dp"
-                    android:text="@string/address_proof_type"
-                    android:textColor="@color/text_default"
-                    android:textSize="@dimen/text_size_12"
-                    app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent" />
-
-                <Spinner
-                    android:id="@+id/spAddressType"
+                    android:padding="@dimen/margin_10"
+                    android:orientation="vertical">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlMobileNumber"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:hint="Enter Mobile Number">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="phone"
+                            android:maxEms="10" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlDOB"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:hint="Date Of Birth">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawableEnd="@drawable/svg_cal"
+                            android:inputType="date" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlPanNumber"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:layout_marginTop="5dp"
+                        android:hint="Enter PAN Number">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:maxEms="10" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <Spinner
+                        android:id="@+id/spDuration"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:layout_marginTop="5dp"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:minHeight="48dp"
+                        android:paddingStart="@dimen/margin_10"
+                        android:paddingEnd="0dp"
+                        android:entries="@array/title"/>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlFirstName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:hint="Enter First Name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="40" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlMiddleName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:layout_marginTop="5dp"
+                        android:hint="@string/middle_name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="40" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlLastName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:hint="Enter Last Name"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="40" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <Spinner
+                        android:id="@+id/spGender"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:minHeight="48dp"
+                        android:paddingStart="@dimen/margin_10"
+                        android:paddingEnd="0dp"
+                        android:entries="@array/gender" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlEmail"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:hint="Enter Email Address">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="textEmailAddress"
+                            android:maxEms="50" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlOccupation"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:hint="Enter Occupation">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="60" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlQualification"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:hint="Enter Qualification">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="60" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <Spinner
+                        android:id="@+id/spMarital"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:minHeight="48dp"
+                        android:paddingStart="@dimen/margin_10"
+                        android:paddingEnd="0dp"
+                        android:entries="@array/maritalStatus"/>
+
+                    <Spinner
+                        android:id="@+id/spRelation"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:minHeight="48dp"
+                        android:entries="@array/interestPayoutList" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlRelationName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="Relation Name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlAddressLine1"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="Enter Address 1">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlAddressLine2"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="Enter Address 2">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlArea"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="Area">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="200" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlCountry"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="Country">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="200" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlState"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="State">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlCity"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="City">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlPinCode"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="PinCode">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="6" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                </LinearLayout>
+
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/margin_45"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:background="@drawable/rounded_corner_with_line"
-                    android:entries="@array/address_type"
-                    app:layout_constraintTop_toBottomOf="@+id/tvAddressProofType"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent" />
+                    android:layout_height="wrap_content"
+                    android:background="@color/grey_bg">
 
-                <TextView
-                    android:id="@+id/tvAadhaarFront"
-                    style="@style/regularStyle"
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:id="@+id/tvNomineeDetails"
+                        style="@style/semiBoldStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/margin_3"
+                        android:layout_centerVertical="true"
+                        android:text="Nominee Details"
+                        android:textColor="@color/black" />
+
+                    <androidx.appcompat.widget.SwitchCompat
+                        android:theme="@style/SCBSwitch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginEnd="@dimen/margin_5"/>
+
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:id="@+id/llNomineeDetail"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/aadhaar_front"
-                    android:textColor="@color/text_default"
-                    android:textSize="@dimen/text_size_12"
-                    app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarFrontUpload"
-                    app:layout_constraintStart_toStartOf="@+id/spAddressType"
-                    app:layout_constraintTop_toTopOf="@+id/btnAadhaarFrontUpload"
-                    app:layout_constraintVertical_bias="0.562" />
-
-                <Button
-                    android:id="@+id/btnAadhaarFrontUpload"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="8dp"
-                    android:backgroundTint="@color/color_EFEFEF"
-                    android:paddingLeft="@dimen/margin_30"
-                    android:paddingRight="@dimen/margin_30"
-                    android:text="Upload File"
-                    android:textAllCaps="false"
-                    android:textColor="@color/black"
-                    app:layout_constraintBottom_toTopOf="@+id/btnAadhaarBackUpload"
-                    app:layout_constraintEnd_toEndOf="@+id/spAddressType"
-                    app:layout_constraintHorizontal_bias="1.0"
-                    app:layout_constraintStart_toEndOf="@+id/tvAadhaarFront"
-                    app:layout_constraintTop_toBottomOf="@+id/spAddressType"
-                    app:layout_constraintVertical_bias="0.0" />
+                    android:layout_margin="@dimen/margin_5"
+                    android:padding="@dimen/margin_10"
+                    android:orientation="vertical">
+
+                    <Spinner
+                        android:id="@+id/spTitle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:minHeight="48dp"
+                        android:entries="@array/interestPayoutList" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlNomineeFirstName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Nominee First Name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlNomineeMiddleName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/nominee_middle_name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlNomineeLastName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Nominee Last Name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlNomineeDOB"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Nominee Date Of Birth">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawableEnd="@drawable/svg_cal"
+                            android:inputType="date" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <Spinner
+                        android:id="@+id/spNomineeRelation"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_5"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:minHeight="48dp"
+                        android:entries="@array/interestPayoutList" />
+
+                    <CheckBox
+                        android:id="@+id/cbNomineeSameAddress"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Nominee address is same as Primary Applicant’s address"
+                        android:textSize="@dimen/text_size_10" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/TLGuardianName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/guardian_name_optional">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="60" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlGuardianAge"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/guardian_age_optional">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="60" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <Spinner
+                        android:id="@+id/spGuardianRelation"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_5"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:minHeight="48dp"
+                        android:entries="@array/interestPayoutList" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlGuardianAddress"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/guardian_address_optional">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="60" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlGuardianPinCode"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/guardian_pinCode_optional">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="60" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                </LinearLayout>
 
                 <TextView
-                    android:id="@+id/tvAadhaarBack"
-                    style="@style/regularStyle"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tvBankDetails"
+                    style="@style/semiBoldStyle"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:text="@string/aadhaar_back"
-                    android:textColor="@color/text_default"
-                    android:textSize="@dimen/text_size_12"
-                    app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarBackUpload"
-                    app:layout_constraintStart_toStartOf="@+id/tvAadhaarFront"
-                    app:layout_constraintTop_toTopOf="@+id/btnAadhaarBackUpload" />
-
-                <Button
-                    android:id="@+id/btnAadhaarBackUpload"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginBottom="8dp"
-                    android:backgroundTint="@color/color_EFEFEF"
-                    android:paddingLeft="@dimen/margin_30"
-                    android:paddingRight="@dimen/margin_30"
-                    android:text="Upload File"
-                    android:textAllCaps="false"
+                    android:layout_marginTop="22dp"
+                    android:background="@color/grey_bg"
+                    android:padding="@dimen/margin_3"
+                    android:text="Bank Details"
                     android:textColor="@color/black"
-                    app:layout_constraintBottom_toTopOf="@+id/btnPANUpload"
-                    app:layout_constraintEnd_toEndOf="@+id/btnAadhaarFrontUpload"
-                    app:layout_constraintHorizontal_bias="1.0"
-                    app:layout_constraintStart_toEndOf="@+id/tvAadhaarBack"
-                    app:layout_constraintTop_toBottomOf="@+id/btnAadhaarFrontUpload" />
+                    app:drawableRightCompat="@drawable/svg_down_arrow" />
 
-                <TextView
-                    android:id="@+id/tvPAN"
-                    style="@style/regularStyle"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/llBankDetails"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:text="@string/pan_upload"
-                    android:textColor="@color/text_default"
-                    android:textSize="@dimen/text_size_12"
-                    app:layout_constraintBottom_toBottomOf="@+id/btnPANUpload"
-                    app:layout_constraintEnd_toStartOf="@+id/btnAadhaarBackUpload"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="@+id/tvAadhaarBack"
-                    app:layout_constraintTop_toTopOf="@+id/btnPANUpload"
-                    app:layout_constraintVertical_bias="0.468" />
-
-                <Button
-                    android:id="@+id/btnPANUpload"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginBottom="8dp"
-                    android:backgroundTint="@color/color_EFEFEF"
-                    android:paddingLeft="@dimen/margin_30"
-                    android:paddingRight="@dimen/margin_30"
-                    android:text="Upload File"
-                    android:textAllCaps="false"
-                    android:textColor="@color/black"
-                    app:layout_constraintBottom_toTopOf="@+id/btnPhotoUpload"
-                    app:layout_constraintEnd_toEndOf="@+id/btnAadhaarBackUpload"
-                    app:layout_constraintHorizontal_bias="1.0"
-                    app:layout_constraintStart_toEndOf="@+id/tvPAN"
-                    app:layout_constraintTop_toBottomOf="@+id/btnAadhaarBackUpload" />
+                    android:layout_margin="@dimen/margin_5"
+                    android:padding="@dimen/margin_10"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tvAccountType"
+                        style="@style/regularStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:padding="@dimen/margin_3"
+                        android:text="Account type *"
+                        android:textColor="@color/black"
+                        app:layout_constraintTop_toBottomOf="@+id/tvFdRating"
+                        tools:layout_editor_absoluteX="5dp" />
+
+                    <RadioGroup
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Savings account" />
+
+                        <RadioButton
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="50dp"
+                            android:text="Current account" />
+
+                    </RadioGroup>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlIFSC"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_8"
+                        android:layout_marginBottom="@dimen/margin_8"
+                        android:hint="Enter IFSC Code">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlAccountNumber"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_8"
+                        android:layout_marginBottom="@dimen/margin_8"
+                        android:hint="Enter Account Number">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlBankName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_8"
+                        android:layout_marginBottom="@dimen/margin_8"
+                        android:hint="Enter Bank Name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlBankBranchName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_8"
+                        android:layout_marginBottom="@dimen/margin_8"
+                        android:hint="Enter Branch Name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="26dp"
+                    android:background="@color/grey_bg">
+
+                    <TextView
+                        android:id="@+id/tvPaymentMode"
+                        style="@style/semiBoldStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginTop="12dp"
+                        android:padding="@dimen/margin_3"
+                        android:text="Payment mode"
+                        android:textColor="@color/black"
+                        tools:layout_editor_absoluteX="5dp" />
+
+                    <TextView
+                        style="@style/regularStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginTop="12dp"
+                        android:padding="@dimen/margin_3"
+                        android:text="Eligible bank option"
+                        android:textColor="@color/blue_text_color"
+                        tools:layout_editor_absoluteX="5dp" />
+
+                </RelativeLayout>
+
+                <RadioGroup
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_10"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="UPI" />
+
+                    <RadioButton
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="50dp"
+                        android:text="NetBanking" />
+
+                </RadioGroup>
 
                 <TextView
-                    android:id="@+id/tvPhotoUpload"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:text="@string/photo_upload"
-                    android:textColor="@color/text_default"
-                    android:textSize="@dimen/text_size_12"
-                    app:layout_constraintBottom_toBottomOf="@+id/btnPhotoUpload"
-                    app:layout_constraintStart_toStartOf="@+id/tvPAN"
-                    app:layout_constraintTop_toTopOf="@+id/btnPhotoUpload" />
-
-                <Button
-                    android:id="@+id/btnPhotoUpload"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="10dp"
-                    android:backgroundTint="@color/color_EFEFEF"
-                    android:paddingLeft="@dimen/margin_30"
-                    android:paddingRight="@dimen/margin_30"
-                    android:text="Upload File"
-                    android:textAllCaps="false"
-                    android:textColor="@color/black"
-                    app:layout_constraintEnd_toEndOf="@+id/btnPANUpload"
-                    app:layout_constraintHorizontal_bias="1.0"
-                    app:layout_constraintStart_toEndOf="@+id/tvPhotoUpload"
-                    app:layout_constraintTop_toBottomOf="@+id/btnPANUpload" />
+                    android:layout_marginTop="12dp"
+                    android:padding="@dimen/margin_3"
+                    android:text="Upto Rs. 1 lakh only"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginBottom="@dimen/margin_20"
+                    android:textColor="@color/gray_text_color"
+                    tools:layout_editor_absoluteX="5dp" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
 
         </com.google.android.material.card.MaterialCardView>
 
+
     </androidx.core.widget.NestedScrollView>
 
+    <include
+        android:id="@+id/bankDetail"
+        layout="@layout/bank_detail_select"
+        android:visibility="gone"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnBack"
         android:layout_width="wrap_content"
@@ -262,14 +810,13 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btnNext"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView"/>
+        app:layout_constraintTop_toBottomOf="@+id/scrollView" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnNext"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="15dp"
         android:backgroundTint="@color/colorPrimary"
@@ -278,6 +825,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/btnBack"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView" />
+        app:layout_constraintTop_toBottomOf="@+id/scrollView"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_one.xml b/app/src/main/res/layout/fragment_step_one.xml
deleted file mode 100644
index 301bf67..0000000
--- a/app/src/main/res/layout/fragment_step_one.xml
+++ /dev/null
@@ -1,830 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/constraintLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center_vertical"
-    android:background="@color/Nivesh_color_AppBg"
-    tools:context=".ui.fragment.StepTwoFragment">
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="80dp"
-        android:background="@color/Nivesh_color_AppBg"
-        android:fillViewport="true"
-        android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnNext">
-
-        <com.google.android.material.card.MaterialCardView
-            style="@style/CustomCardViewStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:foreground="?android:attr/selectableItemBackground"
-            app:cardElevation="1dp"
-            app:cardUseCompatPadding="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="10dp">
-
-                    <ImageView
-                        android:id="@+id/logo"
-                        android:layout_width="@dimen/margin_150"
-                        android:layout_height="18dp"
-                        android:src="@drawable/bajaj_logo"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.02"
-                        android:contentDescription="@string/content_description"/>
-
-                    <TextView
-                        android:id="@+id/tvFDRating"
-                        style="@style/regularStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="1dp"
-                        android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
-                        android:textColor="@color/light_text"
-                        android:textSize="@dimen/text_size_12" />
-
-                    <TextView
-                        android:id="@+id/tvNote"
-                        style="@style/regularStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_20"
-                        android:layout_marginBottom="1dp"
-                        android:text="All fields are mandatory other then optional"
-                        android:textColor="@color/light_text"
-                        android:textSize="@dimen/text_size_14" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/tvPersonalDetails"
-                    style="@style/semiBoldStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:background="@color/grey_bg"
-                    android:padding="@dimen/margin_1"
-                    android:text="Personal Details"
-                    android:textColor="@color/black"
-                    app:layout_constraintTop_toBottomOf="@+id/tvFdRating"
-                    app:drawableEndCompat="@drawable/svg_down_arrow" />
-
-                <LinearLayout
-                    android:id="@+id/llPersonalDetail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/margin_10"
-                    android:orientation="vertical">
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlMobileNumber"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Mobile Number">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="phone"
-                            android:maxEms="10" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlDOB"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Date Of Birth">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:drawableEnd="@drawable/svg_cal"
-                            android:inputType="date" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlPanNumber"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_marginTop="5dp"
-                        android:hint="Enter PAN Number">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:maxEms="10" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <Spinner
-                        android:id="@+id/spDuration"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_marginTop="5dp"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:minHeight="48dp"
-                        android:paddingStart="@dimen/margin_10"
-                        android:paddingEnd="0dp"
-                        android:entries="@array/title"/>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlFirstName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter First Name">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="40" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlMiddleName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_marginTop="5dp"
-                        android:hint="@string/middle_name">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="40" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlLastName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Last Name"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="40" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <Spinner
-                        android:id="@+id/spGender"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:minHeight="48dp"
-                        android:paddingStart="@dimen/margin_10"
-                        android:paddingEnd="0dp"
-                        android:entries="@array/gender" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlEmail"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Email Address">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textEmailAddress"
-                            android:maxEms="50" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlOccupation"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Occupation">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlQualification"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Qualification">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <Spinner
-                        android:id="@+id/spMarital"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:minHeight="48dp"
-                        android:paddingStart="@dimen/margin_10"
-                        android:paddingEnd="0dp"
-                        android:entries="@array/maritalStatus"/>
-
-                    <Spinner
-                        android:id="@+id/spRelation"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:minHeight="48dp"
-                        android:entries="@array/interestPayoutList" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlRelationName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Relation Name">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlAddressLine1"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Address 1">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlAddressLine2"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Address 2">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlArea"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Area">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="200" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlCountry"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Country">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="200" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlState"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="State">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlCity"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="City">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlPinCode"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="PinCode">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="6" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                </LinearLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/grey_bg">
-
-                    <TextView
-                        android:id="@+id/tvNomineeDetails"
-                        style="@style/semiBoldStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/margin_3"
-                        android:layout_centerVertical="true"
-                        android:text="Nominee Details"
-                        android:textColor="@color/black" />
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:theme="@style/SCBSwitch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginEnd="@dimen/margin_5"/>
-
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:id="@+id/llNomineeDetail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/margin_5"
-                    android:padding="@dimen/margin_10"
-                    android:orientation="vertical">
-
-                    <Spinner
-                        android:id="@+id/spTitle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:minHeight="48dp"
-                        android:entries="@array/interestPayoutList" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlNomineeFirstName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="Nominee First Name">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlNomineeMiddleName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/nominee_middle_name">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlNomineeLastName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="Nominee Last Name">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlNomineeDOB"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="Nominee Date Of Birth">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:drawableEnd="@drawable/svg_cal"
-                            android:inputType="date" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <Spinner
-                        android:id="@+id/spNomineeRelation"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_5"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:minHeight="48dp"
-                        android:entries="@array/interestPayoutList" />
-
-                    <CheckBox
-                        android:id="@+id/cbNomineeSameAddress"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Nominee address is same as Primary Applicant’s address"
-                        android:textSize="@dimen/text_size_10" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/TLGuardianName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/guardian_name_optional">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlGuardianAge"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/guardian_age_optional">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <Spinner
-                        android:id="@+id/spGuardianRelation"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_5"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:minHeight="48dp"
-                        android:entries="@array/interestPayoutList" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlGuardianAddress"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/guardian_address_optional">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlGuardianPinCode"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/guardian_pinCode_optional">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/tvBankDetails"
-                    style="@style/semiBoldStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="22dp"
-                    android:background="@color/grey_bg"
-                    android:padding="@dimen/margin_3"
-                    android:text="Bank Details"
-                    android:textColor="@color/black"
-                    app:drawableRightCompat="@drawable/svg_down_arrow" />
-
-                <LinearLayout
-                    android:id="@+id/llBankDetails"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/margin_5"
-                    android:padding="@dimen/margin_10"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/tvAccountType"
-                        style="@style/regularStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:padding="@dimen/margin_3"
-                        android:text="Account type *"
-                        android:textColor="@color/black"
-                        app:layout_constraintTop_toBottomOf="@+id/tvFdRating"
-                        tools:layout_editor_absoluteX="5dp" />
-
-                    <RadioGroup
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <RadioButton
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="Savings account" />
-
-                        <RadioButton
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="50dp"
-                            android:text="Current account" />
-
-                    </RadioGroup>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlIFSC"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_8"
-                        android:layout_marginBottom="@dimen/margin_8"
-                        android:hint="Enter IFSC Code">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlAccountNumber"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_8"
-                        android:layout_marginBottom="@dimen/margin_8"
-                        android:hint="Enter Account Number">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlBankName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_8"
-                        android:layout_marginBottom="@dimen/margin_8"
-                        android:hint="Enter Bank Name">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tlBankBranchName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_8"
-                        android:layout_marginBottom="@dimen/margin_8"
-                        android:hint="Enter Branch Name">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-
-                </LinearLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="26dp"
-                    android:background="@color/grey_bg">
-
-                    <TextView
-                        android:id="@+id/tvPaymentMode"
-                        style="@style/semiBoldStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginTop="12dp"
-                        android:padding="@dimen/margin_3"
-                        android:text="Payment mode"
-                        android:textColor="@color/black"
-                        tools:layout_editor_absoluteX="5dp" />
-
-                    <TextView
-                        style="@style/regularStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        android:layout_marginTop="12dp"
-                        android:padding="@dimen/margin_3"
-                        android:text="Eligible bank option"
-                        android:textColor="@color/blue_text_color"
-                        tools:layout_editor_absoluteX="5dp" />
-
-                </RelativeLayout>
-
-                <RadioGroup
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_10"
-                    android:orientation="horizontal">
-
-                    <RadioButton
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="UPI" />
-
-                    <RadioButton
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="50dp"
-                        android:text="NetBanking" />
-
-                </RadioGroup>
-
-                <TextView
-                    style="@style/regularStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:padding="@dimen/margin_3"
-                    android:text="Upto Rs. 1 lakh only"
-                    android:layout_marginStart="@dimen/margin_15"
-                    android:layout_marginBottom="@dimen/margin_20"
-                    android:textColor="@color/gray_text_color"
-                    tools:layout_editor_absoluteX="5dp" />
-
-            </LinearLayout>
-
-        </com.google.android.material.card.MaterialCardView>
-
-
-    </androidx.core.widget.NestedScrollView>
-
-    <include
-        android:id="@+id/bankDetail"
-        layout="@layout/bank_detail_select"
-        android:visibility="gone"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnBack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="15dp"
-        android:backgroundTint="@color/blue"
-        android:text="@string/back"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnNext"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="15dp"
-        android:backgroundTint="@color/colorPrimary"
-        android:text="@string/next"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/btnBack"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file