From 94988c254d3cb34e87abb5ec5ced8795a3be96bd Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 16 Dec 2020 09:33:03 +0200
Subject: [PATCH] Clean up login form

---
 lib/ui/app/forms/decorated_form_field.dart |  4 ----
 lib/ui/auth/login_view.dart                | 10 ++--------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/ui/app/forms/decorated_form_field.dart b/lib/ui/app/forms/decorated_form_field.dart
index 8f6b96698..cd7fa0fbe 100644
--- a/lib/ui/app/forms/decorated_form_field.dart
+++ b/lib/ui/app/forms/decorated_form_field.dart
@@ -72,10 +72,6 @@ class DecoratedFormField extends StatelessWidget {
     InputDecoration inputDecoration;
     if (decoration != null) {
       inputDecoration = decoration;
-      if (suffixIconButton != null) {
-        inputDecoration =
-            inputDecoration.copyWith(suffixIcon: suffixIconButton);
-      }
     } else if (label == null) {
       inputDecoration = null;
     } else {
diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart
index 9c50d78c8..16749f927 100644
--- a/lib/ui/auth/login_view.dart
+++ b/lib/ui/auth/login_view.dart
@@ -426,23 +426,17 @@ class _LoginState extends State<LoginView> {
                                 newPassword: _createAccount,
                               ),
                             if (_isSelfHosted || viewModel.state.isDemo)
-                              TextFormField(
+                              DecoratedFormField(
                                 controller: _urlController,
                                 autocorrect: false,
-                                autovalidateMode: _autoValidate
-                                    ? AutovalidateMode.always
-                                    : AutovalidateMode.onUserInteraction,
                                 textInputAction: _isFormComplete
                                     ? TextInputAction.done
                                     : TextInputAction.next,
-                                decoration: InputDecoration(
-                                    labelText: localization.url),
+                                label: localization.url,
                                 validator: (val) =>
                                     val.isEmpty || val.trim().isEmpty
                                         ? localization.pleaseEnterYourUrl
                                         : null,
-                                onFieldSubmitted: (String value) =>
-                                    FocusScope.of(context).nextFocus(),
                                 keyboardType: TextInputType.url,
                               ),
                             if (_isSelfHosted)