fix : changed apis to self (#2891)

revanthkumarJ · web-flow · commit c6a11ea196d2 · 2025-08-01T11:58:41.000-04:00
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/User.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/User.kt
@@ -28,6 +28,7 @@ data class User(
     val permissions: ArrayList<String> = arrayListOf(),
     val shouldRenewPassword: Boolean = false,
     val isTwoFactorAuthenticationRequired: Boolean = false,
+    val clients: ArrayList<Long> = arrayListOf(),
 ) : Parcelable
 
 @Serializable
diff --git a/core/network/src/commonMain/kotlin/org/mifos/mobile/core/network/utils/BaseURL.kt b/core/network/src/commonMain/kotlin/org/mifos/mobile/core/network/utils/BaseURL.kt
@@ -22,7 +22,7 @@ class BaseURL {
 
     companion object {
         const val API_ENDPOINT = "tt.mifos.community"
-        const val API_PATH = "/fineract-provider/api/v1/"
+        const val API_PATH = "/fineract-provider/api/v1/self/"
         const val PROTOCOL_HTTPS = "https://"
     }
 }
diff --git a/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/login/LoginViewModel.kt b/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/login/LoginViewModel.kt
@@ -114,7 +114,11 @@ class LoginViewModel(
                 val userData = UserData(
                     userId = user.userId,
                     userName = user.username.orEmpty(),
-                    clientId = user.userId,
+                    clientId = if (user.clients.isNotEmpty()) {
+                        user.clients[0]
+                    } else {
+                        user.userId
+                    },
                     isAuthenticated = user.isAuthenticated,
                     base64EncodedAuthenticationKey = user.base64EncodedAuthenticationKey.orEmpty(),
                     officeName = user.officeName.orEmpty(),
diff --git a/feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt b/feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt
@@ -89,23 +89,22 @@ internal fun HomeScreen(
                     event.route == Constants.TRANSACTIONS -> navigateToTransactionScreen.invoke()
                     event.route == Constants.HELP -> navigateToFaqScreen.invoke()
                 }
-//                navigateToDestinationScreen(event.route)
             }
 
             is HomeEvent.NavigateToNotification -> navigateToNotificationScreen.invoke()
         }
     }
 
