fix : Home Screen Faq still navigating to old ui screen (#2921)

Author: revanthkumarJ

cmp-navigation/src/commonMain/kotlin/cmp/navigation/authenticated/AuthenticatedNavigation.kt

@@ -22,8 +22,6 @@ import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.common.Constants
 import org.mifos.mobile.core.model.entity.TransferSuccessDestination
-import org.mifos.mobile.core.ui.utils.ShareUtils.callHelpline
-import org.mifos.mobile.core.ui.utils.ShareUtils.mailHelpline
 import org.mifos.mobile.feature.accounts.accountTransactions.accountTransactionsDestination
 import org.mifos.mobile.feature.accounts.accountTransactions.navigateToAccountTransactionsScreen
 import org.mifos.mobile.feature.accounts.accounts.accountsDestination
@@ -36,14 +34,11 @@ import org.mifos.mobile.feature.beneficiary.navigation.navigateToBeneficiaryNavG
 import org.mifos.mobile.feature.charge.charges.navigateToClientChargeScreen
 import org.mifos.mobile.feature.charge.navigation.clientChargeNavGraph
 import org.mifos.mobile.feature.charge.navigation.navigateToChargeGraph
-import org.mifos.mobile.feature.help.navigation.helpNavGraph
-import org.mifos.mobile.feature.help.navigation.navigateToHelpScreen
 import org.mifos.mobile.feature.loan.application.navigation.loanApplicationNavGraph
 import org.mifos.mobile.feature.loan.application.navigation.navigateToLoanApplicationGraph
 import org.mifos.mobile.feature.loanaccount.loanAccountDetails.navigateToLoanAccountDetailsScreen
 import org.mifos.mobile.feature.loanaccount.navigation.loanNavGraph
 import org.mifos.mobile.feature.location.navigation.locationsNavGraph
-import org.mifos.mobile.feature.location.navigation.navigateToLocationsScreen
 import org.mifos.mobile.feature.notification.navigation.navigateToNotificationScreen
 import org.mifos.mobile.feature.notification.navigation.notificationDestination
 import org.mifos.mobile.feature.passcode.navigation.PasscodeRoute
@@ -87,7 +82,6 @@ internal fun NavGraphBuilder.authenticatedGraph(
                 }
             },
             navigateToChargeScreen = navController::navigateToChargeGraph,
