diff --git a/components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx b/components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
index 1cbfccccd..936d75a01 100644
--- a/components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
+++ b/components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
@@ -16,8 +16,8 @@ export default async function ContactRow({ contact }: ContactRowProps) {
return null
}
- const val = getValueFromContactConfig(contact.contact_field, data)
- const footnote = getValueFromContactConfig(contact.selectTest, data)
+ const val = getValueFromContactConfig(data, contact.contact_field)
+ const footnote = getValueFromContactConfig(data, contact.phoneFootnote)
if (!val) {
return null
@@ -54,7 +54,9 @@ export default async function ContactRow({ contact }: ContactRowProps) {
{val}
- {footnote && {footnote}}
+ {footnote && contact.contact_field.includes("phone") && (
+ {footnote}
+ )}
)
}
diff --git a/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql b/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
index 8b87aa0fa..96ee3a129 100644
--- a/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
+++ b/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
@@ -13,8 +13,7 @@
fragment ContactFields on ContactFields {
display_text
contact_field
- footnote
- select_test
+ phone_footnote
}
fragment JoinLoyaltyContactSidebar_ContentPage on ContentPageSidebarJoinLoyaltyContact {
diff --git a/server/routers/contentstack/base/output.ts b/server/routers/contentstack/base/output.ts
index 7ff1880b2..899f67a6f 100644
--- a/server/routers/contentstack/base/output.ts
+++ b/server/routers/contentstack/base/output.ts
@@ -77,8 +77,7 @@ export type ContactConfig = ContactConfigData["all_contact_config"]["items"][0]
export type ContactFields = {
display_text: string | null
contact_field: string
- footnote: string | null
- selectTest: string
+ phoneFootnote?: string | null
}
export const validateCurrentHeaderConfigSchema = z
diff --git a/server/routers/contentstack/base/utils.ts b/server/routers/contentstack/base/utils.ts
index daf4575a0..9afb71276 100644
--- a/server/routers/contentstack/base/utils.ts
+++ b/server/routers/contentstack/base/utils.ts
@@ -112,9 +112,9 @@ export function getAlertPhoneContactData(
return {
displayText,
- phoneNumber: getValueFromContactConfig(phoneNumber, contactConfig),
+ phoneNumber: getValueFromContactConfig(contactConfig, phoneNumber),
footnote: footnote
- ? getValueFromContactConfig(footnote, contactConfig)
+ ? getValueFromContactConfig(contactConfig, footnote)
: null,
}
}
diff --git a/server/routers/contentstack/schemas/sidebar/joinLoyaltyContact.ts b/server/routers/contentstack/schemas/sidebar/joinLoyaltyContact.ts
index b4eebd278..b4c5925af 100644
--- a/server/routers/contentstack/schemas/sidebar/joinLoyaltyContact.ts
+++ b/server/routers/contentstack/schemas/sidebar/joinLoyaltyContact.ts
@@ -22,8 +22,7 @@ export const contactSchema = z.object({
contact: z.object({
contact_field: z.string(),
display_text: z.string().optional().nullable().default(null),
- footnote: z.string().optional().nullable().default(null),
- select_test: z.string(),
+ phone_footnote: z.string().optional().nullable(),
}),
})
.transform((data) => {
@@ -32,8 +31,7 @@ export const contactSchema = z.object({
typename: data.typename,
contact_field: data.contact.contact_field,
display_text: data.contact.display_text,
- footnote: data.contact.footnote,
- selectTest: data.contact.select_test,
+ phoneFootnote: data.contact.phone_footnote,
}
})
),
diff --git a/utils/contactConfig.ts b/utils/contactConfig.ts
index 82930a03a..2799c70bc 100644
--- a/utils/contactConfig.ts
+++ b/utils/contactConfig.ts
@@ -4,9 +4,12 @@ import type {
} from "@/server/routers/contentstack/base/output"
export function getValueFromContactConfig(
- keyString: string,
- data: ContactConfig
+ data: ContactConfig,
+ keyString?: string | null
): string | undefined {
+ if (!keyString) {
+ return undefined
+ }
const [groupName, key] = keyString.split(".") as [
ContactFieldGroups,
keyof ContactConfig[ContactFieldGroups],