Merge branch 'main' into dependabot/gradle/ivy-wallet-45837ea364

Ivy-Apps · Feb 14, 2024 · b78a32f · b78a32f
2 parents 9588486 + 8f86f6e
commit b78a32f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/screen/search/src/main/java/com/ivy/search/SearchScreen.kt b/screen/search/src/main/java/com/ivy/search/SearchScreen.kt
@@ -60,7 +60,7 @@ private fun SearchUi(
         val listState = rememberLazyListState()
 
         var searchQueryTextFieldValue by remember {
-            mutableStateOf(selectEndTextFieldValue(""))
+            mutableStateOf(selectEndTextFieldValue(uiState.searchQuery))
         }
 
         SearchInput(
@@ -126,6 +126,7 @@ private fun Preview() {
     IvyPreview {
         SearchUi(
             uiState = SearchState(
+                searchQuery = "Transaction",
                 transactions = persistentListOf(),
                 baseCurrency = "",
                 accounts = persistentListOf(),

diff --git a/screen/search/src/main/java/com/ivy/search/SearchState.kt b/screen/search/src/main/java/com/ivy/search/SearchState.kt
@@ -6,6 +6,7 @@ import com.ivy.legacy.datamodel.Category
 import kotlinx.collections.immutable.ImmutableList
 
 data class SearchState(
+    val searchQuery: String,
     val transactions: ImmutableList<TransactionHistoryItem>,
     val baseCurrency: String,
     val accounts: ImmutableList<Account>,

diff --git a/screen/search/src/main/java/com/ivy/search/SearchViewModel.kt b/screen/search/src/main/java/com/ivy/search/SearchViewModel.kt
@@ -36,14 +36,16 @@ class SearchViewModel @Inject constructor(
     private val baseCurrency = mutableStateOf<String>(getDefaultFIATCurrency().currencyCode)
     private val accounts = mutableStateOf<ImmutableList<Account>>(persistentListOf())
     private val categories = mutableStateOf<ImmutableList<Category>>(persistentListOf())
+    private val searchQuery = mutableStateOf("")
 
     @Composable
     override fun uiState(): SearchState {
         LaunchedEffect(Unit) {
-            search("")
+            search(searchQuery.value)
         }
 
         return SearchState(
+            searchQuery = searchQuery.value,
             transactions = transactions.value,
             baseCurrency = baseCurrency.value,
             accounts = accounts.value,
@@ -58,14 +60,15 @@ class SearchViewModel @Inject constructor(
     }
 
     private fun search(query: String) {
+        searchQuery.value = query
         val normalizedQuery = query.lowercase().trim()
 
         viewModelScope.launch {
             val queryResult = ioThread {
                 val filteredTransactions = allTrnsAct(Unit)
                     .filter { transaction ->
                         transaction.title.matchesQuery(normalizedQuery) ||
-                            transaction.description.matchesQuery(normalizedQuery)
+                                transaction.description.matchesQuery(normalizedQuery)
                     }
                 trnsWithDateDivsAct(
                     TrnsWithDateDivsAct.Input(