From df7be3d35cc580cb441c56889c947b4f9100d23a Mon Sep 17 00:00:00 2001 From: Nagarjuna Date: Tue, 9 Sep 2025 15:30:53 +0530 Subject: [PATCH] feat: Comment out features not using self API (#1928) --- .../shared/navigation/MifosNavHost.kt | 96 ++++++++----------- .../kotlin/org/mifospay/shared/ui/MifosApp.kt | 31 +++--- .../shared/utils/TopLevelDestination.kt | 1 + .../mifospay/core/data/di/RepositoryModule.kt | 2 +- .../repositoryImpl/AccountRepositoryImpl.kt | 13 ++- .../repositoryImpl/ClientRepositoryImpl.kt | 4 +- .../core/model/savingsaccount/Currency.kt | 2 +- .../core/network/SelfServiceApiManager.kt | 2 + .../mifospay/core/network/di/NetworkModule.kt | 6 +- .../mifospay/core/network/utils/BaseURL.kt | 6 +- .../core/network/utils/KtorInterceptor.kt | 2 +- .../mifospay/feature/finance/FinanceScreen.kt | 9 +- .../history/components/TransactionList.kt | 8 +- .../feature/payments/PaymentsScreen.kt | 12 ++- .../mifospay/feature/profile/ProfileScreen.kt | 34 +++---- .../feature/settings/SettingsScreen.kt | 15 ++- 16 files changed, 123 insertions(+), 120 deletions(-) diff --git a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt index 03a443a9..9240c2b8 100644 --- a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt +++ b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt @@ -29,7 +29,6 @@ import org.mifospay.feature.faq.navigation.navigateToFAQ import org.mifospay.feature.finance.FinanceScreenContents import org.mifospay.feature.finance.navigation.FINANCE_ROUTE import org.mifospay.feature.finance.navigation.financeScreen -import org.mifospay.feature.history.HistoryScreen import org.mifospay.feature.history.navigation.historyNavigation import org.mifospay.feature.history.navigation.navigateToHistory import org.mifospay.feature.history.navigation.navigateToSpecificTransaction @@ -38,14 +37,10 @@ import org.mifospay.feature.history.navigation.specificTransactionsScreen import org.mifospay.feature.history.navigation.transactionDetailNavigation import org.mifospay.feature.home.navigation.HOME_ROUTE import org.mifospay.feature.home.navigation.homeScreen -import org.mifospay.feature.invoices.InvoiceScreen import org.mifospay.feature.invoices.navigation.invoiceDetailScreen -import org.mifospay.feature.invoices.navigation.navigateToInvoiceDetail -import org.mifospay.feature.kyc.KYCScreen import org.mifospay.feature.kyc.navigation.kycLevel1Screen import org.mifospay.feature.kyc.navigation.kycLevel2Screen import org.mifospay.feature.kyc.navigation.kycLevel3Screen -import org.mifospay.feature.kyc.navigation.navigateToKYCLevel1 import org.mifospay.feature.kyc.navigation.navigateToKYCLevel2 import org.mifospay.feature.kyc.navigation.navigateToKYCLevel3 import org.mifospay.feature.make.transfer.navigation.navigateToTransferScreen @@ -53,7 +48,6 @@ import org.mifospay.feature.make.transfer.navigation.transferScreen import org.mifospay.feature.make.transfer.success.navigateTransferSuccess import org.mifospay.feature.make.transfer.success.transferSuccessScreen import org.mifospay.feature.merchants.navigation.merchantTransferScreen -import org.mifospay.feature.merchants.ui.MerchantScreen import org.mifospay.feature.notification.navigateToNotification import org.mifospay.feature.notification.notificationScreen import org.mifospay.feature.payments.PaymentsScreenContents @@ -66,20 +60,13 @@ import org.mifospay.feature.qr.navigation.scanQrScreen import org.mifospay.feature.receipt.navigation.receiptScreen import org.mifospay.feature.request.money.navigation.navigateToShowQrScreen import org.mifospay.feature.request.money.navigation.showQrScreen -import org.mifospay.feature.savedcards.CardsScreen import org.mifospay.feature.savedcards.createOrUpdate.addEditCardScreen -import org.mifospay.feature.savedcards.createOrUpdate.navigateToCardAddEdit import org.mifospay.feature.savedcards.details.cardDetailRoute -import org.mifospay.feature.savedcards.details.navigateToCardDetails -import org.mifospay.feature.send.money.SendMoneyScreen import org.mifospay.feature.send.money.navigation.SEND_MONEY_BASE_ROUTE import org.mifospay.feature.send.money.navigation.navigateToSendMoneyScreen import org.mifospay.feature.send.money.navigation.sendMoneyScreen import org.mifospay.feature.settings.navigation.settingsScreen -import org.mifospay.feature.standing.instruction.StandingInstructionsScreen import org.mifospay.feature.standing.instruction.createOrUpdate.addEditSIScreen -import org.mifospay.feature.standing.instruction.createOrUpdate.navigateToSIAddEdit -import org.mifospay.feature.standing.instruction.details.navigateSIDetails import org.mifospay.feature.standing.instruction.details.siDetailsScreen import org.mifospay.feature.upi.setup.navigation.setupUpiPinScreen import org.mifospay.shared.ui.MifosAppState @@ -93,38 +80,39 @@ internal fun MifosNavHost( val navController = appState.navController val paymentsTabContents = listOf( - TabContent(PaymentsScreenContents.SEND.name) { - SendMoneyScreen( - onBackClick = navController::navigateUp, - navigateToTransferScreen = navController::navigateToTransferScreen, - navigateToScanQrScreen = navController::navigateToScanQr, - showTopBar = false, - ) - }, +// TabContent(PaymentsScreenContents.SEND.name) { +// SendMoneyScreen( +// onBackClick = navController::navigateUp, +// navigateToTransferScreen = navController::navigateToTransferScreen, +// navigateToScanQrScreen = navController::navigateToScanQr, +// showTopBar = false, +// ) +// }, TabContent(PaymentsScreenContents.REQUEST.name) { RequestScreen( showQr = navController::navigateToShowQrScreen, ) }, - TabContent(PaymentsScreenContents.HISTORY.name) { - HistoryScreen( - viewTransferDetail = navController::navigateToTransactionDetail, - showTopBar = false, - ) - }, - TabContent(PaymentsScreenContents.SI.name) { - StandingInstructionsScreen( - onAddEditSI = navController::navigateToSIAddEdit, - onShowSIDetails = navController::navigateSIDetails, - ) - }, - TabContent(PaymentsScreenContents.INVOICES.name) { - InvoiceScreen( - navigateToInvoiceDetailScreen = navController::navigateToInvoiceDetail, - ) - }, +// TabContent(PaymentsScreenContents.HISTORY.name) { +// HistoryScreen( +// viewTransferDetail = navController::navigateToTransactionDetail, +// showTopBar = false, +// ) +// }, +// TabContent(PaymentsScreenContents.SI.name) { +// StandingInstructionsScreen( +// onAddEditSI = navController::navigateToSIAddEdit, +// onShowSIDetails = navController::navigateSIDetails, +// ) +// }, +// TabContent(PaymentsScreenContents.INVOICES.name) { +// InvoiceScreen( +// navigateToInvoiceDetailScreen = navController::navigateToInvoiceDetail, +// ) +// }, ) +// TODO Cards and Merchants are not using self api val tabContents = listOf( TabContent(FinanceScreenContents.ACCOUNTS.name) { AccountsScreen( @@ -133,22 +121,22 @@ internal fun MifosNavHost( onAddOrEditBeneficiary = navController::navigateToBeneficiaryAddEdit, ) }, - TabContent(FinanceScreenContents.CARDS.name) { - CardsScreen( - navigateToViewDetail = navController::navigateToCardDetails, - navigateToAddEdit = navController::navigateToCardAddEdit, - ) - }, - TabContent(FinanceScreenContents.MERCHANTS.name) { - MerchantScreen() - }, - TabContent(FinanceScreenContents.KYC.name) { - KYCScreen( - onLevel1Clicked = navController::navigateToKYCLevel1, - onLevel2Clicked = navController::navigateToKYCLevel2, - onLevel3Clicked = navController::navigateToKYCLevel3, - ) - }, +// TabContent(FinanceScreenContents.CARDS.name) { +// CardsScreen( +// navigateToViewDetail = navController::navigateToCardDetails, +// navigateToAddEdit = navController::navigateToCardAddEdit, +// ) +// }, +// TabContent(FinanceScreenContents.MERCHANTS.name) { +// MerchantScreen() +// }, +// TabContent(FinanceScreenContents.KYC.name) { +// KYCScreen( +// onLevel1Clicked = navController::navigateToKYCLevel1, +// onLevel2Clicked = navController::navigateToKYCLevel2, +// onLevel3Clicked = navController::navigateToKYCLevel3, +// ) +// }, ) NavHost( diff --git a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt index 480085e5..5b72c913 100644 --- a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt +++ b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt @@ -58,7 +58,6 @@ import org.mifospay.core.designsystem.component.MifosNavigationRail import org.mifospay.core.designsystem.component.MifosNavigationRailItem import org.mifospay.core.designsystem.icon.MifosIcons import org.mifospay.core.designsystem.theme.LocalGradientColors -import org.mifospay.feature.notification.navigateToNotification import org.mifospay.feature.profile.navigation.navigateToEditProfile import org.mifospay.feature.settings.navigation.navigateToSettings import org.mifospay.shared.navigation.MifosNavHost @@ -149,9 +148,9 @@ internal fun MifosApp( onNavigateToEditProfile = { appState.navController.navigateToEditProfile() }, - onNavigateToNotification = { - appState.navController.navigateToNotification() - }, +// onNavigateToNotification = { +// appState.navController.navigateToNotification() +// }, destination = destination, ) } @@ -166,6 +165,8 @@ internal fun MifosApp( } } +// TODO Notification feature is not using self api +// https://venus.mifos.community/fineract-provider/api/v1/notifications/?isRead=true @OptIn(ExperimentalMaterial3Api::class) @Composable private fun MifosAppBar( @@ -174,7 +175,7 @@ private fun MifosAppBar( onNavigateToFaq: () -> Unit, onNavigateToSettings: () -> Unit, onNavigateToEditProfile: () -> Unit, - onNavigateToNotification: () -> Unit, +// onNavigateToNotification: () -> Unit, destination: TopLevelDestination?, modifier: Modifier = Modifier, ) { @@ -187,10 +188,10 @@ private fun MifosAppBar( Row( horizontalArrangement = Arrangement.spacedBy(KptTheme.spacing.xs), ) { - IconBox( - icon = MifosIcons.OutlinedNotifications, - onClick = onNavigateToNotification, - ) +// IconBox( +// icon = MifosIcons.OutlinedNotifications, +// onClick = onNavigateToNotification, +// ) IconBox( icon = MifosIcons.SettingsOutlined, @@ -199,12 +200,12 @@ private fun MifosAppBar( } } - TopLevelDestination.PROFILE -> { - IconBox( - icon = MifosIcons.Edit2, - onClick = onNavigateToEditProfile, - ) - } +// TopLevelDestination.PROFILE -> { +// IconBox( +// icon = MifosIcons.Edit2, +// onClick = onNavigateToEditProfile, +// ) +// } else -> {} } diff --git a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt index 0d927e7f..c0568f5a 100644 --- a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt +++ b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt @@ -24,6 +24,7 @@ import org.mifospay.core.designsystem.icon.MifosIcons * can contain one or more screens (based on the window size). Navigation from one screen to the * next within a single destination will be handled directly in composables. */ +// TODO Profile is not using self api internal enum class TopLevelDestination( val selectedIcon: ImageVector, val unselectedIcon: ImageVector, diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/di/RepositoryModule.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/di/RepositoryModule.kt index 053c48b7..721fff08 100644 --- a/core/data/src/commonMain/kotlin/org/mifospay/core/data/di/RepositoryModule.kt +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/di/RepositoryModule.kt @@ -63,7 +63,7 @@ val RepositoryModule = module { single { Json { ignoreUnknownKeys = true } } single { AssetRepositoryImpl() } - single { AccountRepositoryImpl(get(), get(ioDispatcher)) } + single { AccountRepositoryImpl(get(), get(), get(ioDispatcher)) } single { AuthenticationRepositoryImpl(get(), get(ioDispatcher)) } diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/AccountRepositoryImpl.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/AccountRepositoryImpl.kt index 8686ddef..53539464 100644 --- a/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/AccountRepositoryImpl.kt +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/AccountRepositoryImpl.kt @@ -27,9 +27,12 @@ import org.mifospay.core.model.savingsaccount.Transaction import org.mifospay.core.model.savingsaccount.TransferDetail import org.mifospay.core.model.search.AccountResult import org.mifospay.core.network.FineractApiManager +import org.mifospay.core.network.SelfServiceApiManager +// TODO use self api for account operations later class AccountRepositoryImpl( private val apiManager: FineractApiManager, + private val selfManager: SelfServiceApiManager, private val ioDispatcher: CoroutineDispatcher, ) : AccountRepository { @@ -37,27 +40,27 @@ class AccountRepositoryImpl( accountId: Long, transactionId: Long, ): Flow> { - return apiManager.accountTransfersApi + return selfManager.accountTransfersApi .getTransaction(accountId, transactionId) .map { it.toModel() } .asDataStateFlow().flowOn(ioDispatcher) } override fun getAccountTransfer(transferId: Long): Flow> { - return apiManager.accountTransfersApi + return selfManager.accountTransfersApi .getAccountTransfer(transferId.toInt()) .asDataStateFlow().flowOn(ioDispatcher) } override fun searchAccounts(query: String): Flow>> { - return apiManager.accountTransfersApi + return selfManager.accountTransfersApi .searchAccounts(query, "savings") .catch { DataState.Error(it, null) } .asDataStateFlow().flowOn(ioDispatcher) } override fun getSelfAccounts(clientId: Long): Flow>> { - return apiManager.clientsApi + return selfManager.clientsApi .getAccounts(clientId, Constants.SAVINGS) .map { it.toAccount() } .asDataStateFlow().flowOn(ioDispatcher) @@ -66,7 +69,7 @@ class AccountRepositoryImpl( override suspend fun makeTransfer(payload: AccountTransferPayload): DataState { return try { withContext(ioDispatcher) { - apiManager.accountTransfersApi.makeTransfer(payload) + selfManager.accountTransfersApi.makeTransfer(payload) } DataState.Success("Transaction Successful") diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/ClientRepositoryImpl.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/ClientRepositoryImpl.kt index 5e689944..ca8e2b20 100644 --- a/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/ClientRepositoryImpl.kt +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/ClientRepositoryImpl.kt @@ -40,7 +40,7 @@ class ClientRepositoryImpl( } override fun getClientInfo(clientId: Long): Flow> { - return fineractApiManager.clientsApi + return apiManager.clientsApi .getClient(clientId) .catch { DataState.Error(it, null) } .map { DataState.Success(it.toModel()) } @@ -69,7 +69,7 @@ class ClientRepositoryImpl( } override fun getClientImage(clientId: Long): Flow> { - return fineractApiManager.clientsApi + return apiManager.clientsApi .getClientImage(clientId) .catch { DataState.Error(it, null) } .map { DataState.Success(it) } diff --git a/core/model/src/commonMain/kotlin/org/mifospay/core/model/savingsaccount/Currency.kt b/core/model/src/commonMain/kotlin/org/mifospay/core/model/savingsaccount/Currency.kt index 22076357..9fcae44f 100644 --- a/core/model/src/commonMain/kotlin/org/mifospay/core/model/savingsaccount/Currency.kt +++ b/core/model/src/commonMain/kotlin/org/mifospay/core/model/savingsaccount/Currency.kt @@ -16,7 +16,7 @@ data class Currency( val code: String, val name: String, val decimalPlaces: Int, - val inMultiplesOf: Int, + val inMultiplesOf: Int? = null, val displaySymbol: String, val nameCode: String, val displayLabel: String, diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt index 4df8740d..766fd992 100644 --- a/core/network/src/commonMain/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt @@ -23,4 +23,6 @@ class SelfServiceApiManager( val beneficiaryApi by lazy { ktorfitClient.beneficiaryApi } val thirdPartyTransferApi by lazy { ktorfitClient.thirdPartyTransferApi } + + val accountTransfersApi by lazy { ktorfitClient.accountTransfersApi } } diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/di/NetworkModule.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/di/NetworkModule.kt index dfb9dca6..965c02da 100644 --- a/core/network/src/commonMain/kotlin/org/mifospay/core/network/di/NetworkModule.kt +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/di/NetworkModule.kt @@ -33,7 +33,7 @@ val NetworkModule = module { client = httpClient( config = setupDefaultHttpClient( baseUrl = BaseURL.selfServiceUrl, - loggableHosts = listOf("venus.mifos.community"), + loggableHosts = listOf("tt.mifos.community"), ), ).config { install(KtorInterceptor) { @@ -60,11 +60,11 @@ val NetworkModule = module { ) }, defaultHeaders = mapOf( - "Fineract-Platform-TenantId" to "venus", + "Fineract-Platform-TenantId" to "default", "Content-Type" to "application/json", "Accept" to "application/json", ), - loggableHosts = listOf("venus.mifos.community"), + loggableHosts = listOf("tt.mifos.community"), ), ), ) diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/BaseURL.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/BaseURL.kt index c274d11c..019737f7 100644 --- a/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/BaseURL.kt +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/BaseURL.kt @@ -11,16 +11,16 @@ package org.mifospay.core.network.utils object BaseURL { private const val PROTOCOL_HTTPS = "https://" - private const val API_ENDPOINT = "venus.mifos.community" + private const val API_ENDPOINT = "tt.mifos.community" private const val API_PATH = "/fineract-provider/api/v1/" // self service url - private const val API_ENDPOINT_SELF = "venus.mifos.community" + private const val API_ENDPOINT_SELF = "tt.mifos.community" private const val API_PATH_SELF = "/fineract-provider/api/v1/self/" const val HEADER_TENANT = "Fineract-Platform-TenantId" const val HEADER_AUTH = "Authorization" - const val DEFAULT = "venus" + const val DEFAULT = "default" val url: String get() = PROTOCOL_HTTPS + API_ENDPOINT + API_PATH diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/KtorInterceptor.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/KtorInterceptor.kt index 80125e7b..284e5111 100644 --- a/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/KtorInterceptor.kt +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/KtorInterceptor.kt @@ -25,7 +25,7 @@ class KtorInterceptor( companion object Plugin : HttpClientPlugin { private const val HEADER_TENANT = "Fineract-Platform-TenantId" private const val HEADER_AUTH = "Authorization" - private const val DEFAULT = "venus" + private const val DEFAULT = "default" override val key: AttributeKey = AttributeKey("KtorInterceptor") diff --git a/feature/finance/src/commonMain/kotlin/org/mifospay/feature/finance/FinanceScreen.kt b/feature/finance/src/commonMain/kotlin/org/mifospay/feature/finance/FinanceScreen.kt index 050a820b..2b4198fc 100644 --- a/feature/finance/src/commonMain/kotlin/org/mifospay/feature/finance/FinanceScreen.kt +++ b/feature/finance/src/commonMain/kotlin/org/mifospay/feature/finance/FinanceScreen.kt @@ -33,11 +33,14 @@ internal fun FinanceRoute( } } +// TODO Cards not using self apis until then commented it. +// https://venus.mifos.community/fineract-provider/api/v1/datatables/saved_cards/2 +// https://venus.mifos.community/fineract-provider/api/v1/datatables/kyc_level1_details/2 enum class FinanceScreenContents { ACCOUNTS, - CARDS, - MERCHANTS, - KYC, +// CARDS, +// MERCHANTS, +// KYC, } @Preview diff --git a/feature/history/src/commonMain/kotlin/org/mifospay/feature/history/components/TransactionList.kt b/feature/history/src/commonMain/kotlin/org/mifospay/feature/history/components/TransactionList.kt index ba411a7b..791965c3 100644 --- a/feature/history/src/commonMain/kotlin/org/mifospay/feature/history/components/TransactionList.kt +++ b/feature/history/src/commonMain/kotlin/org/mifospay/feature/history/components/TransactionList.kt @@ -88,12 +88,14 @@ internal fun TransactionItem( showLeadingIcon: Boolean = true, onClick: (Long) -> Unit, ) { +// TODO Disabling this view specific transfer details because of not using self api Surface( modifier = modifier, enabled = transaction.transferId != null, - onClick = { - transaction.transferId?.let { onClick(it) } - }, +// onClick = { +// transaction.transferId?.let { onClick(it) } +// }, + onClick = { }, color = Color.Transparent, contentColor = KptTheme.colorScheme.onSurface, ) { diff --git a/feature/payments/src/commonMain/kotlin/org/mifospay/feature/payments/PaymentsScreen.kt b/feature/payments/src/commonMain/kotlin/org/mifospay/feature/payments/PaymentsScreen.kt index 66263af9..db5d7cc6 100644 --- a/feature/payments/src/commonMain/kotlin/org/mifospay/feature/payments/PaymentsScreen.kt +++ b/feature/payments/src/commonMain/kotlin/org/mifospay/feature/payments/PaymentsScreen.kt @@ -56,12 +56,16 @@ private fun PaymentScreenContent( } } +// TODO History, SI, Invoices are not using self api +// https://venus.mifos.community/fineract-provider/api/v1/standinginstructions?clientId=2 +// https://venus.mifos.community/fineract-provider/api/v1/datatables/invoice/2 +// enum class PaymentsScreenContents { - SEND, +// SEND, REQUEST, - HISTORY, - SI, - INVOICES, +// HISTORY, +// SI, +// INVOICES, } @Preview diff --git a/feature/profile/src/commonMain/kotlin/org/mifospay/feature/profile/ProfileScreen.kt b/feature/profile/src/commonMain/kotlin/org/mifospay/feature/profile/ProfileScreen.kt index 099c279e..17fcaff4 100644 --- a/feature/profile/src/commonMain/kotlin/org/mifospay/feature/profile/ProfileScreen.kt +++ b/feature/profile/src/commonMain/kotlin/org/mifospay/feature/profile/ProfileScreen.kt @@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import mobile_wallet.feature.profile.generated.resources.Res -import mobile_wallet.feature.profile.generated.resources.feature_profile_link_bank_account import mobile_wallet.feature.profile.generated.resources.feature_profile_loading import mobile_wallet.feature.profile.generated.resources.feature_profile_personal_qr_code import org.jetbrains.compose.resources.stringResource @@ -168,22 +167,23 @@ private fun ProfileScreenContent( }, ) - MifosButton( - modifier = Modifier - .fillMaxWidth() - .height(55.dp), - text = { - Text( - text = stringResource(Res.string.feature_profile_link_bank_account), - ) - }, - onClick = { - onAction(ProfileAction.NavigateToLinkBankAccount) - }, - leadingIcon = { - Icon(imageVector = MifosIcons.AttachMoney, contentDescription = "") - }, - ) +// TODO uncomment this after migrating to self api to link savings account +// MifosButton( +// modifier = Modifier +// .fillMaxWidth() +// .height(55.dp), +// text = { +// Text( +// text = stringResource(Res.string.feature_profile_link_bank_account), +// ) +// }, +// onClick = { +// onAction(ProfileAction.NavigateToLinkBankAccount) +// }, +// leadingIcon = { +// Icon(imageVector = MifosIcons.AttachMoney, contentDescription = "") +// }, +// ) Spacer(modifier = Modifier.height(1.dp)) } diff --git a/feature/settings/src/commonMain/kotlin/org/mifospay/feature/settings/SettingsScreen.kt b/feature/settings/src/commonMain/kotlin/org/mifospay/feature/settings/SettingsScreen.kt index 43168c06..6e1bfcbd 100644 --- a/feature/settings/src/commonMain/kotlin/org/mifospay/feature/settings/SettingsScreen.kt +++ b/feature/settings/src/commonMain/kotlin/org/mifospay/feature/settings/SettingsScreen.kt @@ -34,7 +34,6 @@ import mobile_wallet.feature.settings.generated.resources.feature_settings_chang import mobile_wallet.feature.settings.generated.resources.feature_settings_disable_account import mobile_wallet.feature.settings.generated.resources.feature_settings_faq import mobile_wallet.feature.settings.generated.resources.feature_settings_log_out -import mobile_wallet.feature.settings.generated.resources.feature_settings_notification_settings import mobile_wallet.feature.settings.generated.resources.feature_settings_settings import mobile_wallet.feature.settings.generated.resources.outline_logout import mobile_wallet.feature.settings.generated.resources.outline_password @@ -111,13 +110,13 @@ private fun SettingsScreenContent( .verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.sm), ) { - SettingsCardItem( - title = stringResource(Res.string.feature_settings_notification_settings), - icon = MifosIcons.OutlinedNotifications, - onClick = { - onAction(SettingsAction.NavigateToNotificationSettings) - }, - ) +// SettingsCardItem( +// title = stringResource(Res.string.feature_settings_notification_settings), +// icon = MifosIcons.OutlinedNotifications, +// onClick = { +// onAction(SettingsAction.NavigateToNotificationSettings) +// }, +// ) SettingsCardItem( title = stringResource(Res.string.feature_settings_faq),