From fda847d3b534b2de8beb55f2f197065699dc6163 Mon Sep 17 00:00:00 2001
From: Pier Francesco Ferrari <pierfrancesco@commercelayer.io>
Date: Tue, 10 Mar 2026 12:39:21 +0100
Subject: [PATCH 1/2] feat: add email in address form fields

---
 .../resources/ResourceAddress/ResourceAddressFormFields.tsx  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddressFormFields.tsx b/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddressFormFields.tsx
index 62962ccf1..494a7d8f0 100644
--- a/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddressFormFields.tsx
+++ b/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddressFormFields.tsx
@@ -36,6 +36,7 @@ export const getResourceAddressFormFieldsSchema = ({
       zip_code: z.string().nullish(),
       state_code: zodRequiredField,
       country_code: zodRequiredField,
+      email: z.string().email().nullish(),
       phone: zodRequiredField,
       billing_info: requiresBillingInfo
         ? zodRequiredField
@@ -170,6 +171,10 @@ export const ResourceAddressFormFields =
             </div>
           </FieldRow>
 
+          <FieldRow columns="1">
+            <HookedInput name={`${namePrefix}email`} label={"Email"} />
+          </FieldRow>
+
           <FieldRow columns="1">
             <HookedInput
               name={`${namePrefix}phone`}

From 524d2ef4e999e701d469e43099badfd9b9ee34a9 Mon Sep 17 00:00:00 2001
From: Pier Francesco Ferrari <pierfrancesco@commercelayer.io>
Date: Wed, 11 Mar 2026 11:11:39 +0100
Subject: [PATCH 2/2] chore: show email conditionally in address form

---
 .../ResourceAddress/ResourceAddressFormFields.tsx  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddressFormFields.tsx b/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddressFormFields.tsx
index 494a7d8f0..bfadfa987 100644
--- a/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddressFormFields.tsx
+++ b/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddressFormFields.tsx
@@ -96,6 +96,11 @@ export interface ResourceAddressFormFieldsProps {
    * @default false
    */
   showNameOrCompany?: boolean
+  /**
+   * Optional setting to define if given `Address` `email` data is editable.
+   * @default false
+   */
+  showEmail?: boolean
 }
 
 export const ResourceAddressFormFields =
@@ -105,6 +110,7 @@ export const ResourceAddressFormFields =
       showBillingInfo = false,
       showNotes = true,
       showNameOrCompany = false,
+      showEmail = false,
     }) => {
       const namePrefix = name == null ? "" : `${name}.`
       const { watch } = useFormContext()
@@ -171,9 +177,11 @@ export const ResourceAddressFormFields =
             </div>
           </FieldRow>
 
-          <FieldRow columns="1">
-            <HookedInput name={`${namePrefix}email`} label={"Email"} />
-          </FieldRow>
+          {showEmail && (
+            <FieldRow columns="1">
+              <HookedInput name={`${namePrefix}email`} label={"Email"} />
+            </FieldRow>
+          )}
 
           <FieldRow columns="1">
             <HookedInput