From 4afedefd89deaa279afa4fe483f75ff30b25f48f Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Sat, 3 Oct 2020 20:54:26 +0000
Subject: [PATCH] Add more detailed warning messages to signup / reset

---
 apiserver/apiserver/api/utils.py | 2 +-
 webclient/src/PasswordReset.js   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apiserver/apiserver/api/utils.py b/apiserver/apiserver/api/utils.py
index afbcce6..4e91712 100644
--- a/apiserver/apiserver/api/utils.py
+++ b/apiserver/apiserver/api/utils.py
@@ -291,7 +291,7 @@ def link_old_member(data, user):
     try:
         member = models.Member.objects.get(old_email__iexact=data['email'])
     except models.Member.DoesNotExist:
-        msg = 'Unable to find email in old portal.'
+        msg = 'Unable to find email in old portal. Maybe try your other email addresses?'
         logger.info(msg)
         raise ValidationError(dict(email=msg))
     except models.Member.MultipleObjectsReturned:
diff --git a/webclient/src/PasswordReset.js b/webclient/src/PasswordReset.js
index 4e6f722..5f8e76a 100644
--- a/webclient/src/PasswordReset.js
+++ b/webclient/src/PasswordReset.js
@@ -37,7 +37,7 @@ function ResetForm() {
 	});
 
 	return (
-		<Form onSubmit={handleSubmit}>
+		<Form onSubmit={handleSubmit} error={error.email == 'Not found.'}>
 			<Form.Input
 				label='Email'
 				name='email'
@@ -45,6 +45,12 @@ function ResetForm() {
 				error={error.email}
 			/>
 
+			<Message
+				error
+				header='Email not found in Spaceport'
+				content='You can only use this form if you have an account with this new member portal.'
+			/>
+
 			<Form.Button loading={loading} error={error.non_field_errors}>
 				Submit
 			</Form.Button>