Fix: clean up

2026-02-06 13:56:52 +00:00 · 2025-11-22 17:58:14 +05:30 · 2025-11-22 17:58:14 +05:30 · dbc70df2bf
commit dbc70df2bf
parent b19c701967
9 changed files with 27 additions and 40 deletions
--- a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt
+++ b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt
@ -60,8 +60,6 @@ import org.mifospay.feature.payments.PaymentsScreenContents
 import org.mifospay.feature.payments.RequestScreen
 import org.mifospay.feature.payments.paymentsScreen
 import org.mifospay.feature.payments.selectTransferType.SelectTransferTypeScreen
-import org.mifospay.feature.payments.selectTransferType.navigateToSelectTransferType
-import org.mifospay.feature.payments.selectTransferType.selectTransferTypeScreen
 import org.mifospay.feature.profile.navigation.profileNavGraph
 import org.mifospay.feature.qr.navigation.SCAN_QR_ROUTE
 import org.mifospay.feature.qr.navigation.navigateToScanQr
@ -76,7 +74,6 @@ import org.mifospay.feature.send.money.navigation.navigateToSendMoneyScreen
 import org.mifospay.feature.send.money.navigation.sendMoneyScreen
 import org.mifospay.feature.send.money.selectScreen.navigateToSelectAccountScreen
 import org.mifospay.feature.send.money.selectScreen.selectAccountScreenDestination
-import org.mifospay.feature.send.money.v2.SendMoneyv2Screen
 import org.mifospay.feature.send.money.v2.navigateToSendMoneyV2Screen
 import org.mifospay.feature.send.money.v2.sendMoneyScreenDestination
 import org.mifospay.feature.send.interbank.navigation.interbankTransferScreen
@ -213,15 +210,6 @@ internal fun MifosNavHost(

        paymentsScreen(tabContents = paymentsTabContents)

-        selectTransferTypeScreen(
-            onIntraBankTransferClick = {
-                navController.navigateToSendMoneyV2Screen()
-            },
-            onInterBankTransferClick = {
-                navController.navigateToInterbankTransfer()
-            },
-        )
-
        financeScreen(tabContents = tabContents)

        specificTransactionsScreen(
@ -433,10 +421,7 @@ internal fun MifosNavHost(
                    }
                    launchSingleTop = true
                }
-            },
-            onContactSupport = {
-                // Handle contact support action
-            },
+            }
        )
    }
 }
--- a/core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt
+++ b/core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt
@ -146,10 +146,8 @@ object MifosIcons {
    val Filter = Icons.Default.FilterList
    val OpenInNew = Icons.AutoMirrored.Filled.OpenInNew
    val Warning = Icons.Default.Warning
-    val Wallet = Icons.Filled.Wallet
    val Location = Icons.Filled.LocationOn
    val Savings = Icons.Rounded.AccountBalanceWallet
-    val Currency = Icons.Filled.Money
    val Transfer = Icons.Rounded.Money

 }
