resolve merge conflicts

Author: Arinyadav1

feature/client/src/commonMain/kotlin/com/mifos/feature/client/fixedDepositAccount/FixedDepositAccountScreen.kt

@@ -54,7 +54,6 @@ import com.mifos.core.ui.components.Actions
 import com.mifos.core.ui.components.MifosActionsSavingsListingComponent
 import com.mifos.core.ui.components.MifosBreadcrumbNavBar
 import com.mifos.core.ui.components.MifosEmptyCard
-import com.mifos.core.ui.components.MifosProgressIndicator
 import com.mifos.core.ui.components.MifosSearchBar
 import com.mifos.core.ui.util.EventsEffect
 import org.jetbrains.compose.resources.painterResource
@@ -122,8 +121,6 @@ internal fun FixedDepositAccountDialog(
             )
         }
 
-        FixedDepositAccountState.DialogState.Loading -> MifosProgressIndicator()
-
         else -> null
     }
 }
@@ -184,7 +181,7 @@ fun FixedDepositAccountScaffold(
                     )
                 }
 
-                        Spacer(modifier = Modifier.height(DesignToken.padding.largeIncreasedExtra))
+                Spacer(modifier = Modifier.height(DesignToken.padding.largeIncreasedExtra))
 
                 if (state.fixedDepositAccount.isEmpty()) {
                     MifosEmptyCard(msg = stringResource(Res.string.client_empty_card_message))
@@ -232,21 +229,19 @@ fun FixedDepositAccountScaffold(
                                         )
                                     }
 
-                                            is Actions.ApproveAccount -> {
-                                                onAction(
-                                                    FixedDepositAccountAction.ApproveAccount(
-                                                        fixedDepositAccount.accountNo ?: "",
-                                                    ),
-                                                )
-                                            }
-
-                                            else -> null
-                                        }
+                                    is Actions.ApproveAccount -> {
+                                        onAction(
+                                            FixedDepositAccountAction.ApproveAccount(
+                                                fixedDepositAccount.accountNo ?: "",
+                                            ),
+                                        )
                                     }
 
-                                    Spacer(modifier = Modifier.height(DesignToken.spacing.small))
+                                    else -> null
                                 }
                             }
+
+                            Spacer(modifier = Modifier.height(DesignToken.spacing.small))
                         }
                     }
                 }

feature/client/src/commonMain/kotlin/com/mifos/feature/client/recurringDepositAccount/RecurringDepositAccountScreen.kt

@@ -54,7 +54,6 @@ import com.mifos.core.ui.components.Actions
 import com.mifos.core.ui.components.MifosActionsSavingsListingComponent
 import com.mifos.core.ui.components.MifosBreadcrumbNavBar
 import com.mifos.core.ui.components.MifosEmptyCard
-import com.mifos.core.ui.components.MifosProgressIndicator
 import com.mifos.core.ui.components.MifosSearchBar
 import com.mifos.core.ui.util.EventsEffect
 import org.jetbrains.compose.resources.painterResource
@@ -122,8 +121,6 @@ internal fun RecurringDepositAccountDialog(
             )
         }
 
-        RecurringDepositAccountState.DialogState.Loading -> MifosProgressIndicator()
-
         else -> null
     }
 }
@@ -194,7 +191,8 @@ internal fun RecurringDepositAccountScaffold(
                             MifosActionsSavingsListingComponent(
                                 accountNo = recurringDeposit.accountNo ?: notAvailableText,
                                 savingsProduct = stringResource(Res.string.client_product_recurring_deposit_account),
-                                savingsProductName = recurringDeposit.shortProductName ?: notAvailableText,
+                                savingsProductName = recurringDeposit.shortProductName
+                                    ?: notAvailableText,
                                 lastActive = if (recurringDeposit.status?.submittedAndPendingApproval == true) {
                                     stringResource(Res.string.client_savings_pending_approval)
                                 } else if (recurringDeposit.lastActiveTransactionDate != null) {
@@ -231,18 +229,18 @@ internal fun RecurringDepositAccountScaffold(
                                             ),
                                         )
                                     }
+
                                     is Actions.ApproveAccount -> {
                                         RecurringDepositAccountAction.ApproveAccount(
                                             recurringDeposit.accountNo ?: "",
                                         )
                                     }
+
                                     else -> null
                                 }
                             }
 
-                                    Spacer(modifier = Modifier.height(DesignToken.spacing.small))
-                                }
-                            }
+                            Spacer(modifier = Modifier.height(DesignToken.spacing.small))
                         }
                     }
                 }

feature/client/src/commonMain/kotlin/com/mifos/feature/client/savingsAccounts/SavingsAccounts.kt

@@ -54,7 +54,6 @@ import com.mifos.core.designsystem.theme.MifosTypography
 import com.mifos.core.ui.components.Actions
 import com.mifos.core.ui.components.MifosActionsSavingsListingComponent
 import com.mifos.core.ui.components.MifosBreadcrumbNavBar
-import com.mifos.core.ui.components.MifosProgressIndicator
 import com.mifos.core.ui.components.MifosSearchBar
 import com.mifos.core.ui.util.EventsEffect
 import com.mifos.room.entities.accounts.savings.SavingAccountDepositTypeEntity
@@ -291,7 +290,6 @@ private fun SavingsAccountsDialog(
                 onDismissRequest = {},
             )
         }
-        SavingsAccountState.DialogState.Loading -> MifosProgressIndicator()
         else -> null
     }
 }