fix: Fixed issue where conflict resolution menu was not selectable [skip e2e]

2023-08-30 09:42:17 +05:30
parent 6e0b1a7c3f
commit 493d5e91f6
1 changed files with 1 additions and 1 deletions
--- a/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx
@@ -205,7 +205,7 @@ const NoteConflictResolutionModal = ({
              open={isSelectOpen}
              togglePopover={selectStore.toggle}
              anchorElement={selectAnchor}
-              className="!fixed z-modal border border-border py-1"
+              overrideZIndex="z-modal"
              side="top"
              align="end"
              offset={4}