Fixed address book field state handling (#1625)

Electric-Coin-Company · Oct 9, 2024 · 2345a40 · 2345a40
1 parent 1e275fe
commit 2345a40
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 55 deletions.
diff --git a/...ib/src/main/java/co/electriccoin/zcash/ui/screen/contact/viewmodel/AddContactViewModel.kt b/...ib/src/main/java/co/electriccoin/zcash/ui/screen/contact/viewmodel/AddContactViewModel.kt
@@ -32,47 +32,65 @@ class AddContactViewModel(
     private val contactName = MutableStateFlow("")
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val contactAddressState =
+    private val contactAddressError =
         contactAddress.mapLatest { address ->
+            if (address.isEmpty()) {
+                null
+            } else {
+                when (validateContactAddress(address)) {
+                    ValidateContactAddressUseCase.Result.Invalid ->
+                        stringRes(R.string.contact_address_error_invalid)
+                    ValidateContactAddressUseCase.Result.NotUnique ->
+                        stringRes(R.string.contact_address_error_not_unique)
+
+                    ValidateContactAddressUseCase.Result.Valid -> null
+                }
+            }
+        }.stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(ANDROID_STATE_FLOW_TIMEOUT),
+            initialValue = null
+        )
+
+    private val contactAddressState =
+        combine(contactAddress, contactAddressError) { address, contactAddressError ->
             TextFieldState(
                 value = stringRes(address),
-                error =
-                    if (address.isEmpty()) {
-                        null
-                    } else {
-                        when (validateContactAddress(address)) {
-                            ValidateContactAddressUseCase.Result.Invalid ->
-                                stringRes(R.string.contact_address_error_invalid)
-                            ValidateContactAddressUseCase.Result.NotUnique ->
-                                stringRes(R.string.contact_address_error_not_unique)
-
-                            ValidateContactAddressUseCase.Result.Valid -> null
-                        }
-                    },
+                error = contactAddressError,
                 onValueChange = { newValue ->
                     contactAddress.update { newValue }
                 }
             )
         }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val contactNameState =
+    private val contactNameError =
         contactName.mapLatest { name ->
+            if (name.isEmpty()) {
+                null
+            } else {
+                when (validateContactName(name)) {
+                    ValidateContactNameUseCase.Result.TooLong ->
+                        stringRes(R.string.contact_name_error_too_long)
+
+                    ValidateContactNameUseCase.Result.NotUnique ->
+                        stringRes(R.string.contact_name_error_not_unique)
+
+                    ValidateContactNameUseCase.Result.Valid ->
+                        null
+                }
+            }
+        }.stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(ANDROID_STATE_FLOW_TIMEOUT),
+            initialValue = null
+        )
+
+    private val contactNameState =
+        combine(contactName, contactNameError) { name, contactNameError ->
             TextFieldState(
                 value = stringRes(name),
-                error =
-                    if (name.isEmpty()) {
-                        null
-                    } else {
-                        when (validateContactName(name)) {
-                            ValidateContactNameUseCase.Result.TooLong ->
-                                stringRes(R.string.contact_name_error_too_long)
-                            ValidateContactNameUseCase.Result.NotUnique ->
-                                stringRes(R.string.contact_name_error_not_unique)
-                            ValidateContactNameUseCase.Result.Valid ->
-                                null
-                        }
-                    },
+                error = contactNameError,
                 onValueChange = { newValue ->
                     contactName.update { newValue }
                 }

diff --git a/...src/main/java/co/electriccoin/zcash/ui/screen/contact/viewmodel/UpdateContactViewModel.kt b/...src/main/java/co/electriccoin/zcash/ui/screen/contact/viewmodel/UpdateContactViewModel.kt
@@ -43,46 +43,61 @@ class UpdateContactViewModel(
     private val isLoadingContact = MutableStateFlow(true)
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val contactAddressState =
+    private val contactAddressError =
         contactAddress.mapLatest { address ->
+            if (address.isEmpty()) {
+                null
+            } else {
+                when (validateContactAddress(address = address, exclude = contact)) {
+                    ValidateContactAddressUseCase.Result.Invalid ->
+                        stringRes(R.string.contact_address_error_invalid)
+
+                    ValidateContactAddressUseCase.Result.NotUnique ->
+                        stringRes(R.string.contact_address_error_not_unique)
+
+                    ValidateContactAddressUseCase.Result.Valid -> null
+                }
+            }
+        }.stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(ANDROID_STATE_FLOW_TIMEOUT),
+            initialValue = null
+        )
+
+    private val contactAddressState =
+        combine(contactAddress, contactAddressError) { address, contactAddressError ->
             TextFieldState(
                 value = stringRes(address),
-                error =
-                    if (address.isEmpty()) {
-                        null
-                    } else {
-                        when (validateContactAddress(address = address, exclude = contact)) {
-                            ValidateContactAddressUseCase.Result.Invalid ->
-                                stringRes(R.string.contact_address_error_invalid)
-                            ValidateContactAddressUseCase.Result.NotUnique ->
-                                stringRes(R.string.contact_address_error_not_unique)
-
-                            ValidateContactAddressUseCase.Result.Valid -> null
-                        }
-                    },
+                error = contactAddressError,
                 onValueChange = { newValue ->
                     contactAddress.update { newValue }
                 }
             )
         }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val contactNameState =
+    private val contactNameError =
         contactName.mapLatest { name ->
+            if (name.isEmpty()) {
+                null
+            } else {
+                when (validateContactName(name = name, exclude = contact)) {
+                    ValidateContactNameUseCase.Result.TooLong ->
+                        stringRes(R.string.contact_name_error_too_long)
+
+                    ValidateContactNameUseCase.Result.NotUnique ->
+                        stringRes(R.string.contact_name_error_not_unique)
+
+                    ValidateContactNameUseCase.Result.Valid -> null
+                }
+            }
+        }
+
+    private val contactNameState =
+        combine(contactName, contactNameError) { name, contactNameError ->
             TextFieldState(
                 value = stringRes(name),
-                error =
-                    if (name.isEmpty()) {
-                        null
-                    } else {
-                        when (validateContactName(name = name, exclude = contact)) {
-                            ValidateContactNameUseCase.Result.TooLong ->
-                                stringRes(R.string.contact_name_error_too_long)
-                            ValidateContactNameUseCase.Result.NotUnique ->
-                                stringRes(R.string.contact_name_error_not_unique)
-                            ValidateContactNameUseCase.Result.Valid -> null
-                        }
-                    },
+                error = contactNameError,
                 onValueChange = { newValue ->
                     contactName.update { newValue }
                 }