Merge branch 'HansGabriel:main' into main

HansGabriel · Dec 5, 2023 · ff74ff9 · ff74ff9
2 parents 9af6213 + 800002f
commit ff74ff9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/apps/expo/src/screens/create-question/index.tsx b/apps/expo/src/screens/create-question/index.tsx
@@ -669,6 +669,10 @@ export const CreateQuestionScreen: FC = () => {
           <QuestionOptionsDropdown
             isDeleting={isDeleting}
             setOpenDeleteAlert={() => setOpenDeleteAlert(true)}
+            isSaved={!isSaved}
+            handleSaveAnswer={handleSaveAnswer(() => {
+              setIsSaved(false);
+            })}
           />
         }
         backIcon={<Feather name="x" size={24} color="black" />}
@@ -822,21 +826,6 @@ export const CreateQuestionScreen: FC = () => {
             .with(undefined, () => <></>)
             .exhaustive()}
 
-          <TouchableOpacity
-            className={`mt-10 w-[50%] items-center justify-center self-center rounded-[100px] border-b border-l border-r border-t border-indigo-800 bg-violet-600 py-[18px] ${
-              !isSaved ? "opacity-50" : ""
-            }`}
-            // eslint-disable-next-line @typescript-eslint/no-empty-function
-            onPress={handleSaveAnswer(() => {
-              setIsSaved(false);
-            })}
-            disabled={!isSaved}
-          >
-            <Text className="text-center text-base font-bold text-white">
-              Save
-            </Text>
-          </TouchableOpacity>
-
           <Modal
             animationType="fade"
             transparent={true}

diff --git a/apps/expo/src/screens/create-question/question-options-dropdown.tsx b/apps/expo/src/screens/create-question/question-options-dropdown.tsx
@@ -7,11 +7,15 @@ import type { FC } from "react";
 interface Props {
   isDeleting: boolean;
   setOpenDeleteAlert: () => void;
+  isSaved: boolean;
+  handleSaveAnswer: () => void;
 }
 
 const QuestionOptionsDropdown: FC<Props> = ({
   isDeleting,
   setOpenDeleteAlert,
+  isSaved,
+  handleSaveAnswer,
 }) => {
   return (
     <View className="relative flex-row space-x-4">
@@ -22,7 +26,7 @@ const QuestionOptionsDropdown: FC<Props> = ({
           <AntDesign name="delete" size={24} color="red" />
         )}
       </TouchableOpacity>
-      <TouchableOpacity>
+      <TouchableOpacity disabled={isSaved} onPress={handleSaveAnswer}>
         <Entypo name="save" size={25} color="rgb(79 70 229)" />
       </TouchableOpacity>
     </View>