-    HomeScreenDialog(
-        dialogState = state.dialogState,
+    HomeContent(
+        state = state,
+        modifier = modifier,
         onAction = remember(viewModel) {
             { viewModel.trySendAction(it) }
         },
     )
 
-    HomeContent(
-        state = state,
-        modifier = modifier,
+    HomeScreenDialog(
+        dialogState = state.dialogState,
         onAction = remember(viewModel) {
             { viewModel.trySendAction(it) }
         },
@@ -128,10 +127,11 @@ internal fun HomeContent(
             Row(
                 horizontalArrangement = Arrangement.spacedBy(DesignToken.spacing.large),
             ) {
-                Image(
-                    imageVector = MifosIcons.SearchNew,
-                    contentDescription = null,
-                )
+                // TODO : once ui/ux team gives this flow uncomment and implement
+//                Image(
+//                    imageVector = MifosIcons.SearchNew,
+//                    contentDescription = null,
+//                )
                 Image(
                     imageVector = MifosIcons.Alert,
                     contentDescription = null,
@@ -142,45 +142,47 @@ internal fun HomeContent(
             }
         },
     ) {
-        Column(
-            modifier = Modifier
-                .padding(DesignToken.padding.large),
-        ) {
-            Spacer(modifier = Modifier.height(DesignToken.spacing.small))
+        if (state.dialogState == null) {
+            Column(
+                modifier = Modifier
+                    .padding(DesignToken.padding.large),
+            ) {
+                Spacer(modifier = Modifier.height(DesignToken.spacing.small))
 
-            Text(
-                text = stringResource(Res.string.feature_home_greet, state.username),
-                style = MifosTypography.titleLarge,
-                color = AppColors.customBlack,
-            )
+                Text(
+                    text = stringResource(Res.string.feature_home_greet, state.username),
+                    style = MifosTypography.titleLarge,
+                    color = AppColors.customBlack,
+                )
 
-            Spacer(modifier = Modifier.height(DesignToken.spacing.large))
+                Spacer(modifier = Modifier.height(DesignToken.spacing.large))
 
-            MifosDashboardCard(
-                isLoanApplied = state.isLoanApplied,
-                savingsAccount = Res.string.feature_home_total_available_savings,
-                loanAccount = Res.string.feature_home_total_available_loan,
-                loanAmount = state.loanAmount,
-                savingsAmount = state.savingsAmount,
-                isVisible = state.isAmountVisible,
-                onVisibilityToggle = { onAction(HomeAction.ToggleAmountVisible) },
-                currency = state.currency,
-            )
+                MifosDashboardCard(
+                    isLoanApplied = state.isLoanApplied,
+                    savingsAccount = Res.string.feature_home_total_available_savings,
+                    loanAccount = Res.string.feature_home_total_available_loan,
+                    loanAmount = state.loanAmount,
+                    savingsAmount = state.savingsAmount,
+                    isVisible = state.isAmountVisible,
+                    onVisibilityToggle = { onAction(HomeAction.ToggleAmountVisible) },
+                    currency = state.currency,
+                )
 
-            Spacer(modifier = Modifier.height(DesignToken.spacing.extraLarge))
+                Spacer(modifier = Modifier.height(DesignToken.spacing.extraLarge))
 
-            Text(
-                text = stringResource(Res.string.feature_home_services),
-                style = MifosTypography.titleMediumEmphasized,
-                color = AppColors.customBlack,
-            )
+                Text(
+                    text = stringResource(Res.string.feature_home_services),
+                    style = MifosTypography.titleMediumEmphasized,
+                    color = AppColors.customBlack,
+                )
 
-            Spacer(modifier = Modifier.height(DesignToken.spacing.large))
+                Spacer(modifier = Modifier.height(DesignToken.spacing.large))
 
-            ServiceBox(
-                items = state.items,
-                onAction = onAction,
-            )
+                ServiceBox(
+                    items = state.items,
+                    onAction = onAction,
+                )
+            }
         }
     }
 }
diff --git a/feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeViewModel.kt b/feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeViewModel.kt
@@ -95,14 +95,24 @@ internal class HomeViewModel(
             DataState.Loading -> updateState { it.copy(dialogState = HomeState.DialogState.Loading) }
 
             is DataState.Success -> {
-                if (dataState.data.loanAccounts.isNotEmpty()) {
+                val hasLoans = dataState.data.loanAccounts.isNotEmpty()
+                val hasSavings = dataState.data.savingsAccounts?.isNotEmpty() ?: false
+
+                if (hasLoans) {
                     getLoanAccountDetails(dataState.data.loanAccounts)
+                }
+
+                if (hasSavings) {
                     getSavingAccountDetails(dataState.data.savingsAccounts)
+                }
+
+                if (hasLoans || hasSavings) {
                     updateState {
                         it.copy(
                             clientAccounts = dataState.data,
                             dialogState = null,
-                            currency = dataState.data.loanAccounts.firstOrNull()?.currency?.displaySymbol,
+                            currency = dataState.data.loanAccounts.firstOrNull()?.currency?.displaySymbol
+                                ?: dataState.data.savingsAccounts?.firstOrNull()?.currency?.displaySymbol,
                         )
                     }
                 } else {
diff --git a/feature/loan-account/src/commonMain/kotlin/org/mifos/mobile/feature/loanaccount/loanAccount/LoanAccountScreen.kt b/feature/loan-account/src/commonMain/kotlin/org/mifos/mobile/feature/loanaccount/loanAccount/LoanAccountScreen.kt
@@ -139,7 +139,7 @@ internal fun LoanAccountContent(
             .fillMaxSize()
             .padding(DesignToken.padding.large),
     ) {
-        if (state.dialogState == null) {
+        if (!state.isEmpty && state.dialogState == null) {
             Spacer(modifier = Modifier.height(DesignToken.spacing.large))
 
             MifosDashboardCard(

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class BaseURL {`
`22`	`22`
`23`	`23`	`companion object {`
`24`	`24`	`const val API_ENDPOINT = "tt.mifos.community"`
`25`		`- const val API_PATH = "/fineract-provider/api/v1/"`
	`25`	`+ const val API_PATH = "/fineract-provider/api/v1/self/"`
`26`	`26`	`const val PROTOCOL_HTTPS = "https://"`
`27`	`27`	`}`
`28`	`28`	`}`