From 45fce371d017fc0f567b5eade1bb6bf797ca756d Mon Sep 17 00:00:00 2001
From: synan798 <s.j.kavuncu@gmail.com>
Date: Wed, 11 Dec 2024 13:01:42 +0100
Subject: [PATCH] fixed condition for opening modal

---
 components/home/Users/UserBox.vue | 3 ++-
 components/profile/UserModal.vue  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/home/Users/UserBox.vue b/components/home/Users/UserBox.vue
index ed78456..a7ef88e 100644
--- a/components/home/Users/UserBox.vue
+++ b/components/home/Users/UserBox.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { FriendshipStatus } from '@/types/api/user.friends';
+import { UserViewType } from '@/types/components/users.view';
 
 const props = defineProps({
   profilePicture: {
@@ -64,5 +65,5 @@ const showModal = ref(false);
       <Icon name="mdi:play" class="w-8 h-8 sm:w-10 sm:h-10 md:w-12 md:h-12 lg:w-14 lg:h-14 text-white" />
     </button>
   </div>
-  <ProfileUserModal v-show="showModal" :profile-picture="props.profilePicture" :name="props.name" :friendship-id="props.friendshipId" :friends-status="props.friendsStatus" :friend-id="props.friendId" :view-type="props.viewType" @close-modal="showModal = false"/>
+  <ProfileUserModal v-if="viewType === UserViewType.FRIENDS || viewType === UserViewType.REQUESTS" v-show="showModal" :profile-picture="props.profilePicture" :name="props.name" :friendship-id="props.friendshipId" :friends-status="props.friendsStatus" :friend-id="props.friendId" :view-type="props.viewType" @close-modal="showModal = false"/>
 </template>
\ No newline at end of file
diff --git a/components/profile/UserModal.vue b/components/profile/UserModal.vue
index e0de945..9e9bf79 100644
--- a/components/profile/UserModal.vue
+++ b/components/profile/UserModal.vue
@@ -22,7 +22,7 @@ const props = defineProps({
         default: FriendshipStatus.ACCEPTED
     },
     friendId: {
-        type: Number,
+        type: String,
         required: true
     },
     viewType: {
@@ -81,9 +81,9 @@ async function getFriendInformation() {
     <div class="modal-overlay">
         <div class="modal">
             <NuxtImg :src="profilePicture" class="rounded-full h-32 w-32 mb-3" />
-            <p v-if="props.viewType === UserViewType.SENTREQUESTS">Do you want to accept {{ name }}'s friend request?'</p>
+            <p v-if="props.viewType === UserViewType.REQUESTS">Do you want to accept {{ name }}'s friend request?'</p>
             <p v-else>Streak: {{  }}</p>
-            <div v-if="props.viewType === UserViewType.SENTREQUESTS" class="flex mt-5 gap-10">
+            <div v-if="props.viewType === UserViewType.REQUESTS" class="flex mt-5 gap-10">
                 <div :class="icon_wrapper" @click="handleFriendship(FriendshipAction.DECLINE)">
                     <Icon name="mdi:close" class="text-5xl text-red-600"  />
                 </div>