diff --git a/packages/app-elements/src/ui/composite/Address.tsx b/packages/app-elements/src/ui/composite/Address.tsx index d21593bf6..ab931aeb9 100644 --- a/packages/app-elements/src/ui/composite/Address.tsx +++ b/packages/app-elements/src/ui/composite/Address.tsx @@ -1,5 +1,10 @@ import type { Address as AddressType } from "@commercelayer/sdk" -import { NoteIcon, PencilSimpleIcon, PhoneIcon } from "@phosphor-icons/react" +import { + EnvelopeSimpleIcon, + NoteIcon, + PencilSimpleIcon, + PhoneIcon, +} from "@phosphor-icons/react" import isEmpty from "lodash-es/isEmpty" import { useMemo } from "react" import { t } from "#providers/I18NProvider" @@ -21,6 +26,7 @@ export interface AddressProps { AddressType, | "first_name" | "last_name" + | "email" | "company" | "line_1" | "line_2" @@ -123,12 +129,24 @@ export const Address = withSkeletonTemplate( ) : null} {!isEmpty(address.phone) || + !isEmpty(address.email) || (showNotes && !isEmpty(address.notes)) ? ( <>
+ {!isEmpty(address.email) && ( +
+ {/* mt-[2px] to keep icon aligned with text */} + + + + + {address.email} + +
+ )} {!isEmpty(address.phone) && (
{/* mt-[2px] to keep icon aligned with text */} diff --git a/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddress.mocks.ts b/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddress.mocks.ts index 1d3a395c3..717593783 100644 --- a/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddress.mocks.ts +++ b/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddress.mocks.ts @@ -9,6 +9,7 @@ export const presetAddresses = { first_name: "Darth", last_name: "Vader", full_name: "Darth Vader", + email: "vader@galacticempire.com", line_1: "Via Morte Nera, 13", line_2: "Ragnatela, 99", city: "Cogorno", @@ -46,6 +47,7 @@ export const presetAddresses = { first_name: "Luke", last_name: "Skywalker", full_name: "Luke Skywalker", + email: "luke@rebellion.com", line_1: "Via Polis Massa, 42", line_2: "Ragnatela, 99", city: "Cogorno", diff --git a/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddress.test.tsx b/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddress.test.tsx index 4d8e2dea8..6e61273af 100644 --- a/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddress.test.tsx +++ b/packages/app-elements/src/ui/resources/ResourceAddress/ResourceAddress.test.tsx @@ -77,6 +77,11 @@ describe("ResourceAddress", () => { expect(getByText("+39 055 1234567890")).toBeVisible() }) + test("Should render email", async () => { + const { getByText } = setup() + expect(getByText("luke@rebellion.com")).toBeVisible() + }) + test("Should render notes", async () => { const { getByText } = setup() expect(