From daaeca1d25ba4f6fe931b15fab935c46c958b063 Mon Sep 17 00:00:00 2001
From: earthyoung <studydatawithme@gmail.com>
Date: Fri, 22 Nov 2024 20:58:46 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=ED=88=AC=EB=8D=B0=EC=9D=B4=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=9D=B8=EB=B0=95=EC=8A=A4=EB=A1=9C=20=ED=88=AC?=
 =?UTF-8?q?=EB=91=90=20=EC=95=88=20=EC=98=AE=EA=B2=A8=EC=A7=80=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/TodoModal.jsx                         | 16 ----------------
 .../inboxTodo/todoListItem/TodoListItem.tsx      |  1 +
 components/todayView/dailyTodos/DailyTodos.tsx   |  9 ++++++++-
 .../todayView/dailyTodos/dailyTodo/DailyTodo.jsx |  3 ++-
 .../dailyTodo/todoListItem/TodoListItem.tsx      |  5 ++++-
 .../todoListItem/todoMoreMenu/TodoMoreMenu.tsx   |  2 ++
 .../todoMoreMenu/useTodoMoreMenu.tsx             |  5 ++---
 7 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/components/TodoModal.jsx b/components/TodoModal.jsx
index 160e314..2ece996 100644
--- a/components/TodoModal.jsx
+++ b/components/TodoModal.jsx
@@ -252,22 +252,6 @@ const TodoModal = ({
                 <Text>{t('components.todoModal.changeTime')}</Text>
               </Button>
             </View>
-            {/* <View>
-              <Button
-                accessoryLeft={inboxIcon}
-                status="basic"
-                style={styles.button}
-                onPress={() => {
-                  handleLogEvent(TODOMODAL_MOVETOINBOX_CLICK_EVENT, {
-                    time: new Date().toISOString(),
-                    userId: userId,
-                    todoId: item.id,
-                  });
-                }}
-              >
-                <Text>{t('components.todoModal.putInbox')}</Text>
-              </Button>
-            </View> */}
           </View>
         </Card>
       </Modal>
diff --git a/components/inboxView/inboxTodos/inboxTodo/todoListItem/TodoListItem.tsx b/components/inboxView/inboxTodos/inboxTodo/todoListItem/TodoListItem.tsx
index 7099e44..d325777 100644
--- a/components/inboxView/inboxTodos/inboxTodo/todoListItem/TodoListItem.tsx
+++ b/components/inboxView/inboxTodos/inboxTodo/todoListItem/TodoListItem.tsx
@@ -20,6 +20,7 @@ interface TodoListItemProps extends RenderItemParams<Todo> {
   bottomSheetRef: React.MutableRefObject<any>;
   subTodoInputActivated: boolean;
   setSubTodoInputActivated: React.SetStateAction<boolean>;
+  categoryId: number;
 }
 
 const TodoListItem: React.FC<TodoListItemProps> = ({
diff --git a/components/todayView/dailyTodos/DailyTodos.tsx b/components/todayView/dailyTodos/DailyTodos.tsx
index c5162dd..61a8e45 100644
--- a/components/todayView/dailyTodos/DailyTodos.tsx
+++ b/components/todayView/dailyTodos/DailyTodos.tsx
@@ -54,7 +54,14 @@ const DailyTodos = ({ todosData, categoryId }) => {
   };
 
   const renderTodo = ({ item, drag, isActive }) => {
-    return <DailyTodo item={item} drag={drag} isActive={isActive} />;
+    return (
+      <DailyTodo
+        item={item}
+        drag={drag}
+        isActive={isActive}
+        categoryId={categoryId}
+      />
+    );
   };
 
   return (
diff --git a/components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx b/components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx
index 986e5a2..b26ef72 100644
--- a/components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx
+++ b/components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx
@@ -10,7 +10,7 @@ import SubTodoList from './subTodoList/SubTodoList';
 import TodoListItem from './todoListItem/TodoListItem';
 import useDailyTodo from './useDailyTodo';
 
-const DailyTodo = ({ item, drag, isActive }) => {
+const DailyTodo = ({ item, drag, isActive, categoryId }) => {
   const {
     isEditing,
     setIsEditing,
@@ -49,6 +49,7 @@ const DailyTodo = ({ item, drag, isActive }) => {
         getIndex={() => 0}
         onEdit={handleEdit}
         setSubTodoInputActivated={setSubTodoInputActivated}
+        categoryId={categoryId}
       />
       <SubTodoInfo
         itemNumber={item.children ? item.children.length : 0}
diff --git a/components/todayView/dailyTodos/dailyTodo/todoListItem/TodoListItem.tsx b/components/todayView/dailyTodos/dailyTodo/todoListItem/TodoListItem.tsx
index eaaa586..a16e3ba 100644
--- a/components/todayView/dailyTodos/dailyTodo/todoListItem/TodoListItem.tsx
+++ b/components/todayView/dailyTodos/dailyTodo/todoListItem/TodoListItem.tsx
@@ -3,11 +3,11 @@ import { Icon, ListItem, Text } from '@ui-kitten/components';
 import React from 'react';
 import { Pressable, StyleSheet, View } from 'react-native';
 import { RenderItemParams } from 'react-native-draggable-flatlist';
+import { moderateScale, scale, verticalScale } from 'react-native-size-matters';
 import { Todo } from '../../../../../types/todo';
 import EditableTextField from '../../../../common/molecules/EditableTextField';
 import TodoMoreMenu from './todoMoreMenu/TodoMoreMenu';
 import useTodoListItem from './useTodoListItem';
-import { moderateScale, scale, verticalScale } from 'react-native-size-matters';
 
 interface TodoListItemProps extends RenderItemParams<Todo> {
   isEditing: boolean;
@@ -21,6 +21,7 @@ interface TodoListItemProps extends RenderItemParams<Todo> {
   bottomSheetRef: React.MutableRefObject<any>;
   subTodoInputActivated: boolean;
   setSubTodoInputActivated: React.SetStateAction<boolean>;
+  categoryId: number;
 }
 
 const TodoListItem: React.FC<TodoListItemProps> = ({
@@ -33,6 +34,7 @@ const TodoListItem: React.FC<TodoListItemProps> = ({
   setIsSubTodoGenerateModalVisible,
   onEdit,
   setSubTodoInputActivated,
+  categoryId,
 }) => {
   const {
     theme,
@@ -69,6 +71,7 @@ const TodoListItem: React.FC<TodoListItemProps> = ({
         onEdit={onEdit}
         item={item}
         setSubTodoInputActivated={setSubTodoInputActivated}
+        categoryId={categoryId}
       />
     );
   };
diff --git a/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/TodoMoreMenu.tsx b/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/TodoMoreMenu.tsx
index f6c8fa6..f5e308a 100644
--- a/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/TodoMoreMenu.tsx
+++ b/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/TodoMoreMenu.tsx
@@ -53,6 +53,7 @@ const TodoMoreMenu = ({
   onEdit,
   item,
   setSubTodoInputActivated,
+  categoryId,
 }) => {
   const {
     handleEditPress,
@@ -64,6 +65,7 @@ const TodoMoreMenu = ({
     onEdit,
     item,
     setSubTodoInputActivated,
+    categoryId,
   });
   const [visible, setVisible] = useState(false);
   const { t } = useTranslation();
diff --git a/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/useTodoMoreMenu.tsx b/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/useTodoMoreMenu.tsx
index dea7a21..7578ca8 100644
--- a/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/useTodoMoreMenu.tsx
+++ b/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/useTodoMoreMenu.tsx
@@ -1,4 +1,3 @@
-import { CategoryContext } from '@/contexts/CategoryContext';
 import { LoginContext } from '@/contexts/LoginContext';
 import {
   useTodoDeleteMutation,
@@ -20,8 +19,8 @@ const useTodoMoreMenu = ({
   onEdit = () => {},
   setIsSubTodoGenerateModalVisible,
   setSubTodoInputActivated,
+  categoryId,
 }) => {
-  const { selectedCategory } = useContext(CategoryContext);
   const { userId } = useContext(LoginContext);
 
   const { mutate: updateTodoDate } = useTodoUpdateMutation();
@@ -39,7 +38,7 @@ const useTodoMoreMenu = ({
     const updatedTodo = {
       date: kstDate,
       todo_id: item.id,
-      category_id: selectedCategory,
+      category_id: categoryId,
     };
     updateTodoDate(updatedTodo);
   };