diff --git a/app/ui/categories/custom-emoji-picker.tsx b/app/ui/categories/custom-emoji-picker.tsx
index fb89b94..1042308 100644
--- a/app/ui/categories/custom-emoji-picker.tsx
+++ b/app/ui/categories/custom-emoji-picker.tsx
@@ -9,6 +9,8 @@ import EmojiPicker, {
   Theme,
 } from 'emoji-picker-react'
 
+import { TTheme } from '@/app/lib/types'
+
 type TProps = {
   showEmojiPicker: boolean
   onEmojiClick: (emojiData: EmojiClickData) => void
@@ -24,7 +26,7 @@ function CustomEmojiPicker({ showEmojiPicker, onEmojiClick }: TProps) {
         searchPlaceHolder='Search emoji...'
         // width={300}
         // height={400}
-        theme={theme === 'system' ? Theme.AUTO : (theme as Theme)}
+        theme={(theme as TTheme) === 'system' ? Theme.AUTO : (theme as Theme)}
         suggestedEmojisMode={SuggestionMode.RECENT}
         skinTonePickerLocation={SkinTonePickerLocation.PREVIEW}
         className='my-2'
diff --git a/app/ui/transaction-form-edit.tsx b/app/ui/transaction-form-edit.tsx
index 747daf4..67f3faa 100644
--- a/app/ui/transaction-form-edit.tsx
+++ b/app/ui/transaction-form-edit.tsx
@@ -23,7 +23,7 @@ import { DEFAULT_CURRENCY_SIGN } from '@/config/constants/main'
 import { ROUTE } from '@/config/constants/routes'
 
 import { editTransactionById } from '../lib/actions'
-import type { TTransaction } from '../lib/types'
+import type { TTheme, TTransaction } from '../lib/types'
 import {
   capitalizeFirstLetter,
   getCategoryWithEmoji,
@@ -257,7 +257,7 @@ function TransactionFormEdit({ transaction }: TProps) {
                 isDisabled={
                   !amount || amount === '0' || isLoading || !isCategorySelect
                 }
-                className={`${isCategorySelect && isTransactionWithChangedCategory ? `animate-blink-${theme === 'system' ? 'light' : theme}-once` : ''} cursor-pointer bg-background px-0`}
+                className={`${isCategorySelect && isTransactionWithChangedCategory ? `animate-blink-${(theme as TTheme) === 'system' ? 'light' : theme}-once` : ''} cursor-pointer bg-background px-0`}
                 size='sm'
               >
                 <Kbd keys={['enter']}>Enter</Kbd>