diff --git a/src/components/Trip/EditCodeModal.tsx b/src/components/Trip/EditCodeModal.tsx
index 8d674d6e..f5e5c7ea 100644
--- a/src/components/Trip/EditCodeModal.tsx
+++ b/src/components/Trip/EditCodeModal.tsx
@@ -63,14 +63,14 @@ const EditCodeModal = () => {
return (
<>
- {isToastVisible &&
}
+ {isToastVisible &&
}
{isLogin ? (
tripAuthority === 'WRITE' ? (
diff --git a/src/components/Trip/PlanTripButton.tsx b/src/components/Trip/PlanTripButton.tsx
index 01cb4eb9..ccba7409 100644
--- a/src/components/Trip/PlanTripButton.tsx
+++ b/src/components/Trip/PlanTripButton.tsx
@@ -24,7 +24,7 @@ const PlanTripButton = () => {
- 여행 계획하기
+ 여행 계획하기
diff --git a/src/components/Trip/TripSectionTop.tsx b/src/components/Trip/TripSectionTop.tsx
index 7679645f..7b40a52c 100644
--- a/src/components/Trip/TripSectionTop.tsx
+++ b/src/components/Trip/TripSectionTop.tsx
@@ -8,7 +8,7 @@ import { LikedToursList } from './LikedToursList';
import { useGetTripsAuthority } from '@hooks/useGetTripsAuthority';
import { useEffect, useState } from 'react';
import IsEditableModal from '@components/Share/IsEditableModal';
-import ScrollTopButton from '@components/Plan/ScrollTopButton';
+import ScrollTopButton from '@components/common/scrollTopButton/ScrollTopButton';
const TripSectionTop = () => {
const navigate = useNavigate();
diff --git a/src/components/Wish/Wish.tsx b/src/components/Wish/Wish.tsx
index ffe8c8af..11c5d8ef 100644
--- a/src/components/Wish/Wish.tsx
+++ b/src/components/Wish/Wish.tsx
@@ -5,7 +5,7 @@ import WishList from './WishList';
import NoDataMessage from '@components/common/noData/NoDataMessage';
import { getMemberTours } from '@api/member';
import { HeartIcon } from '@components/common/icons/Icons';
-import ScrollTopButton from '@components/Plan/ScrollTopButton';
+import ScrollTopButton from '@components/common/scrollTopButton/ScrollTopButton';
const Wish = () => {
const [selectedContentTypeId, setSelectedContentTypeId] = useState<
diff --git a/src/components/common/icons/Icons.tsx b/src/components/common/icons/Icons.tsx
index 1969e0b1..a33a26b2 100644
--- a/src/components/common/icons/Icons.tsx
+++ b/src/components/common/icons/Icons.tsx
@@ -1041,8 +1041,8 @@ export const TopIcon: React.FC
= () => {
};
export const ShareIcon: React.FC = ({
- width = 20,
- height = 19,
+ width = 17.9,
+ height = 17,
fill = 'none',
color = 'black',
}) => {
diff --git a/src/components/Plan/ScrollTopButton.tsx b/src/components/common/scrollTopButton/ScrollTopButton.tsx
similarity index 87%
rename from src/components/Plan/ScrollTopButton.tsx
rename to src/components/common/scrollTopButton/ScrollTopButton.tsx
index 9f16e9b6..2eb1bcbc 100644
--- a/src/components/Plan/ScrollTopButton.tsx
+++ b/src/components/common/scrollTopButton/ScrollTopButton.tsx
@@ -28,14 +28,13 @@ const ScrollTopButton = () => {
}
return (
-
-
-
+ style={{ left: 'calc(100%)' }}
+ onClick={scrollToTop}>
+
+
);
};
diff --git a/src/components/common/toastpopup/ToastPopUp.tsx b/src/components/common/toastpopup/ToastPopUp.tsx
index 004ebacd..75c28bb0 100644
--- a/src/components/common/toastpopup/ToastPopUp.tsx
+++ b/src/components/common/toastpopup/ToastPopUp.tsx
@@ -22,8 +22,10 @@ const ToastPopUp: React.FC = ({ noun, verb }) => {
}, []);
useEffect(() => {
- if (noun === '일정' || noun === '날짜 이동' || noun === '여행 일정') {
+ if (noun === '일정' || noun === '날짜 이동') {
setParticle('이');
+ } else if (noun === '나의 여정') {
+ setParticle('에서');
}
}, [noun]);
diff --git a/src/components/search/SearchResult.tsx b/src/components/search/SearchResult.tsx
index 952e1e2c..c420e2b5 100644
--- a/src/components/search/SearchResult.tsx
+++ b/src/components/search/SearchResult.tsx
@@ -4,7 +4,7 @@ import { useInfiniteQuery } from '@tanstack/react-query';
import ToursCategoryItem from '@components/Tours/ToursCategoryItem';
import { useEffect, useState } from 'react';
import { Spinner } from '@components/common/spinner/Spinner';
-import ScrollTopButton from '@components/Plan/ScrollTopButton';
+import ScrollTopButton from '@components/common/scrollTopButton/ScrollTopButton';
interface SearchResultProps {
selectedRegion: string | null;