Merge branch 'develop' into main

Make-A-Wish-Sopt · Feb 15, 2024 · 4e805a1 · 4e805a1
2 parents c375d68 + 03f5a74
commit 4e805a1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/api/wishes.ts b/api/wishes.ts
@@ -149,6 +149,7 @@ export const putProgressWishes = async (
       name: methods.getValues('name'),
       startDate: methods.getValues('startDate'),
       endDate: methods.getValues('endDate'),
+      price: methods.getValues('price'),
     },
     {
       headers: {

diff --git a/components/Mypage/EditWishes/index.tsx b/components/Mypage/EditWishes/index.tsx
@@ -127,7 +127,6 @@ export default function EditWishesContainer() {
             preSignedImageUrl={preSignedImageUrl}
             uploadImageFile={uploadImageFile}
             methods={methods}
-            progressStatus={progressData?.status}
           />
         </>
       )}
@@ -137,7 +136,6 @@ export default function EditWishesContainer() {
           boxType="inputBox--large"
           placeholder="ex. 애플워치 -> ㅇㅍㅇㅊ"
           register={methods.register('initial')}
-          disabled={progressData?.status === 'WHILE'}
         >
           <InputLength inputLength={methods.watch('initial').length} limitLength={LIMIT_TEXT[15]} />
         </Input>
@@ -148,7 +146,6 @@ export default function EditWishesContainer() {
           boxType="inputBox--large"
           placeholder="ex. ㅇㅇ이의 앙큼 벌스데이"
           register={methods.register('title')}
-          disabled={progressData?.status === 'WHILE'}
         >
           <InputLength inputLength={methods.watch('title').length} limitLength={LIMIT_TEXT[20]} />
         </Input>
@@ -186,7 +183,6 @@ export default function EditWishesContainer() {
           inputLength={methods.watch('hint').length}
           limitLength={LIMIT_TEXT.DESCRIPTION}
           register={methods.register('hint')}
-          disabled={progressData?.status === 'WHILE'}
         />
       </InputContainer>
 

diff --git a/components/Wishes/WishesForm/UploadPresent.tsx b/components/Wishes/WishesForm/UploadPresent.tsx
@@ -18,11 +18,10 @@ interface UploadPresentProps {
   preSignedImageUrl: string;
   uploadImageFile: (e: ChangeEvent<HTMLInputElement>) => void;
   methods: UseFormReturn<WishesDataInputType, any, undefined>;
-  progressStatus?: 'WHILE' | 'BEFORE' | 'END';
 }
 
 export default function UploadPresent(props: UploadPresentProps) {
-  const { imageFile, preSignedImageUrl, uploadImageFile, methods, progressStatus } = props;
+  const { imageFile, preSignedImageUrl, uploadImageFile, methods } = props;
 
   useEffect(() => {
     if (preSignedImageUrl) methods.setValue('imageUrl', preSignedImageUrl);
@@ -59,7 +58,6 @@ export default function UploadPresent(props: UploadPresentProps) {
           boxType="inputBox--large"
           placeholder="ex. 12,000,000"
           register={methods.register('price', { required: true })}
-          disabled={progressStatus === 'WHILE'}
         >
           <InputLength
             inputLength={Number(methods.watch('price').toString().length)}