From 45eb2a57895eb5a32cc6c5535e935b67aac8e843 Mon Sep 17 00:00:00 2001
From: Jessica McInchak <jessica.mcinchak@gmail.com>
Date: Tue, 16 Apr 2024 17:52:47 +0200
Subject: [PATCH] wip

---
 .../components/FindProperty/Public/Autocomplete.tsx      | 5 ++---
 .../src/@planx/components/FindProperty/Public/index.tsx  | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/editor.planx.uk/src/@planx/components/FindProperty/Public/Autocomplete.tsx b/editor.planx.uk/src/@planx/components/FindProperty/Public/Autocomplete.tsx
index adf496dc40..facc3215db 100644
--- a/editor.planx.uk/src/@planx/components/FindProperty/Public/Autocomplete.tsx
+++ b/editor.planx.uk/src/@planx/components/FindProperty/Public/Autocomplete.tsx
@@ -27,7 +27,6 @@ interface PickOSAddressProps {
   setShowPostcodeError: React.Dispatch<React.SetStateAction<boolean>>;
   initialSelectedAddress?: Option;
   showAddressSelectError: boolean;
-  setShowAddressSelectError: React.Dispatch<React.SetStateAction<boolean>>;
   id?: string;
   description?: string;
 }
@@ -55,7 +54,7 @@ export default function PickOSAddress(props: PickOSAddressProps): FCReturn {
   );
   const [sanitizedPostcode, setSanitizedPostcode] = useState<string | null>(
     (props.initialPostcode && toNormalised(props.initialPostcode.trim())) ??
-    null,
+      null,
   );
   const [selectedOption, setSelectedOption] = useState<Option | undefined>(
     props.initialSelectedAddress ?? undefined,
@@ -187,7 +186,7 @@ export default function PickOSAddress(props: PickOSAddressProps): FCReturn {
         />
       </InputLabel>
       {sanitizedPostcode && (
-        <ErrorWrapperRoot error={props.showAddressSelectError ? "Select an address to continue" : undefined} role="alert" data-testid="autocomplete-error-wrapper">
+        <ErrorWrapperRoot error={!selectedOption && props.showAddressSelectError ? "Select an address to continue" : undefined} role="alert" data-testid="autocomplete-error-wrapper">
           {/* @ts-ignore */
             <address-autocomplete
               id="address-autocomplete"
diff --git a/editor.planx.uk/src/@planx/components/FindProperty/Public/index.tsx b/editor.planx.uk/src/@planx/components/FindProperty/Public/index.tsx
index 2b610975d4..248236af3a 100644
--- a/editor.planx.uk/src/@planx/components/FindProperty/Public/index.tsx
+++ b/editor.planx.uk/src/@planx/components/FindProperty/Public/index.tsx
@@ -174,7 +174,6 @@ function Component(props: Props) {
               previouslySubmittedData?._address
             }
             showAddressSelectError={showAddressSelectError}
-            setShowAddressSelectError={setShowAddressSelectError}
             id={props.id}
             description={props.description || ""}
           />
@@ -214,12 +213,12 @@ function Component(props: Props) {
       handleSubmit={() => {
         // Handle validation (eventually formalise with yup schema?)
         if (page === "os-address") {
-          if (!address?.postcode) {
-            setShowPostcodeError(true);
-            return;
-          } else if (!address?.title) {
+          if (showPostcodeError && !address) {
             setShowAddressSelectError(true);
             return;
+          } else if (!address) {
+            setShowPostcodeError(true);
+            return;
           } else if (!localAuthorityDistricts) {
             setShowDataFetchingError(true);
             return;