oneblink · divporter · May 8, 2026 · May 8, 2026
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - BPay handling to NSW GovPay provider
 - `formsAppService.getFormSubmissionMetaList()`
 
+### Changed
+
+- required logic for `lookupButton` form element
+
 ## [10.1.2] - 2026-05-07
 
 ### Added

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/renderer/LookupButton.tsx b/src/components/renderer/LookupButton.tsx
@@ -12,6 +12,7 @@ type Props = {
   hasMarginTop?: boolean
   isInputButton?: boolean
   lookupButtonConfig?: EnvironmentTypes.ButtonConfiguration
+  overrideRequiredMessage: string | undefined
 }
 
 function LookupButton({
@@ -20,6 +21,7 @@ function LookupButton({
   hasMarginTop,
   isInputButton,
   lookupButtonConfig,
+  overrideRequiredMessage,
 }: Props) {
   const { isLookup, onLookup, isDisabled, isLoading, allowLookupOnEmptyValue } =
     useLookupNotification(value)
@@ -51,7 +53,10 @@ function LookupButton({
         (!isEmptyValue &&
           !!validationMessage &&
           validationMessage !==
-            generateLookupValidationMessage(lookupButtonConfig))
+            generateLookupValidationMessage(
+              lookupButtonConfig,
+              overrideRequiredMessage,
+            ))
       }
     >
       {isInputButton && <span></span>}

diff --git a/src/form-elements/FormElementABN.tsx b/src/form-elements/FormElementABN.tsx
@@ -120,7 +120,8 @@ function FormElementABN({
         })
         if (result.ABRPayloadSearchResults.response.exception) {
           throw new Error(
-            result.ABRPayloadSearchResults.response.exception.exceptionDescription,
+            result.ABRPayloadSearchResults.response.exception
+              .exceptionDescription,
           )
         }
 
@@ -269,6 +270,7 @@ function FormElementABN({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </div>
         {value && (

diff --git a/src/form-elements/FormElementBSB.tsx b/src/form-elements/FormElementBSB.tsx
@@ -170,7 +170,7 @@ function FormElementBSB({
                   onChange(element, {
                     value: undefined,
                   })
-                  setText("")
+                  setText('')
                 }
                 setIsDirty()
               }}
@@ -198,6 +198,7 @@ function FormElementBSB({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </div>
         {bsbRecord && (

diff --git a/src/form-elements/FormElementBarcodeScanner.tsx b/src/form-elements/FormElementBarcodeScanner.tsx
@@ -164,6 +164,7 @@ function FormElementBarcodeScanner({
                 value={value}
                 validationMessage={validationMessage}
                 lookupButtonConfig={element.lookupButton}
+                overrideRequiredMessage={undefined}
               />
             </div>
 

diff --git a/src/form-elements/FormElementCheckBoxes.tsx b/src/form-elements/FormElementCheckBoxes.tsx
@@ -213,6 +213,7 @@ function FormElementCheckboxes({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </FormElementOptions>
 

diff --git a/src/form-elements/FormElementDate.tsx b/src/form-elements/FormElementDate.tsx
@@ -133,6 +133,7 @@ function FormElementDate({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </div>
 

diff --git a/src/form-elements/FormElementDateTime.tsx b/src/form-elements/FormElementDateTime.tsx
@@ -124,6 +124,7 @@ function FormElementDateTime({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </div>
 

diff --git a/src/form-elements/FormElementEmail.tsx b/src/form-elements/FormElementEmail.tsx
@@ -83,6 +83,7 @@ function FormElementEmail({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </div>
 

diff --git a/src/form-elements/FormElementLookupButton.tsx b/src/form-elements/FormElementLookupButton.tsx
@@ -52,6 +52,7 @@ function FormElementLookupButton({
   element,
   onChange,
   onLookup,
+  validationMessage,
   ...validationMessageProps
 }: Props & {
   onChange: FormElementValueChangeHandler
@@ -111,14 +112,16 @@ function FormElementLookupButton({
           className="ob-lookup-button"
           id={id}
           element={element}
-          required={false}
+          required={!!element.required}
         >
           <LookupButton
             value={value}
-            validationMessage={undefined}
+            validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={element.requiredMessage}
           />
           <FormElementLookupButtonValidationMessage
+            validationMessage={validationMessage}
             {...validationMessageProps}
           />
         </FormElementLabelContainer>

diff --git a/src/form-elements/FormElementNumber.tsx b/src/form-elements/FormElementNumber.tsx
@@ -118,6 +118,7 @@ function FormElementNumber({
               value={value}
               validationMessage={validationMessage}
               lookupButtonConfig={element.lookupButton}
+              overrideRequiredMessage={undefined}
             />
           </div>
         ) : isPageVisible ? (

diff --git a/src/form-elements/FormElementSelect.tsx b/src/form-elements/FormElementSelect.tsx
@@ -150,6 +150,7 @@ function FormElementSelect({
                 value={value}
                 validationMessage={validationMessage}
                 lookupButtonConfig={element.lookupButton}
+                overrideRequiredMessage={undefined}
               />
             </div>
           )}

diff --git a/src/form-elements/FormElementTelephone.tsx b/src/form-elements/FormElementTelephone.tsx
@@ -84,6 +84,7 @@ function FormElementTelephone({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </div>
 

diff --git a/src/form-elements/FormElementText.tsx b/src/form-elements/FormElementText.tsx
@@ -80,6 +80,7 @@ function FormElementText({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </div>
         {(isDisplayingValidationMessage || !!element.maxLength) && (

diff --git a/src/form-elements/FormElementTextarea.tsx b/src/form-elements/FormElementTextarea.tsx
@@ -119,6 +119,7 @@ function FormElementTextarea({
                 value={value}
                 validationMessage={validationMessage}
                 lookupButtonConfig={element.lookupButton}
+                overrideRequiredMessage={undefined}
               />
             )}
           </div>

diff --git a/src/form-elements/FormElementTime.tsx b/src/form-elements/FormElementTime.tsx
@@ -109,6 +109,7 @@ function FormElementTime({
             value={value}
             validationMessage={validationMessage}
             lookupButtonConfig={element.lookupButton}
+            overrideRequiredMessage={undefined}
           />
         </div>
 

diff --git a/src/services/form-validation/determineLookupButtonIsRequired.ts b/src/services/form-validation/determineLookupButtonIsRequired.ts
diff --git a/src/services/form-validation/extensions.ts b/src/services/form-validation/extensions.ts
@@ -16,15 +16,18 @@ const validationExtensions = {
     executedLookups,
     formElement,
   }: {
-    formElement: FormTypes.LookupFormElement & FormTypes.FormElementRequired
+    formElement: FormTypes.LookupFormElement &
+      FormTypes.FormElementRequired & {
+        type: FormTypes.FormElement['type']
+      }
     executedLookups: ExecutedLookups
   }): string[] {
     if (!formElement.isDataLookup && !formElement.isElementLookup) {
       return []
     }
 
     // Lookups must only be executed on required form elements
-    if (formElement && !formElement.required) {
+    if (!formElement.required) {
       return []
     }
 
@@ -33,7 +36,14 @@ const validationExtensions = {
       return []
     }
 
-    return [generateLookupValidationMessage(formElement.lookupButton)]
+    return [
+      generateLookupValidationMessage(
+        formElement.lookupButton,
+        formElement.type === 'lookupButton'
+          ? formElement.requiredMessage
+          : undefined,
+      ),
+    ]
   },
 
   presence(

diff --git a/src/services/form-validation/validateSubmission.ts b/src/services/form-validation/validateSubmission.ts
@@ -21,7 +21,6 @@ import { parseDateValue } from '../generate-default-data'
 import { localisationService } from '../../apps'
 import { ArcGISWebMapElementValue } from '@oneblink/types/typescript/arcgis'
 import { generateConfirmationFormElementName } from '../dynamic-elements'
-import { determineLookupButtonIsRequired } from './determineLookupButtonIsRequired'
 import { Value as FormElementComplianceValue } from '../../form-elements/FormElementCompliance'
 import {
   defaultAutoSnapshotButtonLabel,
@@ -752,14 +751,7 @@ export default function validateSubmission({
         }
         case 'lookupButton': {
           const errorMessages = validationExtensions.lookups({
-            formElement: {
-              ...formElement,
-              required: determineLookupButtonIsRequired(
-                formElement.elementDependencies,
-                elements,
-                submission ? [submission] : [],
-              ),
-            },
+            formElement,
             executedLookups,
           })
           if (errorMessages.length) {

diff --git a/src/services/form-validation/validators.ts b/src/services/form-validation/validators.ts
@@ -157,9 +157,14 @@ export function validateAttachments(
 }
 
 export const generateLookupValidationMessage = (
-  lookupButtonConfig?: EnvironmentTypes.ButtonConfiguration,
+  lookupButtonConfig: EnvironmentTypes.ButtonConfiguration | undefined,
+  overrideMessage: string | undefined,
 ) => {
-  return lookupButtonConfig && lookupButtonConfig.label
-    ? `${lookupButtonConfig.label} is required`
-    : 'Lookup is required'
+  if (overrideMessage) {
+    return overrideMessage
+  }
+  if (lookupButtonConfig && lookupButtonConfig.label) {
+    return `${lookupButtonConfig.label} is required`
+  }
+  return 'Lookup is required'
 }