diff --git a/cashtab/package-lock.json b/cashtab/package-lock.json
--- a/cashtab/package-lock.json
+++ b/cashtab/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "cashtab",
-    "version": "2.26.0",
+    "version": "2.26.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "cashtab",
-            "version": "2.26.0",
+            "version": "2.26.1",
             "dependencies": {
                 "@bitgo/utxo-lib": "^9.33.0",
                 "@zxing/browser": "^0.1.4",
diff --git a/cashtab/package.json b/cashtab/package.json
--- a/cashtab/package.json
+++ b/cashtab/package.json
@@ -1,6 +1,6 @@
 {
     "name": "cashtab",
-    "version": "2.26.0",
+    "version": "2.26.1",
     "private": true,
     "scripts": {
         "start": "node scripts/start.js",
diff --git a/cashtab/src/components/Airdrop/__tests__/Airdrop.test.js b/cashtab/src/components/Airdrop/__tests__/Airdrop.test.js
--- a/cashtab/src/components/Airdrop/__tests__/Airdrop.test.js
+++ b/cashtab/src/components/Airdrop/__tests__/Airdrop.test.js
@@ -5,9 +5,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import {
     walletWithXecAndTokens,
     easterEggTokenChronikTokenDetails,
@@ -59,11 +57,8 @@
 describe('<Airdrop />', () => {
     let user;
     beforeEach(() => {
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
diff --git a/cashtab/src/components/App/__tests__/App.test.js b/cashtab/src/components/App/__tests__/App.test.js
--- a/cashtab/src/components/App/__tests__/App.test.js
+++ b/cashtab/src/components/App/__tests__/App.test.js
@@ -4,9 +4,7 @@
 
 import React from 'react';
 import { render, screen, waitFor, act } from '@testing-library/react';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 import {
     walletWithXecAndTokens,
@@ -80,11 +78,8 @@
 describe('<App />', () => {
     let user;
     beforeEach(() => {
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
diff --git a/cashtab/src/components/Common/__tests__/ScanQRCode.test.js b/cashtab/src/components/Common/__tests__/ScanQRCode.test.js
--- a/cashtab/src/components/Common/__tests__/ScanQRCode.test.js
+++ b/cashtab/src/components/Common/__tests__/ScanQRCode.test.js
@@ -42,7 +42,6 @@
 
 describe('<ScanQRCode />', () => {
     it('Renders the modal on load if loadWithCameraOpen is true', async () => {
-        const user = userEvent.setup();
         render(
             <ThemeProvider theme={theme}>
                 <ScanQRCode loadWithScannerOpen={true} />
@@ -57,13 +56,12 @@
         expect(await screen.findByTestId('video')).toBeInTheDocument();
 
         // Click the close button
-        await user.click(screen.getByRole('button', { name: /X/ }));
+        await userEvent.click(screen.getByRole('button', { name: /X/ }));
 
         // Expect modal to be closed
         expect(screen.queryByTestId('video')).not.toBeInTheDocument();
     });
     it('Does not render the modal on load if loadWithCameraOpen is false', async () => {
-        const user = userEvent.setup();
         render(
             <ThemeProvider theme={theme}>
                 <ScanQRCode loadWithScannerOpen={false} />
@@ -78,7 +76,7 @@
         expect(screen.queryByTestId('video')).not.toBeInTheDocument();
 
         // Click the open modal button
-        await user.click(StartScanningButton);
+        await userEvent.click(StartScanningButton);
 
         // The modal is rendered
         expect(await screen.findByTestId('video')).toBeInTheDocument();
diff --git a/cashtab/src/components/Configure/__tests__/Configure.test.js b/cashtab/src/components/Configure/__tests__/Configure.test.js
--- a/cashtab/src/components/Configure/__tests__/Configure.test.js
+++ b/cashtab/src/components/Configure/__tests__/Configure.test.js
@@ -10,9 +10,7 @@
     requiredUtxoThisToken,
 } from 'components/App/fixtures/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
@@ -55,11 +53,8 @@
 describe('<Configure />', () => {
     let user;
     beforeEach(() => {
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
diff --git a/cashtab/src/components/Contacts/__tests__/index.test.js b/cashtab/src/components/Contacts/__tests__/index.test.js
--- a/cashtab/src/components/Contacts/__tests__/index.test.js
+++ b/cashtab/src/components/Contacts/__tests__/index.test.js
@@ -8,9 +8,7 @@
     populatedContactList,
 } from 'components/App/fixtures/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
@@ -63,11 +61,8 @@
 describe('<Contacts />', () => {
     let user;
     beforeEach(() => {
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
@@ -121,10 +116,7 @@
         expect(screen.getByTestId('contacts')).toBeInTheDocument();
 
         // Click the first row Delete button
-        await user.click(screen.getAllByTestId('delete-contact-btn')[0], {
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        await user.click(screen.getAllByTestId('delete-contact-btn')[0]);
 
         // Type correct confirmation phrase in confirm delete modal
         await user.type(
@@ -159,10 +151,7 @@
         });
 
         // Add a contact
-        await user.click(screen.getByTestId('add-contact-btn'), {
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        await user.click(screen.getByTestId('add-contact-btn'));
 
         const nameInput = screen.getByPlaceholderText('Enter contact name');
         const addrInput = screen.getByPlaceholderText(
@@ -200,10 +189,7 @@
         });
 
         // We are blocked by validation if we try to add a contact that already exists
-        await user.click(screen.getByRole('button', { name: 'Add Contact' }), {
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        await user.click(screen.getByRole('button', { name: 'Add Contact' }));
         const nameInputRepeat =
             screen.getByPlaceholderText('Enter contact name');
         const addrInputRepeat = screen.getByPlaceholderText(
@@ -228,10 +214,7 @@
         await user.click(screen.getByText('Cancel'));
 
         // We can rename a contact
-        await user.click(screen.getAllByTestId('rename-contact-btn')[0], {
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        await user.click(screen.getAllByTestId('rename-contact-btn')[0]);
 
         const editNameInput = screen.getByPlaceholderText(
             'Enter new contact name',
diff --git a/cashtab/src/components/Etokens/__tests__/CreateTokenForm.test.js b/cashtab/src/components/Etokens/__tests__/CreateTokenForm.test.js
--- a/cashtab/src/components/Etokens/__tests__/CreateTokenForm.test.js
+++ b/cashtab/src/components/Etokens/__tests__/CreateTokenForm.test.js
@@ -5,9 +5,7 @@
 import React from 'react';
 import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import { render, screen } from '@testing-library/react';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 import { explorer } from 'config/explorer';
 import {
@@ -48,7 +46,10 @@
 });
 
 describe('<CreateTokenForm />', () => {
+    let user;
     beforeEach(() => {
+        // Configure userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
@@ -93,12 +94,6 @@
             />,
         );
 
-        // Configure userEvent to skip PointerEventsCheck, as this returns false positives with antd
-        const user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
-
         // The user enters valid token metadata
         await user.type(
             await screen.findByPlaceholderText('Enter a name for your token'),
@@ -160,12 +155,6 @@
             />,
         );
 
-        // Configure userEvent to skip PointerEventsCheck, as this returns false positives with antd
-        const user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
-
         // The user enters valid token metadata
         await user.type(
             await screen.findByPlaceholderText('Enter a name for your token'),
diff --git a/cashtab/src/components/Receive/__tests__/Receive.test.js b/cashtab/src/components/Receive/__tests__/Receive.test.js
--- a/cashtab/src/components/Receive/__tests__/Receive.test.js
+++ b/cashtab/src/components/Receive/__tests__/Receive.test.js
@@ -5,9 +5,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import { when } from 'jest-when';
 import 'fake-indexeddb/auto';
@@ -49,11 +47,8 @@
 describe('<Receive />', () => {
     let user;
     beforeEach(() => {
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
diff --git a/cashtab/src/components/Send/__tests__/SendToken.test.js b/cashtab/src/components/Send/__tests__/SendToken.test.js
--- a/cashtab/src/components/Send/__tests__/SendToken.test.js
+++ b/cashtab/src/components/Send/__tests__/SendToken.test.js
@@ -5,9 +5,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import { when } from 'jest-when';
 import aliasSettings from 'config/alias';
 import { explorer } from 'config/explorer';
@@ -96,11 +94,8 @@
             },
         });
 
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call to Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
diff --git a/cashtab/src/components/Send/__tests__/SendXec.test.js b/cashtab/src/components/Send/__tests__/SendXec.test.js
--- a/cashtab/src/components/Send/__tests__/SendXec.test.js
+++ b/cashtab/src/components/Send/__tests__/SendXec.test.js
@@ -5,9 +5,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import {
     SEND_ADDRESS_VALIDATION_ERRORS,
@@ -56,11 +54,8 @@
 describe('<SendXec />', () => {
     let user;
     beforeEach(() => {
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
diff --git a/cashtab/src/components/SignVerifyMsg/__tests__/SignVerifyMsg.test.js b/cashtab/src/components/SignVerifyMsg/__tests__/SignVerifyMsg.test.js
--- a/cashtab/src/components/SignVerifyMsg/__tests__/SignVerifyMsg.test.js
+++ b/cashtab/src/components/SignVerifyMsg/__tests__/SignVerifyMsg.test.js
@@ -5,9 +5,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import { when } from 'jest-when';
 import 'fake-indexeddb/auto';
@@ -49,11 +47,8 @@
 describe('<SignVerifyMsg />', () => {
     let user;
     beforeEach(() => {
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
@@ -140,22 +135,20 @@
         );
 
         // Input the address
-        await userEvent.type(
+        await user.type(
             screen.getByPlaceholderText('Enter address of signature to verify'),
             'ecash:qq3spmxfh9ct0v3vkxncwk4sr2ld9vkhgvlu32e43c',
         );
 
         // Insert signature in Signature textarea of Verify collapse
-        await userEvent.type(
+        await user.type(
             screen.getByPlaceholderText('Enter signature to verify'),
             'H6Rde63iJ93n/I7gUac/xheY3mL1eAt2uIR54fgre6O3Om8ogWe+DASNQGDDBkNY43JIGwAIPq9lmMJjeykYFNQ=',
         );
 
         // Click the Verify button
         // react testing library also finds the switch with this, button is at index 0
-        await userEvent.click(
-            screen.getAllByRole('button', { name: /Verify/ })[0],
-        );
+        await user.click(screen.getAllByRole('button', { name: /Verify/ })[0]);
 
         expect(
             screen.getByText(
@@ -191,22 +184,20 @@
         );
 
         // Input the address
-        await userEvent.type(
+        await user.type(
             screen.getByPlaceholderText('Enter address of signature to verify'),
             'ecash:qq3spmxfh9ct0v3vkxncwk4sr2ld9vkhgvlu32e43c',
         );
 
         // Insert signature in Signature textarea of Verify collapse
-        await userEvent.type(
+        await user.type(
             screen.getByPlaceholderText('Enter signature to verify'),
             'H6Rde63iJ93n/I7gUac/xheY3mL1eAt2uIR54fgre6O3Om8ogWe+DASNQGDDBkNY43JIGwAIPq9lmMJjeykYFNQ=',
         );
 
         // Click the Verify button
         // react testing library also finds the switch with this, button is at index 0
-        await userEvent.click(
-            screen.getAllByRole('button', { name: /Verify/ })[0],
-        );
+        await user.click(screen.getAllByRole('button', { name: /Verify/ })[0]);
 
         expect(
             screen.getByText('Signature does not match address and message'),
diff --git a/cashtab/src/components/Wallets/__tests__/index.test.js b/cashtab/src/components/Wallets/__tests__/index.test.js
--- a/cashtab/src/components/Wallets/__tests__/index.test.js
+++ b/cashtab/src/components/Wallets/__tests__/index.test.js
@@ -8,9 +8,7 @@
     populatedContactList,
 } from 'components/App/fixtures/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent, {
-    PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
@@ -66,11 +64,8 @@
 describe('<Wallets />', () => {
     let user;
     beforeEach(() => {
-        // Set up userEvent to skip pointerEvents check, which returns false positives with antd
-        user = userEvent.setup({
-            // https://github.com/testing-library/user-event/issues/922
-            pointerEventsCheck: PointerEventsCheckLevel.Never,
-        });
+        // Set up userEvent
+        user = userEvent.setup();
         // Mock the fetch call for Cashtab's price API
         global.fetch = jest.fn();
         const fiatCode = 'usd'; // Use usd until you mock getting settings from localforage
@@ -325,7 +320,7 @@
         // We can import a wallet by specifying a mnemonic
         await user.click(
             screen.getByRole('button', {
-                name: /Import Wallet/, // name is "import Import Wallet" as icon is included, more antd weirdness
+                name: /Import Wallet/,
             }),
         );
 
@@ -388,7 +383,7 @@
         // Bring up the import modal again
         await user.click(
             screen.getByRole('button', {
-                name: /Import Wallet/, // name is "import Import Wallet" as icon is included, more antd weirdness
+                name: /Import Wallet/,
             }),
         );