Merge branch 'development' into feature/client-default-order-active

Author: niyajali

ci-prepush.sh

@@ -208,7 +208,7 @@ fun MifosOutlinedTextField(
         prefix = prefix,
         suffix = suffix,
         supportingText = {
-            if (errorText != null) {
+            if (errorText != null && isError) {
                 Text(
                     modifier = Modifier.testTag(errorTextTag),
                     text = errorText,

core/designsystem/src/commonMain/kotlin/com/mifos/core/designsystem/component/MifosOutlinedTextField.kt

@@ -12,7 +12,6 @@ package com.mifos.feature.client.clientProfile
 import androidclient.feature.client.generated.resources.Res
 import androidclient.feature.client.generated.resources.client_profile_actions
 import androidclient.feature.client.generated.resources.client_profile_profile
-import androidclient.feature.client.generated.resources.client_profile_title
 import androidclient.feature.client.generated.resources.group_na
 import androidclient.feature.client.generated.resources.name_na
 import androidclient.feature.client.generated.resources.office_na
@@ -135,8 +134,6 @@ private fun ClientProfileScaffold(
     onAction: (ClientProfileAction) -> Unit,
 ) {
     MifosScaffold(
-        title = stringResource(Res.string.client_profile_title),
-        onBackPressed = { onAction(ClientProfileAction.NavigateBack) },
         modifier = modifier,
     ) { paddingValues ->
         if (state.dialogState == null) {

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/ClientProfileScreen.kt

@@ -15,6 +15,7 @@
     <string name="feature_search_no_search_result_found">No results found for entered query</string>
     <string name="feature_search_no_search_query_entered">No Search Query Entered!</string>
     <string name="feature_search_exact_match">Exact Match</string>
+    <string name="feature_search_empty_input_field">Please enter Name or Account Number or External ID to search</string>
 
     <string name="feature_search_search_options_clients_label">Clients</string>
     <string name="feature_search_search_options_clients_value">clients</string>

feature/search/src/commonMain/composeResources/values/feature_search_strings.xml

@@ -93,6 +93,7 @@ class SearchViewModel(
         searchJob?.cancel()
 
         if (state.value.searchText.isNotEmpty()) {
+            state.value = state.value.copy(showEmptyError = false)
             searchJob = searchRepository.searchResources(
                 query = state.value.searchText,
                 resources = state.value.selectedFilter?.value,
@@ -123,6 +124,9 @@ class SearchViewModel(
                     }
                 }
                 .launchIn(viewModelScope)
+        } else {
+            state.value = state.value.copy(showEmptyError = true)
+            searchResultState.update { SearchResultState.Empty() }
         }
     }
 }
@@ -138,6 +142,7 @@ data class SearchScreenState(
     val searchText: String = "",
     val selectedFilter: FilterOption? = null,
     val exactMatch: Boolean? = null,
+    val showEmptyError: Boolean = false,
 )
 
 sealed interface SearchScreenEvent {

feature/search/src/commonMain/kotlin/com/mifos/feature/search/SearchViewModel.kt

@@ -10,6 +10,7 @@
 package com.mifos.feature.search.components
 
 import androidclient.feature.search.generated.resources.Res
+import androidclient.feature.search.generated.resources.feature_search_empty_input_field
 import androidclient.feature.search.generated.resources.feature_search_exact_match
 import androidclient.feature.search.generated.resources.feature_search_search_hint
 import androidclient.feature.search.generated.resources.feature_search_title
@@ -117,6 +118,8 @@ internal fun SearchBox(
                     onEvent(SearchScreenEvent.ClearSearchText)
                 },
                 maxLines = 1,
+                isError = state.showEmptyError,
+                errorText = if (state.showEmptyError) stringResource(Res.string.feature_search_empty_input_field) else null,
             )
 
             // Search Button