Merge main and resolve conflicts

- Keep local changes for refactored detail components
- Remove obsolete detail-page files
- Maintain bug fixes and type improvements

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
HyeonJongKim
2025-11-05 19:43:09 +09:00
12 changed files with 117 additions and 17 deletions

View File

@@ -35,6 +35,8 @@ import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access
import useIntersectionObserver from '@/widgets/intersection-observer';
import { useTranslation } from 'react-i18next';
import { AlimtalkDetail } from '@/entities/additional-service/ui/alimtalk/detail/alimtalk-detail';
import { checkGrant } from '@/shared/lib/check-grant';
import { showAlert } from '@/widgets/show-alert';
export const AlimtalkListPage = () => {
const { t } = useTranslation();
@@ -143,6 +145,10 @@ export const AlimtalkListPage = () => {
const onClickToOpenEmailBottomSheet = () => {
if (!checkGrant(58, 'D')) {
showAlert(t('common.nopermission'));
return;
}
setEmailBottomSheetOn(true);
}
@@ -182,6 +188,10 @@ export const AlimtalkListPage = () => {
};
const onClickToNavigate = () => {
if (!checkGrant(58, 'W')) {
showAlert(t('common.nopermission'));
return;
}
navigate(PATHS.additionalService.alimtalk.setting);
};
@@ -284,7 +294,7 @@ export const AlimtalkListPage = () => {
<button
className="download-btn"
aria-label="다운로드"
onClick={() => onClickToOpenEmailBottomSheet()}
onClick={onClickToOpenEmailBottomSheet}
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
@@ -304,7 +314,7 @@ export const AlimtalkListPage = () => {
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={() => onClickToNavigate()}
onClick={onClickToNavigate}
>{t('additionalService.alimtalk.serviceSetting')}</button>
</div>
<AlimtalkFilter