From 6fa5b87d4828ab5ed805650972a2102cfc6f283a Mon Sep 17 00:00:00 2001
From: yyypearl <hor629@naver.com>
Date: Thu, 27 Feb 2025 18:35:41 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(#155):=20=ED=8E=B8=EC=A7=80?=
 =?UTF-8?q?=20=EC=9D=B4=EB=8F=99=20=ED=98=84=EC=9E=AC=20=ED=96=89=EC=84=B1?=
 =?UTF-8?q?=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/planet/move/page.tsx | 15 +++++++++++----
 src/app/planet/page.tsx      | 25 ++++++++++++-------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/app/planet/move/page.tsx b/src/app/planet/move/page.tsx
index 05051ee4..bdf5c285 100644
--- a/src/app/planet/move/page.tsx
+++ b/src/app/planet/move/page.tsx
@@ -16,6 +16,9 @@ import Image from 'next/image';
 import { getSpaceList } from '@/api/planet/space/space';
 import { useToast } from '@/hooks/useToast';
 import { Planet } from '@/types/planet';
+import { useRecoilValue } from 'recoil';
+import { spaceState } from '@/recoil/spaceStore';
+import { getSpaceId } from '@/utils/storage';
 
 const PlanetMovePage = () => {
   const router = useRouter();
@@ -23,9 +26,13 @@ const PlanetMovePage = () => {
   const searchParams = useSearchParams();
   const letterId = searchParams.get('letter');
   const senderName = searchParams.get('senderName');
+  const viewSpaceId = useRecoilValue(spaceState);
+  const mainSpaceId = getSpaceId();
 
   const [planets, setPlanets] = useState<Planet[]>();
-  const [checkedPlanet, setCheckedPlanet] = useState<string>('');
+  const [checkedPlanet, setCheckedPlanet] = useState<string>(
+    viewSpaceId || mainSpaceId
+  );
   const [checkedIndep, setCheckedIndep] = useState<boolean>(false);
   const [checkePlanetName, setCheckedPlanetName] = useState<string>('');
 
@@ -35,7 +42,6 @@ const PlanetMovePage = () => {
         const response = await getSpaceList();
         console.log('전체 스페이스 목록 조회 성공:', response.data);
         setPlanets(response.data.spaces);
-        setCheckedPlanet(response.data.spaces[0].spaceId);
       } catch (error) {
         console.error('전체 스페이스 목록 조회 실패:', error);
       }
@@ -116,7 +122,7 @@ const PlanetMovePage = () => {
               planetName={item.spaceName}
               count={item.letterCount}
               checked={checkedPlanet}
-              current={index === 0}
+              current={item.spaceId === (viewSpaceId || mainSpaceId)}
               onClick={() => {
                 handleChangeChecked(item);
               }}
@@ -149,7 +155,8 @@ const PlanetMovePage = () => {
           text="이동하기"
           disabled={
             (checkedPlanet === '' && checkedIndep === false) ||
-            checkedPlanet === planets?.[0]?.spaceId
+            checkedPlanet === planets?.[0]?.spaceId ||
+            checkedPlanet === (viewSpaceId || mainSpaceId)
           }
           onClick={handleMovePlanet}
         />
diff --git a/src/app/planet/page.tsx b/src/app/planet/page.tsx
index a28b3d24..08974afd 100644
--- a/src/app/planet/page.tsx
+++ b/src/app/planet/page.tsx
@@ -8,23 +8,21 @@ import Tag from '@/components/common/Tag';
 import { theme } from '@/styles/theme';
 import Pagination from '@/components/common/Pagination';
 import { useRouter } from 'next/navigation';
-import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
+import { useRecoilState, useRecoilValue } from 'recoil';
 import { getMainId, getSpaceInfo, putSpace } from '@/api/planet/space/space';
 import {
   getOrbitLetter,
   getPlanetLetterList,
-  putLetterToIndep,
   putLetterToPlanet
 } from '@/api/planet/letter/spaceLetter';
 import Loader from '@/components/common/Loader';
 import { SpaceInfo } from '@/types/space';
 import {
   getAccessToken,
-  getCookie,
   getInitUserToast,
   getOnboarding,
-  setCookie,
-  setInitUserToast
+  setInitUserToast,
+  setSpaceId
 } from '@/utils/storage';
 import { getLetterCount } from '@/api/letter/letter';
 import PlanetSlide from '@/components/planet/PlanetSlide';
@@ -158,6 +156,7 @@ const PlanetPage = () => {
       const response = await getMainId();
       console.log('메인 ID 조회 성공:', response.data);
       if (!viewSpaceId) {
+        setSpaceId(response.data.spaceId);
         setSpaceInfo({
           spaceId: response.data.spaceId,
           spaceName: response.data.spaceName,
@@ -531,14 +530,14 @@ const PlanetPage = () => {
                   onOrbitTouch={handleTagTouch}
                 />
               </BottomWrapper>
-              {/* {showTooltip && ( */}
-              <Tooltip
-                message={`먼저 편지를 보관한 후, 행성으로 끌어 당겨보세요`}
-                close={true}
-                bottom="230px"
-                onClose={() => setShowTooltip(false)}
-              />
-              {/* )} */}
+              {showTooltip && (
+                <Tooltip
+                  message={`먼저 편지를 보관한 후, 행성으로 끌어 당겨보세요`}
+                  close={true}
+                  bottom="230px"
+                  onClose={() => setShowTooltip(false)}
+                />
+              )}
             </Container>
           </>
         )}