fix: resolve conflicts

openedx · Oct 8, 2024 · 71f735a · 71f735a
1 parent 5672b91
commit 71f735a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/library-authoring/components/CollectionCard.test.tsx b/src/library-authoring/components/CollectionCard.test.tsx
@@ -1,7 +1,9 @@
-import { initializeMocks, render as baseRender, screen, waitFor, waitForElementToBeRemoved, within } from '../../testUtils';
 import userEvent from '@testing-library/user-event';
 import type MockAdapter from 'axios-mock-adapter';
 
+import {
+  initializeMocks, render as baseRender, screen, waitFor, waitForElementToBeRemoved, within,
+} from '../../testUtils';
 import { LibraryProvider } from '../common/context';
 import { type CollectionHit } from '../../search-manager';
 import CollectionCard from './CollectionCard';

diff --git a/src/library-authoring/components/CollectionCard.tsx b/src/library-authoring/components/CollectionCard.tsx
@@ -27,7 +27,7 @@ const CollectionMenu = ({ collectionHit } : CollectionMenuProps) => {
   const { showToast } = useContext(ToastContext);
   const [isDeleteModalOpen, openDeleteModal, closeDeleteModal] = useToggle(false);
   const [confirmBtnState, setConfirmBtnState] = useState('default');
-  const { closeLibrarySidebar, currentCollectionId } = useContext(LibraryContext);
+  const { closeLibrarySidebar, currentCollectionId } = useLibraryContext();
 
   const restoreCollectionMutation = useRestoreCollection(collectionHit.contextKey, collectionHit.blockId);
   const restoreCollection = useCallback(() => {
@@ -108,7 +108,6 @@ type CollectionCardProps = {
 };
 
 const CollectionCard = ({ collectionHit } : CollectionCardProps) => {
-  const intl = useIntl();
   const {
     openCollectionInfoSidebar,
   } = useLibraryContext();