Skip to content

Feat/63848/verify limit clan #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dathaquoc merged 4 commits into from
Sep 23, 2025
Merged

Feat/63848/verify limit clan #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc54a1e
feat: e2e for verify limit clan modal shown
thang-thieuquang Sep 17, 2025
c4fb94f
Merge branch 'develop' of mezon:kientrinh-dev/mezon into feat/63848/v…
thang-thieuquang Sep 19, 2025
ba809ec
Merge branch 'develop' of mezon:kientrinh-dev/mezon into feat/63848/v…
thang-thieuquang Sep 22, 2025
1cd8704
Merge branch 'develop' of mezon:kientrinh-dev/mezon into feat/63848/v…
thang-thieuquang Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion libs/components/src/lib/components/ClanLimitModal/ClanLimitModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEscapeKeyClose } from '@mezon/core';
import { resetClanLimitModalTrigger, useAppDispatch, useAppSelector } from '@mezon/store';
import { generateE2eId } from '@mezon/utils';
import { useCallback, useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useModal } from 'react-modal-hook';
Expand Down Expand Up @@ -51,7 +52,12 @@ const ClanLimitModalContent = ({ type, clanCount, onClose }: ClanLimitModalProps
<div className='fixed inset-0 bg-black opacity-80' />
<div className='relative z-10 w-[440px] max-w-[90vw]' onClick={(e) => e.stopPropagation()}>
<div className='bg-theme-setting-primary pt-[16px] px-[16px] rounded-t-md'>
<div className='text-theme-primary-active text-[20px] font-semibold pb-[16px]'>{title}</div>
<div
className='text-theme-primary-active text-[20px] font-semibold pb-[16px]'
data-e2e={generateE2eId('clan_page.modal.limit_creation.title')}
>
{title}
</div>
<div className='pb-[20px] text-theme-primary text-[14px] leading-relaxed'>{bodyText}</div>
</div>
<div className='bg-theme-setting-nav flex justify-end items-center gap-4 p-[16px] text-[14px] font-medium rounded-b-md'>
Expand Down
1 change: 1 addition & 0 deletions libs/components/src/lib/components/ModalListClans/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const SidebarClanItem = ({ option, active, onMouseDown, className = '', onClanCl
data-id={option?.id}
className={`relative h-[40px] ${className}`}
title={option?.clan_name}
data-e2e={generateE2eId('clan_page.side_bar.clan_item')}
>
<button onClick={handleClick} draggable="false">
<NavLinkComponent active={active}>
Expand Down
3 changes: 3 additions & 0 deletions libs/utils/src/lib/e2e-testing/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ export const DATA_E2E_IDENTIFIER = {
cancel: ''
}
},
limit_creation: {
title: ''
},
delete_category: {
button: {
delete: ''
Expand Down
Loading