updated

Author: revanthkumarJ

core/designsystem/src/androidMain/kotlin/com/mifos/core/designsystem/component/MifosPermissionBox.android.kt

@@ -132,20 +132,18 @@ actual fun PermissionBox(
         },
     )
 
-    if (shouldShowPermissionRationale) {
-        MifosDialogBox(
-            showDialogState = true,
-            onDismiss = { shouldShowPermissionRationale = false },
-            title = title,
-            message = description,
-            confirmButtonText = confirmButtonText,
-            onConfirm = {
-                shouldShowPermissionRationale = false
-                multiplePermissionLauncher.launch(requiredPermissions.toTypedArray())
-            },
-            dismissButtonText = dismissButtonText,
-        )
-    }
+    MifosDialogBox(
+        showDialogState = shouldShowPermissionRationale,
+        onDismiss = { shouldShowPermissionRationale = false },
+        title = title,
+        message = description,
+        confirmButtonText = confirmButtonText,
+        onConfirm = {
+            shouldShowPermissionRationale = false
+            multiplePermissionLauncher.launch(requiredPermissions.toTypedArray())
+        },
+        dismissButtonText = dismissButtonText,
+    )
 
     if (shouldDirectUserToApplicationSettings) {
         Intent(

feature/report/src/commonMain/kotlin/com/mifos/feature/report/report/ReportScreen.kt

@@ -10,7 +10,6 @@
 package com.mifos.feature.report.report
 
 import androidclient.feature.report.generated.resources.Res
-import androidclient.feature.report.generated.resources.feature_report_dismiss
 import androidclient.feature.report.generated.resources.feature_report_export_csv
 import androidclient.feature.report.generated.resources.feature_report_external_approve_permission_description
 import androidclient.feature.report.generated.resources.feature_report_permission_required
@@ -77,7 +76,7 @@ fun ReportScreen(
             title = stringResource(Res.string.feature_report_permission_required),
             description = stringResource(Res.string.feature_report_external_approve_permission_description),
             confirmButtonText = stringResource(Res.string.feature_report_proceed),
-            dismissButtonText = stringResource(Res.string.feature_report_dismiss),
+            dismissButtonText = "",
             onGranted = {
                 LaunchedEffect(key1 = Unit) {
                     scope.launch {

feature/report/src/commonMain/kotlin/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt

@@ -67,6 +67,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import co.touchlab.kermit.Logger
 import com.mifos.core.common.utils.Constants
 import com.mifos.core.designsystem.component.MifosCircularProgress
 import com.mifos.core.designsystem.component.MifosScaffold
@@ -295,6 +296,11 @@ private fun RunReportContent(
     runReportDetail: SnapshotStateMap<String, String>,
     modifier: Modifier = Modifier,
 ) {
+    LaunchedEffect(true) {
+        Logger.e("Revanth") {
+            loanPurposeList.toString()
+        }
+    }
     val firstOffice = officeList.firstOrNull()?.row?.getOrNull(1) ?: ""
     val firstOfficeId = officeList.firstOrNull()?.row?.getOrNull(0) ?: ""
     val firstOfficer = reportOffices.firstOrNull()?.row?.getOrNull(1) ?: ""
@@ -481,7 +487,8 @@ private fun RunReportContent(
                     selectedLoanPurposeId = loanPurposeList.getOrNull(index)?.row?.getOrNull(0) ?: ""
                 },
                 label = stringResource(Res.string.feature_report_loan_purpose),
-                options = loanPurposeList.mapNotNull { it.row.getOrNull(1) },
+                options = loanPurposeList.mapNotNull { it.row.getOrNull(1) }
+                    .filter { !it.contains("-") },
                 readOnly = true,
             )
             Spacer(modifier = Modifier.height(16.dp))