Skip to content

Commit 441a2ad

Browse files
committed
fix: conflict 에러 해결
1 parent e94a45e commit 441a2ad

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/components/ui/header/index.const.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export const NOT_VISIBLE_HEADER_PAGES = [
1313

1414
export const HEADER_TITLE_MAP = new Map([
1515
[paths.map.certification.getHref(), "목표인증"],
16-
[paths.goal.getHref(), "목표"],
17-
[paths.goal.create.getHref(), "목표추가"],
16+
[paths.goal.root.getHref(), "목표"],
17+
[paths.goal.create.getHref(), "목표추가"],
1818
[paths.profile.reward.getHref(), "리워드 신청"],
1919
[paths.auth.agreement.getHref(), "약관동의"],
2020
[paths.auth.phoneNumber.getHref(), "정보입력"]

src/features/auth/components/Agreement.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ const Agreement = () => {
6565
};
6666

6767
const handleSubmit = async () => {
68+
if (!userId) return;
69+
6870
try {
6971
const response = await postTermsAgree({
7072
data: { userId }

0 commit comments

Comments
 (0)