refactor(feature:send-money): replace hardcoded strings with string resource (#1883)

Co-authored-by: Sk Niyaj Ali <[email protected]>

Author: biplab1

feature/send-money/src/commonMain/composeResources/values/strings.xml

@@ -21,4 +21,21 @@
     <string name="feature_send_money_submit">Submit</string>
     <string name="feature_send_money_please_wait">Please wait…</string>
     <string name="feature_send_money_phone_number">Phone Number</string>
+
+    <string name="feature_send_money_oops">Oops!</string>
+    <string name="feature_send_money_something_went_wrong">Something went wrong!</string>
+    <string name="feature_send_money_no_accounts_found">No accounts found!</string>
+    <string name="feature_send_money_vpa_mobile_account_number">VPA/Mobile/Account Number</string>
+    <string name="feature_send_money_to_account">To Account</string>
+    <string name="feature_send_money_proceed">Proceed</string>
+    <string name="feature_send_money_bottom_bar">Bottom Bar</string>
+    <string name="feature_send_money_scan_qr">Scan QR</string>
+    <string name="feature_send_money_close">Close</string>
+    <string name="feature_send_money_loading">Loading</string>
+    <string name="feature_send_money_selected">Selected</string>
+    <string name="feature_send_money_error_amount_cannot_be_empty">Amount cannot be empty</string>
+    <string name="feature_send_money_error_invalid_amount">Invalid amount</string>
+    <string name="feature_send_money_error_account_cannot_be_empty">Account cannot be empty</string>
+    <string name="feature_send_money_error_requesting_payment_qr_but_found">Requesting payment QR but found - %1$s</string>
+    <string name="feature_send_money_error_requesting_payment_qr_data_missing">Failed to request payment QR: required data is missing</string>
 </resources>

feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyScreen.kt

@@ -56,11 +56,22 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import mobile_wallet.feature.send_money.generated.resources.Res
 import mobile_wallet.feature.send_money.generated.resources.feature_send_money_amount
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_bottom_bar
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_close
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_loading
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_no_accounts_found
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_oops
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_proceed
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_scan_qr
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_selected
 import mobile_wallet.feature.send_money.generated.resources.feature_send_money_send
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_something_went_wrong
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_to_account
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_vpa_mobile_account_number
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 import org.mifospay.core.common.utils.maskString
-import org.mifospay.core.designsystem.component.BasicDialogState
+import org.mifospay.core.designsystem.component.BasicDialogState.Shown
 import org.mifospay.core.designsystem.component.LoadingDialogState
 import org.mifospay.core.designsystem.component.MifosBasicDialog
 import org.mifospay.core.designsystem.component.MifosButton
@@ -149,7 +160,7 @@ private fun SendMoneyScreen(
                             ) {
                                 Icon(
                                     imageVector = MifosIcons.Scan,
-                                    contentDescription = "Scan QR",
+                                    contentDescription = stringResource(Res.string.feature_send_money_scan_qr),
                                 )
                             }
                         },
