widgetify-app · sajjadmrx · Aug 13, 2026 · Jul 31, 2026 · Jul 31, 2026 · Jul 31, 2026
diff --git a/src/App.tsx → src/app.tsx b/src/App.tsx → src/app.tsx
diff --git a/src/common/constant/store.key.ts b/src/common/constant/store.key.ts
@@ -2,7 +2,7 @@ import type { CurrencyColorMode } from '@/context/currency.context'
 import type { WidgetItem } from '@/context/widget-visibility.context'
 import type { Bookmark } from '@/layouts/bookmark/types/bookmark.types'
 import type { PetSettings } from '@/layouts/widgetify-card/pets/pet.context'
-import type { ComboTabType } from '@/layouts/widgets/comboWidget/combo-widget.layout'
+import type { ComboTabType } from '@/layouts/widgets/combo-widget/combo-widget.layout'
 import type { WigiNewsSetting } from '@/layouts/widgets/news/rss.interface'
 import type {
 	PomodoroSession,
@@ -14,12 +14,12 @@ import type {
 	FetchedWeather,
 	WeatherSettings,
 } from '@/layouts/widgets/weather/weather.interface'
-import type { ClockSettings } from '@/layouts/widgets/wigiPad/clock-display/clock-setting.interface'
-import type { WigiPadDateSetting } from '@/layouts/widgets/wigiPad/date-display/date-setting.interface'
+import type { ClockSettings } from '@/layouts/widgets/wigi-pad/clock-display/clock-setting.interface'
+import type { WigiPadDateSetting } from '@/layouts/widgets/wigi-pad/date-display/date-setting.interface'
 import type { ExtensionConfigResponse } from '@/services/config-data/config_data-api'
-import type { FetchedCurrency } from '@/services/hooks/currency/getCurrencyByCode.hook'
-import type { RecommendedSite, TrendItem } from '@/services/hooks/trends/getTrends'
-import type { UserProfile } from '@/services/hooks/user/userService.hook'
+import type { FetchedCurrency } from '@/services/hooks/currency/get-currency-by-code.hook'
+import type { RecommendedSite, TrendItem } from '@/services/hooks/trends/get-trends'
+import type { UserProfile } from '@/services/hooks/user/user-service.hook'
 import type { StoredWallpaper, Wallpaper } from '../wallpaper.interface'
 import type { Todo } from '@/services/hooks/todo/todo.interface'
 

diff --git a/src/common/playAlarm.ts → src/common/play-alarm.ts b/src/common/playAlarm.ts → src/common/play-alarm.ts
diff --git a/src/common/toast.tsx b/src/common/toast.tsx
@@ -1,7 +1,7 @@
 import React, { ReactNode } from 'react'
 import toast from 'react-hot-toast'
-import { playAlarm } from './playAlarm'
-import { translateError } from '@/utils/translate-error'
+import { playAlarm } from './play-alarm'
+import { translateError } from '@/common/utils/translate-error'
 import { Icon } from '../icons'
 
 type ToastType = 'success' | 'error' | 'info' | 'warning'

diff --git a/src/common/utils/call-event.ts b/src/common/utils/call-event.ts
@@ -3,8 +3,8 @@ import type { Bookmark } from '@/layouts/bookmark/types/bookmark.types'
 import type { PetTypes } from '@/layouts/widgetify-card/pets/pet.context'
 import type { WigiNewsSetting } from '@/layouts/widgets/news/rss.interface'
 import type { WeatherSettings } from '@/layouts/widgets/weather/weather.interface'
-import type { ClockSettings } from '@/layouts/widgets/wigiPad/clock-display/clock-setting.interface'
-import type { WigiPadDateSetting } from '@/layouts/widgets/wigiPad/date-display/date-setting.interface'
+import type { ClockSettings } from '@/layouts/widgets/wigi-pad/clock-display/clock-setting.interface'
+import type { WigiPadDateSetting } from '@/layouts/widgets/wigi-pad/date-display/date-setting.interface'
 import type { WidgetTabKeys } from '@/layouts/widgets-settings/constant/tab-keys'
 import type { StoredWallpaper } from '../wallpaper.interface'
 import type { Todo } from '@/services/hooks/todo/todo.interface'

diff --git a/src/common/utils/getFirstname.ts → src/common/utils/get-firstname.ts b/src/common/utils/getFirstname.ts → src/common/utils/get-firstname.ts
diff --git a/src/common/utils/preloadImages.ts → src/common/utils/preload-images.ts b/src/common/utils/preloadImages.ts → src/common/utils/preload-images.ts
diff --git a/src/utils/translate-error.ts → src/common/utils/translate-error.ts b/src/utils/translate-error.ts → src/common/utils/translate-error.ts
diff --git a/src/utils/validators.ts → src/common/utils/validators.ts b/src/utils/validators.ts → src/common/utils/validators.ts
diff --git a/src/components/auth/AuthRequiredModal.tsx → src/components/auth/auth-required-modal.tsx b/src/components/auth/AuthRequiredModal.tsx → src/components/auth/auth-required-modal.tsx
diff --git a/src/components/blur-mode/blur-mode.button.tsx b/src/components/blur-mode/blur-mode.button.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { useGeneralSetting } from '@/context/general-setting.context'
-import Tooltip from '../toolTip'
+import Tooltip from '../tool-tip'
 import { Icon } from '@/src/icons'
 import { ConfirmationModal } from '../modal/confirmation-modal'
 import Analytics from '@/analytics'

diff --git a/src/components/bottom-sheet/bottom-sheet.tsx b/src/components/bottom-sheet/bottom-sheet.tsx
@@ -1,6 +1,6 @@
 import { useState, type ReactNode } from 'react'
 import { Presence, Motion as motion } from '@/common/motion'
-import { Portal } from '../portal/Portal'
+import { Portal } from '../portal/portal'
 import { Icon } from '@/src/icons'
 
 type SheetSize = 'small' | 'medium' | 'large' | 'full' | 'screen'

diff --git a/src/components/clickableTooltip.tsx → src/components/clickable-tooltip.tsx b/src/components/clickableTooltip.tsx → src/components/clickable-tooltip.tsx
diff --git a/src/components/contextMenu.component.tsx → src/components/context-menu.component.tsx b/src/components/contextMenu.component.tsx → src/components/context-menu.component.tsx
diff --git a/src/components/dropdown/dropdown.tsx b/src/components/dropdown/dropdown.tsx
@@ -1,6 +1,6 @@
 import type { ReactNode } from 'react'
-import { Portal } from '../portal/Portal'
-import { useDropdown } from './useDropdown'
+import { Portal } from '../portal/portal'
+import { useDropdown } from './use-dropdown'
 import { useState, useLayoutEffect, useRef } from 'react'
 
 export interface DropdownOption {

diff --git a/src/components/dropdown/useDropdown.tsx → src/components/dropdown/use-dropdown.tsx b/src/components/dropdown/useDropdown.tsx → src/components/dropdown/use-dropdown.tsx
diff --git a/src/components/filter-tooltip/filter-tooltip.tsx b/src/components/filter-tooltip/filter-tooltip.tsx
@@ -1,6 +1,6 @@
 import { useState, useRef, type ReactNode } from 'react'
-import { ClickableTooltip } from '@/components/clickableTooltip'
-import Tooltip from '../toolTip'
+import { ClickableTooltip } from '@/components/clickable-tooltip'
+import Tooltip from '../tool-tip'
 import { Button } from '../button/button'
 
 export interface FilterOption {

diff --git a/src/components/loading/icon-loading.tsx b/src/components/loading/icon-loading.tsx
@@ -1,5 +1,5 @@
 import { Icon } from '@/src/icons'
-import Tooltip from '../toolTip'
+import Tooltip from '../tool-tip'
 
 interface IconLoadingProps {
 	title?: string

diff --git a/src/components/market/getItemTypeEmoji.tsx → ...components/market/get-item-type-emoji.tsx b/src/components/market/getItemTypeEmoji.tsx → ...components/market/get-item-type-emoji.tsx
diff --git a/src/components/PopoverColorPicker.tsx → src/components/popover-color-picker.tsx b/src/components/PopoverColorPicker.tsx → src/components/popover-color-picker.tsx
diff --git a/src/components/portal/Portal.tsx → src/components/portal/portal.tsx b/src/components/portal/Portal.tsx → src/components/portal/portal.tsx
diff --git a/src/components/toolTip.tsx → src/components/tool-tip.tsx b/src/components/toolTip.tsx → src/components/tool-tip.tsx
diff --git a/src/components/UpdateReleaseNotesModal.tsx → ...components/update-release-notes-modal.tsx b/src/components/UpdateReleaseNotesModal.tsx → ...components/update-release-notes-modal.tsx
diff --git a/src/components/user/user-card.tsx b/src/components/user/user-card.tsx
@@ -1,6 +1,6 @@
 import { useAuth } from '@/context/auth.context'
-import { useSendFriendRequest } from '@/services/hooks/friends/friendService.hook'
-import { translateError } from '@/utils/translate-error'
+import { useSendFriendRequest } from '@/services/hooks/friends/friend-service.hook'
+import { translateError } from '@/common/utils/translate-error'
 import { AvatarComponent } from '../avatar.component'
 import { Button } from '../button/button'
 import type { UserCardUser } from './user-card-portal'

diff --git a/src/components/welcome-wizard.tsx b/src/components/welcome-wizard.tsx
@@ -4,12 +4,12 @@ import { Button } from '@/components/button/button'
 import {
 	useGetOccupations,
 	useGetInterests,
-} from '@/services/hooks/profile/getProfileMeta.hook'
+} from '@/services/hooks/profile/get-profile-meta.hook'
 import { TextInput } from '@/components/text-input'
 import { sleep } from '@/common/utils/timeout'
 import { Chip } from '@/components/chip.component'
 import { ItemSelector } from './item-selector'
-import { useSetupWizard } from '@/services/hooks/auth/authService.hook'
+import { useSetupWizard } from '@/services/hooks/auth/auth-service.hook'
 import { showToast } from '@/common/toast'
 import { safeAwait } from '@/services/api'
 import Analytics from '@/analytics'

diff --git a/src/context/appearance.context.tsx b/src/context/appearance.context.tsx
@@ -2,11 +2,11 @@ import type React from 'react'
 import { createContext, useContext, useEffect, useState } from 'react'
 import Analytics from '@/analytics'
 import { getMultipleFromStorage, setToStorage } from '@/common/storage'
-import { useChangeFont, useChangeUI } from '@/services/hooks/extension/updateSetting.hook'
+import { useChangeFont, useChangeUI } from '@/services/hooks/extension/update-setting.hook'
 import { useAuth } from './auth.context'
 import { safeAwait } from '@/services/api'
 import { showToast } from '@/common/toast'
-import { translateError } from '@/utils/translate-error'
+import { translateError } from '@/common/utils/translate-error'
 import { listenEvent } from '@/common/utils/call-event'
 
 export enum UI {

diff --git a/src/context/auth.context.tsx b/src/context/auth.context.tsx
@@ -5,7 +5,7 @@ import { listenEvent } from '@/common/utils/call-event'
 import {
 	type UserProfile,
 	useGetUserProfile,
-} from '@/services/hooks/user/userService.hook'
+} from '@/services/hooks/user/user-service.hook'
 
 interface AuthContextType {
 	isAuthenticated: boolean

diff --git a/src/context/general-setting.context.tsx b/src/context/general-setting.context.tsx
@@ -2,11 +2,11 @@ import type React from 'react'
 import { createContext, useContext, useEffect, useState } from 'react'
 import Analytics from '@/analytics'
 import { getFromStorage, setToStorage } from '@/common/storage'
-import { useUpdateExtensionSettings } from '@/services/hooks/extension/updateSetting.hook'
+import { useUpdateExtensionSettings } from '@/services/hooks/extension/update-setting.hook'
 import {
 	type FetchedTimezone,
 	getTimezones,
-} from '@/services/hooks/timezone/getTimezones.hook'
+} from '@/services/hooks/timezone/get-timezones.hook'
 import { useAuth } from './auth.context'
 
 export interface GeneralData {

diff --git a/src/context/notes.context.tsx b/src/context/notes.context.tsx
@@ -10,7 +10,7 @@ import {
 import Analytics from '@/analytics'
 import { getFromStorage, setToStorage } from '@/common/storage'
 import { safeAwait } from '@/services/api'
-import { translateError } from '@/utils/translate-error'
+import { translateError } from '@/common/utils/translate-error'
 import { showToast } from '@/common/toast'
 import { useGetNotes } from '@/services/hooks/note/get-notes.hook'
 import { useAuth } from './auth.context'

diff --git a/src/context/theme.context.tsx b/src/context/theme.context.tsx
@@ -3,7 +3,7 @@ import { createContext, useContext, useEffect, useState } from 'react'
 import Analytics from '@/analytics'
 import { getFromStorage, setToStorage } from '@/common/storage'
 import { listenEvent } from '@/common/utils/call-event'
-import { useChangeTheme } from '@/services/hooks/extension/updateSetting.hook'
+import { useChangeTheme } from '@/services/hooks/extension/update-setting.hook'
 import { useAuth } from './auth.context'
 
 interface ThemeContextType {

diff --git a/src/context/wallpaper.context.tsx b/src/context/wallpaper.context.tsx
@@ -4,12 +4,12 @@ import { getFromStorage, setToStorage } from '@/common/storage'
 import { callEvent, listenEvent } from '@/common/utils/call-event'
 import type { StoredWallpaper, Wallpaper } from '@/common/wallpaper.interface'
 import { safeAwait } from '@/services/api'
-import { useChangeWallpaper } from '@/services/hooks/extension/updateSetting.hook'
-import { translateError } from '@/utils/translate-error'
+import { useChangeWallpaper } from '@/services/hooks/extension/update-setting.hook'
+import { translateError } from '@/common/utils/translate-error'
 import Analytics from '@/analytics'
 import { showToast } from '@/common/toast'
 import { useQueryClient } from '@tanstack/react-query'
-import { playAlarm } from '@/common/playAlarm'
+import { playAlarm } from '@/common/play-alarm'
 import { useAuth } from '@/context/auth.context'
 
 interface WallpaperContextValue {

diff --git a/src/context/widget-visibility.context.tsx b/src/context/widget-visibility.context.tsx
@@ -9,12 +9,12 @@ import {
 import Analytics from '@/analytics'
 import { getFromStorage, setToStorage } from '@/common/storage'
 import CalendarLayout from '@/layouts/widgets/calendar/calendar'
-import { ComboWidget } from '@/layouts/widgets/comboWidget/combo-widget.layout'
+import { ComboWidget } from '@/layouts/widgets/combo-widget/combo-widget.layout'
 import { NetworkLayout } from '@/layouts/widgets/network/network.layout'
 import { NewsLayout } from '@/layouts/widgets/news/news.layout'
 import { ToolsLayout } from '@/layouts/widgets/tools/tools.layout'
 import { WeatherLayout } from '@/layouts/widgets/weather/weather.layout'
-import { WigiArzLayout } from '@/layouts/widgets/wigiArz/wigi_arz.layout'
+import { WigiArzLayout } from '@/layouts/widgets/wigi-arz/wigi_arz.layout'
 import { useAuth } from './auth.context'
 import { CurrencyProvider } from './currency.context'
 import { showToast } from '@/common/toast'

diff --git a/src/hooks/useBirthdayConfetti.tsx → src/hooks/use-birthday-confetti.tsx b/src/hooks/useBirthdayConfetti.tsx → src/hooks/use-birthday-confetti.tsx
diff --git a/src/hooks/useContrastTextColor.tsx → src/hooks/use-contrast-text-color.tsx b/src/hooks/useContrastTextColor.tsx → src/hooks/use-contrast-text-color.tsx
diff --git a/src/hooks/useDebouncedValue.tsx → src/hooks/use-debounced-value.tsx b/src/hooks/useDebouncedValue.tsx → src/hooks/use-debounced-value.tsx
diff --git a/src/hooks/useGetImageMainColor.tsx → src/hooks/use-get-image-main-color.tsx b/src/hooks/useGetImageMainColor.tsx → src/hooks/use-get-image-main-color.tsx
diff --git a/src/hooks/useInfiniteScroll.tsx → src/hooks/use-infinite-scroll.tsx b/src/hooks/useInfiniteScroll.tsx → src/hooks/use-infinite-scroll.tsx
diff --git a/src/hooks/usePreviewHandler.ts → src/hooks/use-preview-handler.ts b/src/hooks/usePreviewHandler.ts → src/hooks/use-preview-handler.ts
@@ -6,7 +6,7 @@ import { Theme } from '@/context/theme.context'
 import { MarketItemType, type MarketItem } from '@/services/hooks/market/market.interface'
 import { autoFormatErrorToast, showPreviewToast } from '@/common/toast'
 import type { StoredWallpaper } from '@/common/wallpaper.interface'
-import { fetchWallpaperPreviewUrl } from '@/services/hooks/wallpapers/getWallpaperPreviewUrl.hook'
+import { fetchWallpaperPreviewUrl } from '@/services/hooks/wallpapers/get-wallpaper-preview-url.hook'
 
 export interface PreviewState {
 	toastId: string

diff --git a/src/layouts/bookmark/bookmark-grid.tsx b/src/layouts/bookmark/bookmark-grid.tsx
@@ -4,15 +4,15 @@ import Analytics from '@/analytics'
 import { ConfirmationModal } from '@/components/modal/confirmation-modal'
 import { useGeneralSetting } from '@/context/general-setting.context'
 import type { Bookmark, FolderPathItem } from './types/bookmark.types'
-import { openBookmarksOptimized } from './utils/tabManager'
-import { EmptyBookmarkSlot } from './components/bookmark-emptySlot'
+import { openBookmarksOptimized } from './utils/tab-manager'
+import { EmptyBookmarkSlot } from './components/bookmark-empty-slot'
 import { BookmarkContextMenu } from './components/modal/bookmark-context-menu'
 import { EditBookmarkModal } from './components/modal/edit-bookmark.modal'
 import { SortableBookmarkItem } from './components/sortable-bookmark-item'
 import { useBookmarkStore } from './context/bookmark.context'
 import { validate } from 'uuid'
 import { useAuth } from '@/context/auth.context'
-import { AuthRequiredModal } from '@/components/auth/AuthRequiredModal'
+import { AuthRequiredModal } from '@/components/auth/auth-required-modal'
 import { showToast } from '@/common/toast'
 import { Icon } from '@/src/icons'
 

diff --git a/src/layouts/bookmark/bookmarks.tsx b/src/layouts/bookmark/bookmarks.tsx
@@ -15,7 +15,7 @@ import type { Bookmark, FolderPathItem } from './types/bookmark.types'
 import { BookmarkGrid } from './bookmark-grid'
 import { useBookmarkStore } from './context/bookmark.context'
 import { useAuth } from '@/context/auth.context'
-import { AuthRequiredModal } from '@/components/auth/AuthRequiredModal'
+import { AuthRequiredModal } from '@/components/auth/auth-required-modal'
 import { showToast } from '@/common/toast'
 import { useUpdateBookmarkOrder } from '@/services/hooks/bookmark/update-bookmark-order.hook'
 

diff --git a/...ookmark/components/bookmark-emptySlot.tsx → ...okmark/components/bookmark-empty-slot.tsx b/...ookmark/components/bookmark-emptySlot.tsx → ...okmark/components/bookmark-empty-slot.tsx
diff --git a/src/layouts/bookmark/components/bookmark-suggestions.tsx b/src/layouts/bookmark/components/bookmark-suggestions.tsx
@@ -2,7 +2,7 @@ import { SectionPanel } from '@/components/section-panel'
 import {
 	type BookmarkSuggestion,
 	useGetSuggestedBookmarks,
-} from '@/services/hooks/bookmark/getBookmarks.hook'
+} from '@/services/hooks/bookmark/get-bookmarks.hook'
 
 interface BookmarkSuggestionsProps {
 	onSelect: (suggestion: BookmarkSuggestion) => void

diff --git a/src/layouts/bookmark/components/folder-header.tsx b/src/layouts/bookmark/components/folder-header.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react'
 import Analytics from '@/analytics'
 import { Button } from '@/components/button/button'
 import Modal from '@/components/modal'
-import Tooltip from '@/components/toolTip'
+import Tooltip from '@/components/tool-tip'
 import type { FolderPathItem } from '../types/bookmark.types'
 import { FolderPath } from './folder-path'
 import { Icon } from '@/src/icons'

diff --git a/src/layouts/bookmark/components/modal/advanced.modal.tsx b/src/layouts/bookmark/components/modal/advanced.modal.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import Analytics from '@/analytics'
 import { Button } from '@/components/button/button'
 import Modal from '@/components/modal'
-import PopoverColorPicker from '@/components/PopoverColorPicker'
+import PopoverColorPicker from '@/components/popover-color-picker'
 import { TextInput } from '@/components/text-input'
 import { getEmojiList } from '@/services/emoji/emoji-api'
 import { BookmarkItem } from '../bookmark-item'

diff --git a/src/layouts/bookmark/components/modal/bookmark-context-menu.tsx b/src/layouts/bookmark/components/modal/bookmark-context-menu.tsx
@@ -1,4 +1,4 @@
-import { ContextMenu } from '@/components/contextMenu.component'
+import { ContextMenu } from '@/components/context-menu.component'
 import { Icon } from '@/src/icons'
 
 interface BookmarkContextMenuProps {

diff --git a/src/layouts/bookmark/context/bookmark.context.tsx b/src/layouts/bookmark/context/bookmark.context.tsx
@@ -6,7 +6,7 @@ import { callEvent, listenEvent } from '@/common/utils/call-event'
 import type { Bookmark, BrowserImportNode } from '@/layouts/bookmark/types/bookmark.types'
 import { safeAwait } from '@/services/api'
 import { useRemoveBookmark } from '@/services/hooks/bookmark/remove-bookmark.hook'
-import { translateError } from '@/utils/translate-error'
+import { translateError } from '@/common/utils/translate-error'
 import { useAuth } from '@/context/auth.context'
 import { useAddBookmark } from '@/services/hooks/bookmark/add-bookmark.hook'
 import { useImportBrowserBookmarks } from '@/services/hooks/bookmark/import-browser-bookmarks.hook'
@@ -19,7 +19,7 @@ import { autoFormatErrorToast, showToast } from '@/common/toast'
 import {
 	type FetchedBookmark,
 	useGetBookmarks,
-} from '@/services/hooks/bookmark/getBookmarks.hook'
+} from '@/services/hooks/bookmark/get-bookmarks.hook'
 
 const MAX_ICON_SIZE = 1 * 1024 * 1024 // 1 MB
 

diff --git a/src/layouts/bookmark/utils/tabManager.ts → src/layouts/bookmark/utils/tab-manager.ts b/src/layouts/bookmark/utils/tabManager.ts → src/layouts/bookmark/utils/tab-manager.ts
diff --git a/src/layouts/friends/components/activities.tsx b/src/layouts/friends/components/activities.tsx
@@ -1,8 +1,8 @@
 import { useState } from 'react'
-import { useGetActivities } from '@/services/hooks/friends/friendService.hook'
+import { useGetActivities } from '@/services/hooks/friends/friend-service.hook'
 import { useAuth } from '@/context/auth.context'
 import { ActivityCard } from './activity-card/activity-card'
-import { ManageActivityBottomSheet } from './activity-card/manage-activity.bottomSheet'
+import { ManageActivityBottomSheet } from './activity-card/manage-activity.bottom-sheet'
 import { EmptyActivityCard } from './activity-card/empty-activity-card'
 import { Dropdown } from '@/components/dropdown'
 

diff --git a/src/layouts/friends/components/activity-card/activity-card.tsx b/src/layouts/friends/components/activity-card/activity-card.tsx
@@ -5,13 +5,13 @@ import {
 	type ReactionKey,
 	useGetActivityReactions,
 	useUpsertActivityReaction,
-} from '@/services/hooks/friends/friendService.hook'
+} from '@/services/hooks/friends/friend-service.hook'
 import { useEffect, useState } from 'react'
 import { GetContentFromReactions, RenderReactionContent } from './activity-reaction'
 import { safeAwait } from '@/services/api'
-import { translateError } from '@/utils/translate-error'
+import { translateError } from '@/common/utils/translate-error'
 import { showToast } from '@/common/toast'
-import { playAlarm } from '@/common/playAlarm'
+import { playAlarm } from '@/common/play-alarm'
 
 interface ActivityCardProps {
 	id: string

diff --git a/src/layouts/friends/components/activity-card/activity-reaction.tsx b/src/layouts/friends/components/activity-card/activity-reaction.tsx
@@ -1,4 +1,4 @@
-import type { AttachmentReaction } from '@/services/hooks/friends/friendService.hook'
+import type { AttachmentReaction } from '@/services/hooks/friends/friend-service.hook'
 
 export function GetContentFromReactions(
 	reactionId: string | undefined,

diff --git a/...vity-card/manage-activity.bottomSheet.tsx → ...ity-card/manage-activity.bottom-sheet.tsx b/...vity-card/manage-activity.bottomSheet.tsx → ...ity-card/manage-activity.bottom-sheet.tsx
@@ -2,20 +2,20 @@ import { useState } from 'react'
 import { Button } from '@/components/button/button'
 import { showToast } from '@/common/toast'
 import Modal from '@/components/modal'
-import { useRemoveActivity, useSetActivity } from '@/services/hooks/user/userService.hook'
-import { translateError } from '@/utils/translate-error'
-import { playAlarm } from '@/common/playAlarm'
+import { useRemoveActivity, useSetActivity } from '@/services/hooks/user/user-service.hook'
+import { translateError } from '@/common/utils/translate-error'
+import { playAlarm } from '@/common/play-alarm'
 import {
 	type AttachmentReaction,
 	useGetActivityReactions,
-} from '@/services/hooks/friends/friendService.hook'
+} from '@/services/hooks/friends/friend-service.hook'
 import { MakeSkeletonFriendItem } from '../friend-item/friend-item.skeleton'
 import { GetContentFromReactions, RenderReactionContent } from './activity-reaction'
 import { AvatarComponent } from '@/components/avatar.component'
 import { callEvent } from '@/common/utils/call-event'
 import { Chip } from '@/components/chip.component'
 import { SelectBox } from '@/components/selectbox/selectbox'
-import Tooltip from '@/components/toolTip'
+import Tooltip from '@/components/tool-tip'
 import { Icon } from '@/src/icons'
 
 interface ManageActivityBottomSheetProps {

diff --git a/...nds/components/add-friend.bottomSheet.tsx → ...ds/components/add-friend.bottom-sheet.tsx b/...nds/components/add-friend.bottomSheet.tsx → ...ds/components/add-friend.bottom-sheet.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react'
 import { Button } from '@/components/button/button'
 import { TextInput } from '@/components/text-input'
 import { useAuth } from '@/context/auth.context'
-import { useSendFriendRequest } from '@/services/hooks/friends/friendService.hook'
-import { translateError } from '@/utils/translate-error'
+import { useSendFriendRequest } from '@/services/hooks/friends/friend-service.hook'
+import { translateError } from '@/common/utils/translate-error'
 import { showToast } from '@/common/toast'
 import Modal from '@/components/modal'
 import { Icon } from '@/src/icons'

diff --git a/src/layouts/friends/components/buttons/friend-requests.button.tsx b/src/layouts/friends/components/buttons/friend-requests.button.tsx
@@ -1,4 +1,4 @@
-import { FriendRequestsBottomSheet } from '../friend-requests.bottomSheet'
+import { FriendRequestsBottomSheet } from '../friend-requests.bottom-sheet'
 import { Icon } from '@/src/icons'
 
 interface Prop {

diff --git a/...omponents/friend-requests.bottomSheet.tsx → ...mponents/friend-requests.bottom-sheet.tsx b/...omponents/friend-requests.bottomSheet.tsx → ...mponents/friend-requests.bottom-sheet.tsx
@@ -1,10 +1,10 @@
 import {
 	type Friend,
 	useHandleFriendRequest,
-} from '@/services/hooks/friends/friendService.hook'
+} from '@/services/hooks/friends/friend-service.hook'
 
 import { RemoveFriendButton } from './remove-button'
-import { FriendsList } from './friends-List'
+import { FriendsList } from './friends-list'
 import { Button } from '@/components/button/button'
 import { showToast } from '@/common/toast'
 import Modal from '@/components/modal'

diff --git a/...youts/friends/components/friends-List.tsx → ...youts/friends/components/friends-list.tsx b/...youts/friends/components/friends-List.tsx → ...youts/friends/components/friends-list.tsx
@@ -1,6 +1,6 @@
 import { AvatarComponent } from '@/components/avatar.component'
-import { type Friend, useGetFriends } from '@/services/hooks/friends/friendService.hook'
-import { useInfiniteScroll } from '@/hooks/useInfiniteScroll'
+import { type Friend, useGetFriends } from '@/services/hooks/friends/friend-service.hook'
+import { useInfiniteScroll } from '@/hooks/use-infinite-scroll'
 import { FriendEmptyList } from './empty-list.friend'
 
 interface PaginatedFriendsListProps {

diff --git a/src/layouts/friends/components/remove-button.tsx b/src/layouts/friends/components/remove-button.tsx
@@ -1,5 +1,5 @@
 import { Button } from '@/components/button/button'
-import type { Friend } from '@/services/hooks/friends/friendService.hook'
+import type { Friend } from '@/services/hooks/friends/friend-service.hook'
 import { Icon } from '@/src/icons'
 
 type Props = {

diff --git a/src/layouts/friends/components/select-friend.layout.tsx b/src/layouts/friends/components/select-friend.layout.tsx
@@ -1,5 +1,5 @@
 import { AvatarComponent } from '@/components/avatar.component'
-import { useGetFriends, type Friend } from '@/services/hooks/friends/friendService.hook'
+import { useGetFriends, type Friend } from '@/services/hooks/friends/friend-service.hook'
 import { FriendEmptyList } from './empty-list.friend'
 
 interface SelectFriendBottomSheetProps {