diff --git a/libs/components/src/lib/components/AgeRestricted/index.tsx b/libs/components/src/lib/components/AgeRestricted/index.tsx
index 77130f71ee..363e2ac009 100644
--- a/libs/components/src/lib/components/AgeRestricted/index.tsx
+++ b/libs/components/src/lib/components/AgeRestricted/index.tsx
@@ -1,5 +1,6 @@
 import { useAccount, useAppNavigation, useAuth } from '@mezon/core';
 import { selectCurrentChannelId, selectCurrentClanId } from '@mezon/store';
+import { generateE2eId } from '@mezon/utils';
 import { safeJSONParse } from 'mezon-js';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -51,7 +52,10 @@ const AgeRestricted = ({ closeAgeRestricted }: { closeAgeRestricted: () => void
 	const [openModalConfirmAge, closeModalConfirmAge] = useModal(() => {
 		return (
 			<ModalLayout onClose={handleCloseModal}>
-				<div className="bg-theme-setting-primary  pt-4 rounded flex flex-col items-center text-theme-primary w-[550px]">
+				<div
+					className="bg-theme-setting-primary  pt-4 rounded flex flex-col items-center text-theme-primary w-[550px]"
+					data-e2e={generateE2eId('modal.birthday_confirmation')}
+				>
 					<img src={'assets/images/cake.png'} alt="warning" width={200} height={200} />
 					<div className="text-center ml-6 mr-6">
 						<h2 className="text-2xl font-bold text-center mb-4 text-theme-primary-active">{t('confirmBirthdayTitle')}</h2>
@@ -62,12 +66,14 @@ const AgeRestricted = ({ closeAgeRestricted }: { closeAgeRestricted: () => void
 						id="birthday"
 						onChange={handleBirthdayChange}
 						className="mb-4 px-4 py-2 mt-5 border-2 border-color-theme text-theme-message rounded-lg bg-input-secondary w-9/10"
+						data-e2e={generateE2eId('modal.birthday_confirmation.input.date_picker')}
 					/>
 					<div className="flex space-x-4 mb-4 w-9/10">
 						<button
 							type="button"
 							onClick={handleSubmit}
 							className="border-2 border-blue-600 rounded-lg px-6 py-2 bg-blue-600 text-white w-full"
+							data-e2e={generateE2eId('modal.birthday_confirmation.button.submit')}
 						>
 							{t('submit')}
 						</button>
diff --git a/libs/components/src/lib/components/ChannelSetting/Component/OverviewChannel/index.tsx b/libs/components/src/lib/components/ChannelSetting/Component/OverviewChannel/index.tsx
index f586cfa1e1..b7294ed710 100644
--- a/libs/components/src/lib/components/ChannelSetting/Component/OverviewChannel/index.tsx
+++ b/libs/components/src/lib/components/ChannelSetting/Component/OverviewChannel/index.tsx
@@ -455,6 +455,7 @@ const BottomBlock = ({
 								type="checkbox"
 								checked={isAgeRestricted === 1}
 								onChange={handleCheckboxAgeRestricted}
+								data-e2e={generateE2eId('clan_page.channel_list.settings.overview.age_restricted.toggle')}
 							/>
 						</div>
 						<div className="text-theme-primary">{t('overview.ageRestricted.description')}</div>
diff --git a/libs/utils/src/lib/e2e-testing/constants.ts b/libs/utils/src/lib/e2e-testing/constants.ts
index 9b0fac7358..0c13f3f55a 100644
--- a/libs/utils/src/lib/e2e-testing/constants.ts
+++ b/libs/utils/src/lib/e2e-testing/constants.ts
@@ -395,7 +395,11 @@ export const DATA_E2E_IDENTIFIER = {
 				item: ''
 			},
 			settings: {
-				overview: ''
+				overview: {
+					age_restricted: {
+						toggle: ''
+					}
+				}
 			},
 			members: {
 				role: {
@@ -803,7 +807,15 @@ export const DATA_E2E_IDENTIFIER = {
 		},
 		search: {
 			input: ''
-		}
+		},
+		birthday_confirmation: {
+			input: {
+				date_picker: ''
+			},
+			button: {
+				submit: ''
+			}
+		},
 	},
 	icon: {
 		end_call: ''