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

@@ -26,6 +26,8 @@ import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access
import useIntersectionObserver from '@/widgets/intersection-observer';
import { ArsList } from '@/entities/additional-service/ui/ars/ars-list';
import { ArsDetail } from '@/entities/additional-service/ui/ars/detail/ars-detail';
import { checkGrant } from '@/shared/lib/check-grant';
import { showAlert } from '@/widgets/show-alert';
export const ArsListPage = () => {
const { navigate } = useNavigate();
@@ -136,6 +138,10 @@ export const ArsListPage = () => {
};
const onClickToOpenEmailBottomSheet = () => {
if (!checkGrant(52, 'D')) {
showAlert(t('common.nopermission'));
return;
}
setEmailBottomSheetOn(true);
};
@@ -170,6 +176,10 @@ export const ArsListPage = () => {
};
const onClickToNavigate = () => {
if (!checkGrant(52, 'X')) {
showAlert(t('common.nopermission'));
return;
}
navigate(PATHS.additionalService.ars.request, {
state: { mid }
});
@@ -230,7 +240,7 @@ export const ArsListPage = () => {
<button
className="download-btn"
aria-label={t('common.download')}
onClick={() => onClickToOpenEmailBottomSheet()}
onClick={onClickToOpenEmailBottomSheet}
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
@@ -272,7 +282,7 @@ export const ArsListPage = () => {
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={() => onClickToNavigate()}
onClick={onClickToNavigate}
>{t('additionalService.ars.paymentRequest')}</button>
</div>
</main>