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 3758c57..19649e6 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
@@ -52,12 +52,12 @@ class BajajFdMainActivity : BaseActivity() {
     var nomineeDetails: NomineeDetails = NomineeDetails()
     var nomineeGuardianDetails: NomineeGuardianDetails = NomineeGuardianDetails()
     var getClientDetailsResponse: getClientDetailsResponse = getClientDetailsResponse()
-    var UniqueId: String = ""
+    var uniqueId: String = ""
     private var stepCount: Int = 0
     private lateinit var sectionsPagerAdapter: SectionsPagerAdapter
     private lateinit var fragments: Array<Fragment>
     var dialogWebView: Dialog? = null
-    var LoginRole: Int = 0
+    var loginRole: Int = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -75,7 +75,7 @@ class BajajFdMainActivity : BaseActivity() {
             FDModelProviderFactory(MainRepository(ApiClient.getApiClient))
         )[BajajFDViewModel::class.java]
 
-        LoginRole = 5
+        loginRole = 5
         if (Common.isNetworkAvailable(this)) {
             getStepsCountApi()
         }
@@ -150,7 +150,7 @@ class BajajFdMainActivity : BaseActivity() {
             userRequest.IPAddress = ""
             userRequest.Source = getString(R.string.source)
             userRequest.AppOrWeb = getString(R.string.app)
-            userRequest.LoggedInRoleId = LoginRole
+            userRequest.LoggedInRoleId = loginRole
 
             val deviceInfo = DeviceInfo()
             deviceInfo.device_id = ""
@@ -431,7 +431,7 @@ class BajajFdMainActivity : BaseActivity() {
     fun paymentReQueryApi() {
         if (Common.isNetworkAvailable(this)) {
             val paymentReQueryRequest = PaymentReQueryRequest()
-            paymentReQueryRequest.UniqueId = UniqueId
+            paymentReQueryRequest.UniqueId = uniqueId
             paymentReQueryRequest.NiveshClientCode =
                 getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
             viewModel.getPaymentReQuery(paymentReQueryRequest, token, this)
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
index 8ca4229..0b8ea91 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
@@ -55,7 +55,7 @@ class StepFourBajajFDFragment : BaseFragment() {
 
         }
 
-        if ((activity as BajajFdMainActivity).LoginRole == 5) {
+        if ((activity as BajajFdMainActivity).loginRole == 5) {
            binding.btnNext.text = getString(R.string.pay)
            binding.btnNext.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.green, null))
         }else{
@@ -64,7 +64,7 @@ class StepFourBajajFDFragment : BaseFragment() {
         }
 
         binding.btnNext.setOnClickListener {
-            if ((activity as BajajFdMainActivity).LoginRole == 5) {
+            if ((activity as BajajFdMainActivity).loginRole == 5) {
                 selectedList = ""
                 for (getCodes in listOfCustomer) {
                     if (getCodes.isSelected) {
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
index b097ecf..f52a906 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
@@ -531,7 +531,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                         .plus(binding.edtLastName.text.toString()),
                     binding.edtMobileNumber.text.toString(),
                     1
-                )
+                , (activity as BajajFdMainActivity).loginRole)
             }
         }
 
@@ -741,7 +741,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                     createFDApplicationResponse.Response.StatusCode.let { code ->
                         when (code) {
                             200 -> {
-                                (activity as BajajFdMainActivity).UniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
+                                (activity as BajajFdMainActivity).uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
                                 (activity as BajajFdMainActivity).stepTwoApi(
                                     createFDApplicationResponse
                                 )
@@ -878,14 +878,14 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
     private fun verifyAccountNo(
         bankAccount: String, Ifsc: String, name: String, phoneNumber: String, bankNo: Int
-    ) {
+    ,loginRole : Int) {
 
         val bankValidationApiRequest = BankValidationApiRequest()
         bankValidationApiRequest.BankAccountNo = bankAccount
         bankValidationApiRequest.IFSC = Ifsc
         bankValidationApiRequest.Name = name
         bankValidationApiRequest.PhoneNo = phoneNumber
-        bankValidationApiRequest.RoleId = 5
+        bankValidationApiRequest.RoleId = loginRole
         bankValidationApiRequest.BankNo = bankNo
         stepTwoBajajFDViewModel.bankValidationApi(
             bankValidationApiRequest,
@@ -1647,7 +1647,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
         cityRequest.Type = ""
         cityRequest.ClientCode =
             (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
-        cityRequest.RoleID = 5
+        cityRequest.RoleID = (activity as BajajFdMainActivity).loginRole
         cityRequest.APIName = ""
         cityRequest.UID = 19060
         cityRequest.Subbroker_Code =