From 7dcc8cd0b2ac4e4ee71ef9fcb174e27b0396b81e Mon Sep 17 00:00:00 2001
From: Noel Light-Hilary <n.light-hilary@comicrelief.com>
Date: Fri, 27 Oct 2017 11:50:26 +0100
Subject: [PATCH 1/3] fix: Show 'Please select...' only when there are results,
 and the not found message otherwise

---
 src/components/SchoolsLookUp/SchoolsLookUp.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/SchoolsLookUp/SchoolsLookUp.js b/src/components/SchoolsLookUp/SchoolsLookUp.js
index a0593319..d6b17f4e 100644
--- a/src/components/SchoolsLookUp/SchoolsLookUp.js
+++ b/src/components/SchoolsLookUp/SchoolsLookUp.js
@@ -333,7 +333,11 @@ class SchoolsLookUp extends Component {
     return (
       <Menu {...menuProps}>
         <MenuHeader key="defaultSelection" onMouseLeave={this.handleDefaultOptionHoverOff}>
-          Please select a school from the list below
+          {
+            results.length > 0
+              ? 'Please select a school from the list below'
+              : "Sorry, that postcode isn't in our database of schools and nurseries. Please manually fill in the address below."
+          }
         </MenuHeader>
         {
           results.map((result, index) => (
@@ -384,7 +388,7 @@ class SchoolsLookUp extends Component {
             </button>
           </div>:
           <div className="schoolsLookUp-search">
-            {/* Disable cashing as it ignores a lot of results */}
+            {/* Disable caching as it ignores a lot of results */}
             <AsyncTypeahead
               type="text"
               minLength={min}

From 62d85bc901c38d84cb8a1d354fa00b35ec0ebbd6 Mon Sep 17 00:00:00 2001
From: Mohamed Labib <lebaz20@gmail.com>
Date: Sun, 29 Oct 2017 13:23:34 +0200
Subject: [PATCH 2/3] fix: Fix how no-results message is displayed

---
 src/components/SchoolsLookUp/SchoolsLookUp.js | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/SchoolsLookUp/SchoolsLookUp.js b/src/components/SchoolsLookUp/SchoolsLookUp.js
index d6b17f4e..61ee8c69 100644
--- a/src/components/SchoolsLookUp/SchoolsLookUp.js
+++ b/src/components/SchoolsLookUp/SchoolsLookUp.js
@@ -332,21 +332,22 @@ class SchoolsLookUp extends Component {
     const MenuHeader = props => <li {...props} className={isDefaultOptionHighlighted ? 'default-selection' : ''} />;
     return (
       <Menu {...menuProps}>
-        <MenuHeader key="defaultSelection" onMouseLeave={this.handleDefaultOptionHoverOff}>
-          {
-            results.length > 0
-              ? 'Please select a school from the list below'
-              : "Sorry, that postcode isn't in our database of schools and nurseries. Please manually fill in the address below."
-          }
-        </MenuHeader>
-        {
-          results.map((result, index) => (
-            <div key={index} onMouseEnter={this.handleDefaultOptionHoverOff}>
-              <MenuItem option={result} position={index}>
-                {SchoolsLookUp.renderMenuItemChildren(result)}
-              </MenuItem>
-            </div>
-          ))
+        {results.length > 0 ?
+          <div>
+            <MenuHeader key="defaultSelection" onMouseLeave={this.handleDefaultOptionHoverOff}>
+              Please select a school from the list below
+            </MenuHeader>
+            {
+              results.map((result, index) => (
+                <div key={index} onMouseEnter={this.handleDefaultOptionHoverOff}>
+                  <MenuItem option={result} position={index}>
+                    {SchoolsLookUp.renderMenuItemChildren(result)}
+                  </MenuItem>
+                </div>
+              ))
+            }
+          </div>:
+          null
         }
       </Menu>
     );
@@ -393,6 +394,7 @@ class SchoolsLookUp extends Component {
               type="text"
               minLength={min}
               bsSize="large"
+              emptyLabel="Sorry, that postcode isn't in our database of schools and nurseries. Please manually fill in the address below."
               onSearch={this.handleSearch}
               onChange={this.handleChange}
               onInputChange={this.handleInputChange}

From 3ab331b8ec5161463a6e4e7ee7a227b98f27e7c0 Mon Sep 17 00:00:00 2001
From: Mohamed Labib <lebaz20@gmail.com>
Date: Sun, 29 Oct 2017 13:31:15 +0200
Subject: [PATCH 3/3] fix: Update search placeholder

---
 src/components/SchoolsLookUp/SchoolsLookUp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SchoolsLookUp/SchoolsLookUp.js b/src/components/SchoolsLookUp/SchoolsLookUp.js
index 61ee8c69..4194d86a 100644
--- a/src/components/SchoolsLookUp/SchoolsLookUp.js
+++ b/src/components/SchoolsLookUp/SchoolsLookUp.js
@@ -400,7 +400,7 @@ class SchoolsLookUp extends Component {
               onInputChange={this.handleInputChange}
               className="schoolsLookUpForm"
               labelKey={option => `${option.id !== 0 ? `${option.name} ${option.post_code}` : ''}`}
-              placeholder="Search"
+              placeholder="Type to start search (this may take a few seconds)"
               renderMenu={this.renderMenu}
               options={options}
               useCache={false}