-            navigateToFaqScreen = navController::navigateToHelpScreen,
             navigateToBeneficiaryScreen = navController::navigateToBeneficiaryNavGraph,
             navigateToTransactionScreen = {
                 navController.navigateToAccountTransactionsScreen(Constants.RECENT_TRANSACTIONS, -1L)
@@ -169,13 +163,6 @@ internal fun NavGraphBuilder.authenticatedGraph(
 
         locationsNavGraph()
 
-        helpNavGraph(
-            findLocations = navController::navigateToLocationsScreen,
-            navigateBack = navController::popBackStack,
-            callHelpline = { callHelpline() },
-            mailHelpline = { mailHelpline() },
-        )
-
         recentTransactionNavGraph(
             navController = navController,
         )

cmp-navigation/src/commonMain/kotlin/cmp/navigation/authenticatednavbar/AuthenticatedNavbarNavigation.kt

@@ -28,7 +28,6 @@ internal fun NavGraphBuilder.authenticatedNavbarGraph(
     navigateToNotificationScreen: () -> Unit,
     navigateToAccountsScreen: (String) -> Unit,
     navigateToChargeScreen: () -> Unit,
-    navigateToFaqScreen: () -> Unit,
     navigateToBeneficiaryScreen: () -> Unit,
     navigateToTransactionScreen: () -> Unit,
     navigateToApplyLoanScreen: () -> Unit,
@@ -38,7 +37,6 @@ internal fun NavGraphBuilder.authenticatedNavbarGraph(
             navigateToNotificationScreen = navigateToNotificationScreen,
             navigateToAccountsScreen = { navigateToAccountsScreen(it) },
             navigateToChargeScreen = navigateToChargeScreen,
-            navigateToFaqScreen = navigateToFaqScreen,
             navigateToBeneficiaryScreen = navigateToBeneficiaryScreen,
             navigateToTransactionScreen = navigateToTransactionScreen,
             navigateToApplyLoanScreen = navigateToApplyLoanScreen,

cmp-navigation/src/commonMain/kotlin/cmp/navigation/authenticatednavbar/AuthenticatedNavbarNavigationScreen.kt

@@ -43,6 +43,7 @@ import org.mifos.mobile.core.ui.utils.EventsEffect
 import org.mifos.mobile.feature.home.navigation.HomeRoute
 import org.mifos.mobile.feature.home.navigation.homeDestination
 import org.mifos.mobile.feature.home.navigation.navigateToHomeScreen
+import org.mifos.mobile.feature.settings.faq.navigateToFaq
 import org.mifos.mobile.feature.settings.navigation.navigateToSettingsGraph
 import org.mifos.mobile.feature.settings.navigation.settingsGraph
 import org.mifos.mobile.navigation.generated.resources.Res
@@ -53,7 +54,6 @@ internal fun AuthenticatedNavbarNavigationScreen(
     navigateToNotificationScreen: () -> Unit,
     navigateToAccountsScreen: (String) -> Unit,
     navigateToChargeScreen: () -> Unit,
-    navigateToFaqScreen: () -> Unit,
     navigateToBeneficiaryScreen: () -> Unit,
     navigateToTransactionScreen: () -> Unit,
     navigateToApplyLoanScreen: () -> Unit,
@@ -110,7 +110,6 @@ internal fun AuthenticatedNavbarNavigationScreen(
         navigateToNotificationScreen = navigateToNotificationScreen,
         navigateToAccountsScreen = { navigateToAccountsScreen(it) },
         navigateToChargeScreen = navigateToChargeScreen,
-        navigateToFaqScreen = navigateToFaqScreen,
         navigateToBeneficiaryScreen = navigateToBeneficiaryScreen,
         navigateToTransactionScreen = navigateToTransactionScreen,
         navigateToApplyLoanScreen = navigateToApplyLoanScreen,
@@ -123,7 +122,6 @@ internal fun AuthenticatedNavbarNavigationScreenContent(
     navigateToNotificationScreen: () -> Unit,
     navigateToAccountsScreen: (String) -> Unit,
     navigateToChargeScreen: () -> Unit,
-    navigateToFaqScreen: () -> Unit,
     navigateToBeneficiaryScreen: () -> Unit,
     navigateToTransactionScreen: () -> Unit,
     navigateToApplyLoanScreen: () -> Unit,
@@ -187,7 +185,7 @@ internal fun AuthenticatedNavbarNavigationScreenContent(
                 navigateToAccountsScreen = { navigateToAccountsScreen(it) },
                 navigateToChargeScreen = navigateToChargeScreen,
                 navigateToNotificationScreen = navigateToNotificationScreen,
-                navigateToFaqScreen = navigateToFaqScreen,
+                navigateToFaqScreen = navController::navigateToFaq,
                 navigateToBeneficiaryScreen = navigateToBeneficiaryScreen,
                 navigateToTransactionScreen = navigateToTransactionScreen,
                 navigateToApplyLoanScreen = navigateToApplyLoanScreen,

feature/settings/src/commonMain/kotlin/org/mifos/mobile/feature/settings/faq/FaqNavigation.kt

@@ -26,5 +26,5 @@ internal fun NavGraphBuilder.faqDestination(
         )
     }
 }
-internal fun NavController.navigateToFaq(navOptions: NavOptions? = null) =
+fun NavController.navigateToFaq(navOptions: NavOptions? = null) =
     navigate(SettingsItems.FAQ, navOptions)

feature/settings/src/commonMain/kotlin/org/mifos/mobile/feature/settings/faq/FaqScreen.kt

@@ -102,13 +102,14 @@ private fun FaqContent(
     onAction: (FaqAction) -> Unit,
 ) {
     Column(
-        modifier = Modifier.fillMaxSize().padding(vertical = DesignToken.padding.extraLarge),
+        modifier = Modifier.fillMaxSize(),
     ) {
         if (faqArrayList.isNotEmpty()) {
             LazyColumn(
                 modifier = Modifier.weight(1f).fillMaxWidth()
-                    .padding(horizontal = DesignToken.padding.extraLarge),
-                verticalArrangement = Arrangement.spacedBy(8.dp),
+                    .padding(horizontal = DesignToken.padding.large)
+                    .padding(top = DesignToken.padding.extraLarge),
+                verticalArrangement = Arrangement.spacedBy(DesignToken.padding.small),
             ) {
                 itemsIndexed(items = faqArrayList) { index, faqItem ->
                     FaqItemHolder(
@@ -121,7 +122,7 @@ private fun FaqContent(
                 }
             }
             Row(
-                modifier = Modifier.fillMaxWidth().padding(horizontal = DesignToken.padding.medium),
+                modifier = Modifier.fillMaxWidth().padding(DesignToken.padding.medium),
                 horizontalArrangement = Arrangement.Center,
                 verticalAlignment = Alignment.CenterVertically,
             ) {