--- a/core/ui/src/commonMain/kotlin/org/mifospay/core/ui/AmountEditText.kt
+++ b/core/ui/src/commonMain/kotlin/org/mifospay/core/ui/AmountEditText.kt
@ -22,6 +22,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import template.core.base.designsystem.theme.KptTheme

 /**
 * AmountEditText - Generic amount input component with validation
@ -55,8 +56,8 @@ fun AmountEditText(
    onAmountValidation: ((Double, String?) -> Unit)? = null,
    enabled: Boolean = true,
    isError: Boolean = false,
-    backgroundColor: Color = Color(0xFFF5F9FF),
-    errorBorderColor: Color = Color(0xFFD32F2F),
+    backgroundColor: Color = KptTheme.colorScheme.background,
+    errorBorderColor: Color = KptTheme.colorScheme.error,
    successBorderColor: Color = Color(0xFFE0E0E0),
    borderWidth: Dp = 2.dp,
    cornerRadius: Dp = 12.dp,
@ -64,12 +65,12 @@ fun AmountEditText(
    currencyTextStyle: TextStyle = TextStyle(
        fontSize = 24.sp,
        fontWeight = FontWeight.Bold,
-        color = Color(0xFF1976D2)
+        color = KptTheme.colorScheme.primary
    ),
    amountTextStyle: TextStyle = TextStyle(
        fontSize = 40.sp,
        fontWeight = FontWeight.Bold,
-        color = Color(0xFF1A1A1A)
+        color = KptTheme.colorScheme.primary
    ),
    balanceTextStyle: TextStyle = TextStyle(
        fontSize = 14.sp,
@ -112,11 +113,12 @@ fun AmountEditText(
                Spacer(modifier = Modifier.width(12.dp))

                // Divider
-                Divider(
+                VerticalDivider(
                    modifier = Modifier
                        .width(2.dp)
                        .height(48.dp),
-                    color = Color(0xFFE0E0E0)
+                    thickness = 2.dp,
+                    color = KptTheme.colorScheme.primary
                )

                Spacer(modifier = Modifier.width(12.dp))
--- a/feature/send-interbank/src/commonMain/composeResources/values/strings.xml
+++ b/feature/send-interbank/src/commonMain/composeResources/values/strings.xml
@ -95,4 +95,9 @@
    <string name="feature_send_interbank_error_enter_description">Please enter a description</string>
    <string name="feature_send_interbank_error_phone_number_digits">Phone number must be at least 10 digits</string>
    <string name="feature_send_interbank_error_failed_to_search_recipient">Failed to search recipient</string>
+    <string name="feature_send_interbank_terms_acknowledged">Terms Acknowledged</string>
+    <string name="feature_send_interbank_i_acknowledged">I Acknowledge</string>
+    <string name="feature_send_interbank_terms_acknowledged_description">By completing this final payment, you acknowledge that the transaction is irreversible. Please ensure all details are correct before submission.</string>
+    <string name="feature_send_interbank_cancel">Cancel</string>
+    <string name="feature_send_interbank_ok">Ok</string>
 </resources>
--- a/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/InterbankTransferFlowScreen.kt
+++ b/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/InterbankTransferFlowScreen.kt
@ -36,7 +36,6 @@ import org.mifospay.feature.send.interbank.screens.TransferSuccessScreen
 fun InterbankTransferFlowScreen(
    onBackClick: () -> Unit,
    onTransferSuccess: () -> Unit,
-    onContactSupport: () -> Unit,
    modifier: Modifier = Modifier,
    viewModel: InterbankTransferViewModel = koinViewModel(),
 ) {
@ -211,8 +210,7 @@ fun InterbankTransferFlowScreenPreview() {
    MifosTheme {
        InterbankTransferFlowScreen(
            onBackClick = {},
-            onTransferSuccess = {},
-            onContactSupport = {},
+            onTransferSuccess = {}
        )
    }
 }
--- a/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/InterbankTransferViewModel.kt
+++ b/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/InterbankTransferViewModel.kt
@ -13,13 +13,11 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.datetime.TimeZone
-import kotlinx.datetime.format
 import kotlinx.datetime.todayIn
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import org.mifospay.core.common.DataState
 import org.mifospay.core.common.DateHelper
-import org.mifospay.core.common.DateHelper.format
 import org.mifospay.core.data.repository.InterBankRepository
 import org.mifospay.core.data.repository.SelfServiceRepository
 import org.mifospay.core.datastore.UserPreferencesRepository
--- a/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/navigation/InterbankTransferNavigation.kt
+++ b/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/navigation/InterbankTransferNavigation.kt
@ -31,15 +31,13 @@ fun NavController.navigateToInterbankTransfer(

 fun NavGraphBuilder.interbankTransferScreen(
    onBackClick: () -> Unit,
-    onTransferSuccess: () -> Unit,
-    onContactSupport: () -> Unit,
+    onTransferSuccess: () -> Unit
 ) {
    composable<InterbankTransferRoute> { backStackEntry ->
        val route = backStackEntry.toRoute<InterbankTransferRoute>()
        InterbankTransferFlowScreen(
            onBackClick = onBackClick,
-            onTransferSuccess = onTransferSuccess,
-            onContactSupport = onContactSupport,
+            onTransferSuccess = onTransferSuccess
        )
    }
 }
--- a/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/screens/PreviewTransferScreen.kt
+++ b/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/screens/PreviewTransferScreen.kt
@ -9,7 +9,6 @@
 */
 package org.mifospay.feature.send.interbank.screens

-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@ -33,7 +32,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@ -51,6 +49,9 @@ import mobile_wallet.feature.send_interbank.generated.resources.feature_send_int
 import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_from_account
 import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_to_account
 import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_acknowledgement_section
+import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_i_acknowledged
+import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_terms_acknowledged
+import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_terms_acknowledged_description
 import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_transfer_amount
 import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_verified_recipient
 import org.mifospay.core.common.CurrencyFormatter
@ -477,16 +478,16 @@ private fun DisclaimerCheckboxCard(
            ) {
                Text(
                    text = if (isChecked) {
-                        "Terms Acknowledged"
+                        stringResource(Res.string.feature_send_interbank_terms_acknowledged)
                    } else {
-                        "I Acknowledge"
+                        stringResource(Res.string.feature_send_interbank_i_acknowledged)
                    },
                    style = KptTheme.typography.labelMedium,
                    fontWeight = FontWeight.SemiBold,
                    color = textColor,
                )
                Text(
-                    text = "By completing this final payment, you acknowledge that the transaction is irreversible. Please ensure all details are correct before submission.",
+                    text = stringResource(Res.string.feature_send_interbank_terms_acknowledged_description),
                    style = KptTheme.typography.bodySmall,
                    color = textColor,
                    modifier = Modifier.padding(top = 2.dp),
--- a/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/screens/TransferDetailsScreen.kt
+++ b/feature/send-interbank/src/commonMain/kotlin/org/mifospay/feature/send/interbank/screens/TransferDetailsScreen.kt
@ -58,6 +58,8 @@ import mobile_wallet.feature.send_interbank.generated.resources.feature_send_int
 import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_verified
 import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_edit
 import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_to_account_interbank
+import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_cancel
+import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_ok
 import org.mifospay.core.common.CurrencyFormatter
 import org.mifospay.core.designsystem.component.MifosButton
 import org.mifospay.core.designsystem.component.MifosCard
@ -311,12 +313,12 @@ fun TransferDetailsScreen(
                    },
                    enabled = confirmEnabled.value,
                ) {
-                    Text("OK")
+                    Text(text = stringResource(Res.string.feature_send_interbank_ok))
                }
            },
            dismissButton = {
                TextButton(onClick = { showDatePicker = false }) {
-                    Text("Cancel")
+                    Text(text = stringResource(Res.string.feature_send_interbank_cancel))
                }
            },
        ) {