Skip to content

[OD-182] 로그아웃 모달 변경 #130

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
gustn99 merged 4 commits into from
Feb 24, 2025
Merged

[OD-182] 로그아웃 모달 변경 #130

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7bdcc9
Merge pull request #99 from oodd-team/dev
gustn99 Dec 17, 2024
9c218f1
Merge pull request #123 from oodd-team/dev
gustn99 Dec 29, 2024
6879823
Merge pull request #129 from oodd-team/dev
gustn99 Jan 5, 2025
ce3406d
Refactor: 로그아웃 모달 변경
lalaurrel Feb 24, 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
10 changes: 5 additions & 5 deletions src/pages/Account/AccountSetting/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import imageBasic from '@assets/default/defaultProfile.svg';
import leave from '@assets/default/leave.svg';
import Profile_s from '@assets/default/my-page.svg';

import ConfirmationModal from '@components/ConfirmationModal/index';
import { OODDFrame } from '@components/Frame/Frame';
import Loading from '@components/Loading/index';
import Modal from '@components/Modal';
import { StyledText } from '@components/Text/StyledText';
import TopBar from '@components/TopBar/index';

Expand Down Expand Up @@ -111,11 +111,11 @@ const AccountSetting: React.FC = () => {
</List>

{isLogoutModalOpen && (
<ConfirmationModal
<Modal
content="이 기기에서 정말 로그아웃 할까요?"
isCancelButtonVisible={true}
confirm={{ text: '로그아웃', action: handleConfirmLogout }}
onCloseModal={handleCloseModal}
onClose={handleCloseModal}
button={{ content: '확인', onClick: handleConfirmLogout }}
isCloseButtonVisible={true}
/>
)}
</ProfileEditContainer>
Expand Down