Fixing the failure of husky pre-commit script. (#2999)

* test commit

* test commit

* Changing the import for waitFor and screen from @testing-library/react to @testing-library/dom

* removing test-commit

* resolving conflicts

* fixing the package.json conflict

* excluding unecessary changes in the package-lock.json

src/screens/UserPortal/Volunteer/VolunteerManagement.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { RenderResult } from '@testing-library/react';
-import { render, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/dom';
+import { render } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
 import { I18nextProvider } from 'react-i18next';
 import i18n from 'utils/i18nForTest';