🔀 [fix] : conflict resolved

Author: Minkyu0424

.github/workflows/create-jira-bug-issue.yml

@@ -74,24 +74,9 @@ jobs:
       - name: Log created issue
         run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created"
 
-      - name: Checkout release code
-        uses: actions/checkout@v4
-        with:
-          ref: release
-          token: ${{ secrets.PAT_TOKEN }}
-
-      - name: Create branch with Ticket number
-        run: |
-          git config user.name github-actions
-          git config user.email [email protected]
-          git checkout -b ${{ steps.create.outputs.issue }}
-          git push origin ${{ steps.create.outputs.issue }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
-
       - name: Update issue title
         uses: actions-cool/issues-helper@v3
         with:
           actions: "update-issue"
           token: ${{ secrets.PAT_TOKEN }}
-          title: "${{ steps.create.outputs.issue }} ${{ github.event.issue.title }}"
+          title: "${{ steps.create.outputs.issue }} ${{ github.event.issue.title }}"

src/components/common/ModalView.vue

@@ -81,9 +81,9 @@
 
 <script setup lang="ts">
 import { failIcon, successIcon, warningIcon } from '@/constants/iconPath'
-import { preventEnter } from '@/utils/preventEnter'
 import { onUnmounted, ref, watch } from 'vue'
 import CommonIcons from './CommonIcons.vue'
+import { preventEnter } from '@/utils/preventEnter'
 
 const { isOpen, type, modelValue } = defineProps<{
   isOpen: boolean
@@ -116,7 +116,6 @@ watch(
   () => isOpen,
   () => {
     if (isOpen) {
-      textValue.value = ''
       document.body.style.overflow = 'hidden'
       window.addEventListener('keydown', preventEnter)
     } else {

src/components/task-detail/TaskDetailHistory.vue

@@ -40,9 +40,7 @@
           </div>
           <div class="flex w-full flex-col items-center">
             <TaskDetailHistoryChat
-              v-if="
-                item.taskHistoryType === 'COMMENT' || item.taskHistoryType === 'TASK_TERMINATED'
-              "
+              v-if="item.taskHistoryType === 'COMMENT'"
               :history="item"
               :requestor-name="requestorName"
               :task-id="taskId" />

src/components/task-detail/TaskDetailHistoryChat.vue

@@ -21,7 +21,7 @@
             'flex max-w-[400px] flex-wrap px-4 py-3 text-base rounded-lg font-normal',
             isRequestor ? 'bg-background-2' : 'bg-primary2'
           ]">
-          {{ history.details.commentDetails?.comment || history.details.taskDetails?.value }}
+          {{ history.details.commentDetails?.comment }}
         </p>
         <div
           :class="[

src/components/task-detail/TaskStatusList.vue

@@ -95,7 +95,7 @@ const rejectRequest = async () => {
     return
   }
   try {
-    await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, { reason: rejectReason.value })
+    await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, rejectReason)
     toggleModal('success')
     emit('update:status', 'TERMINATED')
     currentStatus.value = 'TERMINATED'

src/components/user-manage/UserRegistration.vue

@@ -23,7 +23,7 @@
         :labelName="'이메일'" />
       <RequestTaskInput
         v-model="userRegistrationForm.email"
-        :placeholderText="'@kakaocorp.com'"
+        :placeholderText="'@kakao.com'"
         :label-name="'도메인'"
         :is-not-required="false" />
     </div>

src/views/LoginView.vue

@@ -107,7 +107,7 @@ const handleLogin = async () => {
               '로그인 시도 5회 초과로 계정이 정지되었습니다\n30분 후 다시 시도해주세요'
           } else {
             messageHeader.value = '일치하는 정보가 없습니다'
-            messageBody.value = '아이디과 비밀번호를 다시 확인해주세요'
+            messageBody.value = '닉네임과 비밀번호를 다시 확인해주세요'
           }
           isModalVisible.value = !isModalVisible.value
           break