diff --git a/apps/app/.eslintrc.cjs b/apps/app/.eslintrc.cjs
index a3d12025..369d97a1 100644
--- a/apps/app/.eslintrc.cjs
+++ b/apps/app/.eslintrc.cjs
@@ -40,6 +40,8 @@ module.exports = {
     '*.d.ts',
     'vendor',
     '*.json',
+    'src/@core/**',
+    'src/@layouts/**',
   ],
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
diff --git a/apps/app/src/components/shifts/ShiftDetailPanel.vue b/apps/app/src/components/shifts/ShiftDetailPanel.vue
index 2821c6c4..717fbf78 100644
--- a/apps/app/src/components/shifts/ShiftDetailPanel.vue
+++ b/apps/app/src/components/shifts/ShiftDetailPanel.vue
@@ -245,6 +245,10 @@ function executeApprove(assignment: ShiftAssignment) {
   })
 }
 
+// Cancel dialog
+const isCancelDialogOpen = ref(false)
+const cancellingAssignment = ref<ShiftAssignment | null>(null)
+
 function onCancel(assignment: ShiftAssignment) {
   cancellingAssignment.value = assignment
   isCancelDialogOpen.value = true
@@ -302,10 +306,6 @@ function onRejectExecute() {
   )
 }
 
-// Cancel dialog
-const isCancelDialogOpen = ref(false)
-const cancellingAssignment = ref<ShiftAssignment | null>(null)
-
 // Bulk approve dialog
 const isBulkApproveDialogOpen = ref(false)
 
diff --git a/apps/app/src/composables/api/useFormSchemas.ts b/apps/app/src/composables/api/useFormSchemas.ts
index 821ba253..56a12383 100644
--- a/apps/app/src/composables/api/useFormSchemas.ts
+++ b/apps/app/src/composables/api/useFormSchemas.ts
@@ -94,9 +94,9 @@ export function useDeleteFormSchema(orgId: Ref<string>) {
   const queryClient = useQueryClient()
 
   return useMutation({
-    mutationFn: async ({ id, confirmed_name }: { id: string; confirmed_name?: string }) => {
+    mutationFn: async ({ id, confirmedName }: { id: string; confirmedName?: string }) => {
       await apiClient.delete(`/organisations/${orgId.value}/forms/schemas/${id}`, {
-        params: confirmed_name ? { confirmed_name } : undefined,
+        params: confirmedName ? { confirmed_name: confirmedName } : undefined,
       })
     },
     onSuccess: () => {
diff --git a/apps/app/src/layouts/blank.vue b/apps/app/src/layouts/blank.vue
index c813e810..04a649a3 100644
--- a/apps/app/src/layouts/blank.vue
+++ b/apps/app/src/layouts/blank.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type AppLoadingIndicator from '@/components/AppLoadingIndicator.vue'
+
 const { injectSkinClasses } = useSkins()
 
 // ℹ️ This will inject classes in body tag for accurate styling
@@ -6,7 +8,7 @@ injectSkinClasses()
 
 // SECTION: Loading Indicator
 const isFallbackStateActive = ref(false)
-const refLoadingIndicator = ref<any>(null)
+const refLoadingIndicator = ref<InstanceType<typeof AppLoadingIndicator> | null>(null)
 
 // watching if the fallback state is active and the refLoadingIndicator component is available
 watch([isFallbackStateActive, refLoadingIndicator], () => {
diff --git a/apps/app/src/layouts/components/NavSearchBar.vue b/apps/app/src/layouts/components/NavSearchBar.vue
index 55ead4f8..7694f703 100644
--- a/apps/app/src/layouts/components/NavSearchBar.vue
+++ b/apps/app/src/layouts/components/NavSearchBar.vue
@@ -106,7 +106,7 @@ const searchResult = ref<SearchResults[]>([])
 const fetchResults = async () => {
   isLoading.value = true
 
-  const { data } = await useApi<any>(withQuery('/app-bar/search', { q: searchQuery.value }))
+  const { data } = await useApi<SearchResults[]>(withQuery('/app-bar/search', { q: searchQuery.value }))
 
   searchResult.value = data.value
 
diff --git a/apps/app/src/layouts/default.vue b/apps/app/src/layouts/default.vue
index 7873cd87..3a7257b5 100644
--- a/apps/app/src/layouts/default.vue
+++ b/apps/app/src/layouts/default.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import type AppLoadingIndicator from '@/components/AppLoadingIndicator.vue'
 import { useConfigStore } from '@core/stores/config'
 import { AppContentLayoutNav } from '@layouts/enums'
 import { switchToVerticalNavOnLtOverlayNavBreakpoint } from '@layouts/utils'
@@ -18,7 +19,7 @@ injectSkinClasses()
 
 // SECTION: Loading Indicator
 const isFallbackStateActive = ref(false)
-const refLoadingIndicator = ref<any>(null)
+const refLoadingIndicator = ref<InstanceType<typeof AppLoadingIndicator> | null>(null)
 
 // watching if the fallback state is active and the refLoadingIndicator component is available
 watch([isFallbackStateActive, refLoadingIndicator], () => {
diff --git a/apps/app/src/stores/useImpersonationStore.ts b/apps/app/src/stores/useImpersonationStore.ts
index 1ee318ac..a690abb4 100644
--- a/apps/app/src/stores/useImpersonationStore.ts
+++ b/apps/app/src/stores/useImpersonationStore.ts
@@ -116,10 +116,10 @@ export const useImpersonationStore = defineStore('impersonation', () => {
   }
 
   function restoreFromStorage(): void {
-    const stored = sessionStorage.getItem(SESSION_STORAGE_KEY)
-    if (stored) {
+    const storedSnapshot = sessionStorage.getItem(SESSION_STORAGE_KEY)
+    if (storedSnapshot) {
       try {
-        state.value = JSON.parse(stored) as ImpersonationState
+        state.value = JSON.parse(storedSnapshot) as ImpersonationState
       }
       catch {
         sessionStorage.removeItem(SESSION_STORAGE_KEY)