From 214262fdb31a67fd932ea4a323e7b9dd72de0e6a Mon Sep 17 00:00:00 2001
From: Travis Kohlbeck <me+git@travisk.info>
Date: Mon, 6 Jul 2020 12:47:40 -0400
Subject: [PATCH 1/2] Don't show input error state when not empty

---
 src/pages/Welcome.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx
index 978916a..b248074 100644
--- a/src/pages/Welcome.tsx
+++ b/src/pages/Welcome.tsx
@@ -285,6 +285,7 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
      * @param user The string to update the state to
      */
     updateUserInfo(user: string) {
+        this.checkForErrors(user);
         this.setState({ user });
     }
 
@@ -415,7 +416,7 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
      */
     startLogin() {
         // Check if we have errored
-        let error = this.checkForErrors();
+        let error = this.checkForErrors(this.state.user);
 
         // If we didn't, create the Hyperspace app to register onto that Mastodon
         // server.
@@ -535,20 +536,20 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
     /**
      * Check the user input string for any possible errors
      */
-    checkForErrors(): boolean {
+    checkForErrors(username: string): boolean {
         let userInputError = false;
         let userInputErrorMessage = "";
 
         // Is the user string blank?
-        if (this.state.user === "") {
+        if (username === "") {
             userInputError = true;
             userInputErrorMessage = "Username cannot be blank.";
             this.setState({ userInputError, userInputErrorMessage });
             return true;
         } else {
-            if (this.state.user.includes("@")) {
+            if (username.includes("@")) {
                 if (this.state.federates && this.state.federates === true) {
-                    let baseUrl = this.state.user.split("@")[1];
+                    let baseUrl = username.split("@")[1];
 
                     // Is the user's domain in the disallowed list?
                     if (inDisallowedDomains(baseUrl)) {
@@ -581,7 +582,7 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
                             });
                     }
                 } else if (
-                    this.state.user.includes(
+                    username.includes(
                         this.state.registerBase ?? "mastodon.social"
                     )
                 ) {
@@ -772,7 +773,6 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
                     onChange={event => this.updateUserInfo(event.target.value)}
                     onKeyDown={event => this.watchUsernameField(event)}
                     error={this.state.userInputError}
-                    onBlur={() => this.checkForErrors()}
                     InputProps={{
                         startAdornment: (
                             <InputAdornment position="start">@</InputAdornment>

From b7e27b703cee62d017eee9ea2c171237c5b6a4db Mon Sep 17 00:00:00 2001
From: Travis Kohlbeck <me+git@travisk.info>
Date: Wed, 8 Jul 2020 18:26:35 -0400
Subject: [PATCH 2/2] Update package.json and config.json versions

---
 package.json       | 2 +-
 public/config.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c688383..f51f2ce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "hyperspace",
     "productName": "Hyperspace Desktop",
-    "version": "1.1.2",
+    "version": "1.1.4",
     "description": "A beautiful, fluffy client for the fediverse",
     "author": "Marquis Kurt <hyperspacedev@marquiskurt.net>",
     "repository": "https://github.com/hyperspacedev/hyperspace.git",
diff --git a/public/config.json b/public/config.json
index c4784ef..4a351ee 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.1.2",
+    "version": "1.1.4",
     "location": "https://hyperspaceapp.herokuapp.com",
     "branding": {
         "name": "Hyperspace",