updated

Author: revanthkumarJ

feature/center/src/commonMain/kotlin/com/mifos/feature/center/centerList/ui/CenterListScreen.kt

@@ -13,6 +13,7 @@ package com.mifos.feature.center.centerList.ui
 
 import androidclient.feature.center.generated.resources.Res
 import androidclient.feature.center.generated.resources.feature_center_error_loading_centers
+import androidclient.feature.center.generated.resources.feature_center_ic_done_all_black_24dp
 import androidclient.feature.center.generated.resources.feature_center_no_more_centers
 import androidclient.feature.center.generated.resources.feature_center_sync
 import androidx.compose.foundation.Canvas
@@ -63,17 +64,19 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.paging.LoadState
+import coil3.compose.AsyncImage
 import com.mifos.core.designsystem.component.MifosCircularProgress
 import com.mifos.core.designsystem.component.MifosPagingAppendProgress
 import com.mifos.core.designsystem.component.MifosSweetError
 import com.mifos.core.designsystem.icon.MifosIcons
 import com.mifos.core.ui.components.SelectionModeTopAppBar
 import com.mifos.feature.center.syncCentersDialog.SyncCenterDialogScreen
 import com.mifos.room.entities.group.CenterEntity
-import kotlinx.coroutines.flow.flowOf
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 
+
 @Composable
 internal fun CenterListScreen(
     paddingValues: PaddingValues,
@@ -420,7 +423,7 @@ private fun CenterListContent(
                     if (centerPagingList[index]?.sync == true) {
                         AsyncImage(
                             modifier = Modifier.size(20.dp),
-                            model = R.drawable.feature_center_ic_done_all_black_24dp,
+                            model = Res.drawable.feature_center_ic_done_all_black_24dp,
                             contentDescription = null,
                         )
                     }
@@ -564,7 +567,7 @@ private fun CenterListDbContent(
                     }
                     AsyncImage(
                         modifier = Modifier.size(20.dp),
-                        model = R.drawable.feature_center_ic_done_all_black_24dp,
+                        model = Res.drawable.feature_center_ic_done_all_black_24dp,
                         contentDescription = null,
                     )
                 }

feature/center/src/commonMain/kotlin/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogViewModel.kt

@@ -346,8 +346,8 @@ class SyncCentersDialogViewModel(
             repository.syncLoanRepaymentTemplate(loanId),
         ) { loanWithAssociations, loanRepaymentTemplate ->
             LoanAndLoanRepayment(
-                loanWithAssociations,
-                loanRepaymentTemplate,
+                loanWithAssociations.data,
+                loanRepaymentTemplate.data,
             )
         }
     }
@@ -376,8 +376,8 @@ class SyncCentersDialogViewModel(
             ),
         ) { savingsAccountWithAssociations, savingsAccountTransactionTemplate ->
             SavingsAccountAndTransactionTemplate(
-                savingsAccountWithAssociations,
-                savingsAccountTransactionTemplate,
+                savingsAccountWithAssociations.data,
+                savingsAccountTransactionTemplate.data,
             )
         }
     }
@@ -763,41 +763,32 @@ class SyncCentersDialogViewModel(
     }
 
     fun getActiveLoanAccounts(loanAccountList: List<LoanAccountEntity>?): List<LoanAccountEntity> {
-        val loanAccounts: MutableList<LoanAccountEntity> = ArrayList()
-        Observable.from(loanAccountList)
-            .filter { loanAccount -> loanAccount.status?.active }
-            .subscribe { loanAccount -> loanAccounts.add(loanAccount) }
-        return loanAccounts
+        return loanAccountList?.filter {
+            it.status?.active == true
+        }.orEmpty()
     }
 
     fun getActiveSavingsAccounts(savingsAccounts: List<SavingsAccountEntity>?): List<SavingsAccountEntity> {
-        val accounts: MutableList<SavingsAccountEntity> = ArrayList()
-        Observable.from(savingsAccounts)
-            .filter { savingsAccount ->
-                savingsAccount.status?.active == true &&
-                    !savingsAccount.depositType!!.isRecurring
+        return savingsAccounts
+            ?.filter { account ->
+                account.status?.active == true && account.depositType?.isRecurring == false
             }
-            .subscribe { savingsAccount -> accounts.add(savingsAccount) }
-        return accounts
+            .orEmpty()
     }
 
     fun getActiveClients(clients: List<ClientEntity>?): List<ClientEntity> {
-        val accounts: MutableList<ClientEntity> = ArrayList()
-        Observable.from(clients)
-            .filter { client -> client.active }
-            .subscribe { client -> accounts.add(client) }
-        return accounts
+        return clients
+            ?.filter { it.active }
+            .orEmpty()
     }
 
     fun getSyncableSavingsAccounts(savingsAccounts: List<SavingsAccountEntity>?): List<SavingsAccountEntity> {
-        val accounts: MutableList<SavingsAccountEntity> = ArrayList()
-        Observable.from(savingsAccounts)
-            .filter { savingsAccount ->
-                savingsAccount.depositType?.value == "Savings" &&
-                    savingsAccount.status?.active == true &&
-                    !savingsAccount.depositType!!.isRecurring
+        return savingsAccounts
+            ?.filter { account ->
+                account.depositType?.value == "Savings" &&
+                        account.status?.active == true &&
+                        account.depositType?.isRecurring == false
             }
-            .subscribe { savingsAccount -> accounts.add(savingsAccount) }
-        return accounts
+            .orEmpty()
     }
 }