diff --git a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterViewModel.kt b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterViewModel.kt index b484c9f..785230e 100644 --- a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterViewModel.kt +++ b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterViewModel.kt @@ -124,20 +124,24 @@ class RegisterViewModel( } private fun handleErrors(throwable: Throwable) { + val errorMessage = mutableListOf() if (throwable is BackendError) { throwable.errorCodes.forEach { when (it) { USERS_USER_EXISTS -> { emailError.value = R.string.error_message_registration_user_already_exists + errorMessage.add(emailError.value!!) } VALIDATION_PASSWORD_TOO_SHORT -> { passwordError.value = R.string.error_message_registration_password_too_short passwordConfirmationError.value = R.string.error_message_registration_password_too_short + errorMessage.add(passwordConfirmationError.value!!) } VALIDATION_EMAIL_INVALID -> { emailError.value = R.string.error_message_registration_invalid_email + errorMessage.add(emailError.value!!) } else -> { Log.e( @@ -145,18 +149,15 @@ class RegisterViewModel( "Unknown error $it", throwable ) - + errorMessage.add(R.string.error_message_unknown) progress.value = Progress.Error() } } } - - progress.value = Progress.Error() - } - - if (progress.value !is Progress.Error) { - progress.value = Progress.Error(R.string.error_message_unknown) + } else { + errorMessage.add(R.string.error_message_unknown) } + progress.value = Progress.Error(errorMessage.first() ?: R.string.error_message_unknown) } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_transcript_info.xml b/app/src/main/res/layout/fragment_transcript_info.xml index e9fce1b..4084895 100644 --- a/app/src/main/res/layout/fragment_transcript_info.xml +++ b/app/src/main/res/layout/fragment_transcript_info.xml @@ -192,7 +192,7 @@ android:autofillHints="postal-code" android:background="@drawable/rounded_white" android:error="@{viewModel.zipCodeError}" - android:inputType="number" + android:inputType="textPostalAddress" android:nextFocusDown="@id/editText_city_value" android:padding="10dp" android:text="@={viewModel.zipCode}"