Client - minor fixes

SamR1 · Oct 2, 2024 · 53f5cbb · 53f5cbb
1 parent f7587a6
commit 53f5cbb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/fittrackee_client/src/components/Common/ActionAppeal.vue b/fittrackee_client/src/components/Common/ActionAppeal.vue
@@ -13,7 +13,7 @@
           <i class="fa fa-info-circle" aria-hidden="true" />
           {{ $t(`user.APPEAL_${success ? 'SUBMITTED' : 'IN_PROGRESS'}`) }}
           <button
-            v-if="!success"
+            v-if="!success && $route.name != 'AuthUserAccountSuspension'"
             class="transparent hide-button"
             @click="emit('hideMessage')"
           >

diff --git a/fittrackee_client/src/components/Notifications/NotificationDetail.vue b/fittrackee_client/src/components/Notifications/NotificationDetail.vue
@@ -110,7 +110,17 @@
         </div>
       </div>
       <div v-if="notification.report_action?.action_type === 'user_warning'">
+        <div
+          class="info-box appeal-in-progress"
+          v-if="notification.report_action?.appeal?.approved === null"
+        >
+          <span>
+            <i class="fa fa-info-circle" aria-hidden="true" />
+            {{ $t(`user.APPEAL_IN_PROGRESS`) }}
+          </span>
+        </div>
         <router-link
+          v-else-if="!notification.report_action?.appeal"
           class="appeal-link"
           :to="`profile/warning/${notification.report_action.id}/appeal`"
         >
@@ -349,5 +359,9 @@
         }
       }
     }
+
+    .appeal-in-progress {
+      margin-top: $default-margin * 0.5;
+    }
   }
 </style>
diff --git a/fittrackee_client/src/types/user.ts b/fittrackee_client/src/types/user.ts
@@ -184,12 +184,14 @@ export interface IFollowRequestsActionPayload {
 }
 
 export interface IReportActionAppeal {
+  admin_user: IUserLightProfile | null
   approved: boolean | null
   created_at: string
   id: string
   reason: string | null
   text: string
   updated_at: string
+  user: IUserLightProfile
 }
 
 export interface IUserReportAction {