feat: Added search bar to navigation panel for searching tags and smart views (#2815)

packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx

@@ -1,6 +1,6 @@
 import { NoteType, SNNote, classNames } from '@standardnotes/snjs'
 import Modal, { ModalAction } from '../../Modal/Modal'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { MutuallyExclusiveMediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
 import { useApplication } from '../../ApplicationProvider'
 import { confirmDialog } from '@standardnotes/ui-services'
@@ -134,8 +134,8 @@ const NoteConflictResolutionModal = ({
     [close],
   )
 
-  const listRef = useRef<HTMLDivElement>(null)
-  useListKeyboardNavigation(listRef)
+  const [listElement, setListElement] = useState<HTMLDivElement | null>(null)
+  useListKeyboardNavigation(listElement)
 
   const [selectedMobileTab, setSelectedMobileTab] = useState<'list' | 'preview'>('list')
 
@@ -279,7 +279,7 @@ const NoteConflictResolutionModal = ({
           'w-full overflow-y-auto border-r border-border py-1.5 md:flex md:w-auto md:min-w-60 md:flex-col',
           selectedMobileTab !== 'list' && 'hidden md:flex',
         )}
-        ref={listRef}
+        ref={setListElement}
       >
         {allVersions.map((note, index) => (
           <ConflictListItem