@@ -216,7 +227,7 @@ private fun SendMoneyBottomBar(
         ) {
             AnimatedVisibility(
                 visible = showDetails && selectedAccount != null,
-                label = "BottomBar",
+                label = stringResource(Res.string.feature_send_money_bottom_bar),
                 enter = fadeIn() + slideInVertically(
                     initialOffsetY = { fullHeight ->
                         fullHeight / 4
@@ -242,7 +253,7 @@ private fun SendMoneyBottomBar(
                 enabled = showDetails,
                 modifier = Modifier.fillMaxWidth(),
             ) {
-                Text(text = "Proceed")
+                Text(text = stringResource(Res.string.feature_send_money_proceed))
             }
         }
     }
@@ -260,7 +271,7 @@ private fun SelectedAccountCard(
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
         Text(
-            text = "To Account",
+            text = stringResource(Res.string.feature_send_money_to_account),
             style = MaterialTheme.typography.labelLarge,
         )
 
@@ -304,7 +315,7 @@ private fun SelectedAccountCard(
                         ) {
                             Icon(
                                 imageVector = Icons.Default.Close,
-                                contentDescription = "Close",
+                                contentDescription = stringResource(Res.string.feature_send_money_close),
                             )
                         }
                     }
@@ -374,7 +385,7 @@ private fun SendMoneyCard(
             )
 
             MifosTextField(
-                label = "VPA/Mobile/Account Number",
+                label = stringResource(Res.string.feature_send_money_vpa_mobile_account_number),
                 value = state.accountNumber,
                 onValueChange = remember(onAction) {
                     { onAction(SendMoneyAction.AccountNumberChanged(it)) }
@@ -399,16 +410,16 @@ private fun LazyListScope.accountListContent(
                     modifier = Modifier.fillParentMaxWidth(),
                     contentAlignment = Alignment.Center,
                 ) {
-                    MifosLoadingWheel(contentDesc = "Loading")
+                    MifosLoadingWheel(contentDesc = stringResource(Res.string.feature_send_money_loading))
                 }
             }
         }
 
         is ViewState.Error -> {
             item {
                 EmptyContentScreen(
-                    title = "Oops!",
-                    subTitle = "Something went wrong!",
+                    title = stringResource(Res.string.feature_send_money_oops),
+                    subTitle = stringResource(Res.string.feature_send_money_something_went_wrong),
                     modifier = Modifier.fillParentMaxSize(),
                     iconTint = MaterialTheme.colorScheme.error,
                 )
@@ -418,8 +429,8 @@ private fun LazyListScope.accountListContent(
         is ViewState.Empty -> {
             item {
                 EmptyContentScreen(
-                    title = "Oops!",
-                    subTitle = "No accounts found!",
+                    title = stringResource(Res.string.feature_send_money_oops),
+                    subTitle = stringResource(Res.string.feature_send_money_no_accounts_found),
                     modifier = Modifier.fillParentMaxSize(),
                 )
             }
@@ -477,7 +488,7 @@ private fun AccountCard(
             ) {
                 Icon(
                     imageVector = MifosIcons.Check,
-                    contentDescription = "Selected",
+                    contentDescription = stringResource(Res.string.feature_send_money_selected),
                 )
             }
         },
@@ -496,7 +507,7 @@ private fun SendMoneyDialogs(
 ) {
     when (dialogState) {
         is SendMoneyState.DialogState.Error -> MifosBasicDialog(
-            visibilityState = BasicDialogState.Shown(
+            visibilityState = Shown(
                 message = dialogState.message,
             ),
             onDismissRequest = onDismissRequest,
@@ -506,6 +517,13 @@ private fun SendMoneyDialogs(
             visibilityState = LoadingDialogState.Shown,
         )
 
+        is SendMoneyState.DialogState.ValidationError -> MifosBasicDialog(
+            visibilityState = Shown(
+                message = stringResource(dialogState.res),
+            ),
+            onDismissRequest = onDismissRequest,
+        )
+
         null -> Unit
     }
 }

feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyViewModel.kt

@@ -26,6 +26,14 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
+import mobile_wallet.feature.send_money.generated.resources.Res
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_account_cannot_be_empty
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_amount_cannot_be_empty
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_invalid_amount
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_requesting_payment_qr_but_found
+import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_requesting_payment_qr_data_missing
+import org.jetbrains.compose.resources.StringResource
+import org.jetbrains.compose.resources.getString
 import org.mifospay.core.common.DataState
 import org.mifospay.core.common.getSerialized
 import org.mifospay.core.common.setSerialized
@@ -37,6 +45,7 @@ import org.mifospay.core.model.utils.toAccount
 import org.mifospay.core.ui.utils.BaseViewModel
 import org.mifospay.feature.send.money.SendMoneyAction.HandleRequestData
 import org.mifospay.feature.send.money.SendMoneyState.DialogState.Error
+import org.mifospay.feature.send.money.SendMoneyState.DialogState.ValidationError
 
 class SendMoneyViewModel(
     private val scanner: QrScanner,
@@ -138,11 +147,11 @@ class SendMoneyViewModel(
     }
 
     private fun validateTransferFlow() = when {
-        state.amount.isBlank() -> updateErrorState("Amount cannot be empty")
+        state.amount.isBlank() -> updateErrorState(Res.string.feature_send_money_error_amount_cannot_be_empty)
 
-        state.amount.toDoubleOrNull() == null -> updateErrorState("Invalid amount")
+        state.amount.toDoubleOrNull() == null -> updateErrorState(Res.string.feature_send_money_error_invalid_amount)
 
-        state.selectedAccount == null -> updateErrorState("Account cannot be empty")
+        state.selectedAccount == null -> updateErrorState(Res.string.feature_send_money_error_account_cannot_be_empty)
 
         else -> initiateTransfer()
     }
@@ -159,9 +168,9 @@ class SendMoneyViewModel(
         }
     }
 
-    private fun updateErrorState(message: String) {
+    private fun updateErrorState(res: StringResource) {
         mutableStateFlow.update {
-            it.copy(dialogState = Error(message))
+            it.copy(dialogState = ValidationError(res))
         }
     }
 
@@ -178,8 +187,17 @@ class SendMoneyViewModel(
                     )
                 }
             } catch (e: Exception) {
+                val message = if (action.requestData.isNotEmpty()) {
+                    getString(
+                        Res.string.feature_send_money_error_requesting_payment_qr_but_found,
+                        action.requestData,
+                    )
+                } else {
+                    getString(Res.string.feature_send_money_error_requesting_payment_qr_data_missing)
+                }
+
                 mutableStateFlow.update {
-                    it.copy(dialogState = Error("Requesting payment QR but found - ${action.requestData}"))
+                    it.copy(dialogState = Error(message))
                 }
             }
         }
@@ -217,6 +235,8 @@ data class SendMoneyState(
 
         @Serializable
         data class Error(val message: String) : DialogState
+
+        data class ValidationError(val res: StringResource) : DialogState
     }
 }
 

mifospay-android/prodRelease-badging.txt

@@ -1,4 +1,4 @@
-package: name='org.mifospay' versionCode='1' versionName='2025.7.2-beta.0.10' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
+package: name='org.mifospay' versionCode='1' versionName='2025.7.3-beta.0.13' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
 sdkVersion:'26'
 targetSdkVersion:'34'
 uses-permission: name='android.permission.INTERNET'