nicepayments/nice-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge main and resolve conflicts

Browse Source 
- 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
parent 24435e47d6 ab528b38f1
commit 82fceaaa67
12 changed files with 117 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pages/additional-service/alimtalk/list-page.tsx
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

14
src/pages/additional-service/ars/list-page.tsx
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>

12
src/pages/additional-service/face-auth/face-auth-page.tsx
View File

@@ -1,11 +1,11 @@
import moment from 'moment';
import { AdditionalServiceCategory, ProcessResult } from '@/entities/additional-service/model/types';
import { AdditionalServiceCategory } from '@/entities/additional-service/model/types';
import { DefaultRequestPagination, HeaderType, SortTypeKeys } from '@/entities/common/model/types';
import { SortTypeBox } from '@/entities/common/ui/sort-type-box';
import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { IMAGE_ROOT } from '@/shared/constants/common';
import { JSX, useEffect, useState } from 'react';
import { useEffect, useState } from 'react';
import { useStore } from '@/shared/model/store';
import { PATHS } from '@/shared/constants/paths';
import {
@@ -25,6 +25,8 @@ import { ListDateGroup } from '@/entities/additional-service/ui/list-date-group'
import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check';
import useIntersectionObserver from '@/widgets/intersection-observer';
import { useTranslation } from 'react-i18next';
import { checkGrant } from '@/shared/lib/check-grant';
import { showAlert } from '@/widgets/show-alert';
export const FaceAuthPage = () => {
const { navigate } = useNavigate();
@@ -126,6 +128,10 @@ export const FaceAuthPage = () => {
};
const onClickToOpenEmailBottomSheet = () => {
if (!checkGrant(65, 'D')) {
showAlert(t('common.nopermission'));
return;
}
setEmailBottomSheetOn(true);
};
@@ -244,7 +250,7 @@ export const FaceAuthPage = () => {
<button
className="download-btn"
aria-label={t('transaction.download')}
onClick={() => onClickToOpenEmailBottomSheet()}
onClick={onClickToOpenEmailBottomSheet}
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}

8
src/pages/additional-service/key-in-payment/key-in-payment-page.tsx
View File

@@ -25,6 +25,8 @@ import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet';
import { useTranslation } from 'react-i18next';
import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check';
import useIntersectionObserver from '@/widgets/intersection-observer';
import { checkGrant } from '@/shared/lib/check-grant';
import { showAlert } from '@/widgets/show-alert';
export const KeyInPaymentPage = () => {
const { navigate } = useNavigate();
@@ -133,6 +135,10 @@ export const KeyInPaymentPage = () => {
};
const onClickToOpenEmailBottomSheet = () => {
if (!checkGrant(56, 'D')) {
showAlert(t('common.nopermission'));
return;
}
setEmailBottomSheetOn(true);
};
@@ -207,11 +213,11 @@ export const KeyInPaymentPage = () => {
<button
className="download-btn"
aria-label="다운로드"
onClick={onClickToOpenEmailBottomSheet}
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
alt="다운로드"
onClick={() => onClickToOpenEmailBottomSheet()}
/>
</button>
</div>

14
src/pages/additional-service/payout/list-page.tsx
View File

@@ -34,6 +34,8 @@ import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access
import useIntersectionObserver from '@/widgets/intersection-observer';
import { PayoutList } from '@/entities/additional-service/ui/payout/payout-list';
import { PayoutDetail } from '@/entities/additional-service/ui/payout/detail/payout-detail';
import { checkGrant } from '@/shared/lib/check-grant';
import { showAlert } from '@/widgets/show-alert';
export const PayoutListPage = () => {
// Access check
@@ -88,6 +90,10 @@ export const PayoutListPage = () => {
});
const onClickToNavigation = () => {
if (!checkGrant(53, 'W')) {
showAlert(t('common.nopermission'));
return;
}
navigate(PATHS.additionalService.payout.request);
};
@@ -144,6 +150,10 @@ export const PayoutListPage = () => {
};
const onClickToOpenEmailBottomSheet = () => {
if (!checkGrant(53, 'D')) {
showAlert(t('common.nopermission'));
return;
}
setEmailBottomSheetOn(true);
};
@@ -273,7 +283,7 @@ export const PayoutListPage = () => {
<button
className="download-btn"
aria-label={t('common.download')}
onClick={() => onClickToOpenEmailBottomSheet()}
onClick={onClickToOpenEmailBottomSheet}
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
@@ -323,7 +333,7 @@ export const PayoutListPage = () => {
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={() => onClickToNavigation()}
onClick={onClickToNavigation}
>{t('additionalService.payout.requestTitle')}</button>
</div>
</div>

8
src/pages/additional-service/sms-payment/sms-payment-page.tsx
View File

@@ -25,6 +25,8 @@ import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet';
import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check';
import useIntersectionObserver from '@/widgets/intersection-observer';
import { set } from 'lodash-es';
import { checkGrant } from '@/shared/lib/check-grant';
import { showAlert } from '@/widgets/show-alert';
export const SmsPaymentPage = () => {
const { t } = useTranslation();
@@ -135,6 +137,10 @@ export const SmsPaymentPage = () => {
}
const onClickToOpenEmailBottomSheet = () => {
if (!checkGrant(57, 'D')) {
showAlert(t('common.nopermission'));
return;
}
setEmailBottomSheetOn(true);
};
@@ -209,11 +215,11 @@ export const SmsPaymentPage = () => {
<button
className="download-btn"
aria-label="다운로드"
onClick={onClickToOpenEmailBottomSheet}
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
alt="다운로드"
onClick={() => onClickToOpenEmailBottomSheet()}
/>
</button>
</div>