diff --git a/mailpoet/assets/js/src/announcements/feature_announcement.tsx b/mailpoet/assets/js/src/announcements/feature_announcement.tsx
index 1026e9c0ad..26f811f1f7 100644
--- a/mailpoet/assets/js/src/announcements/feature_announcement.tsx
+++ b/mailpoet/assets/js/src/announcements/feature_announcement.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import classNames from 'classnames';
 import MailPoet from 'mailpoet';
 import { withFeatureAnnouncement } from './with_feature_announcement';
diff --git a/mailpoet/assets/js/src/announcements/with_feature_announcement.tsx b/mailpoet/assets/js/src/announcements/with_feature_announcement.tsx
index 17b67dd509..37ff81f06d 100644
--- a/mailpoet/assets/js/src/announcements/with_feature_announcement.tsx
+++ b/mailpoet/assets/js/src/announcements/with_feature_announcement.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
 import jQuery from 'jquery';
diff --git a/mailpoet/assets/js/src/automation/automation.tsx b/mailpoet/assets/js/src/automation/automation.tsx
index 7e40db55cf..4ec248ddb2 100644
--- a/mailpoet/assets/js/src/automation/automation.tsx
+++ b/mailpoet/assets/js/src/automation/automation.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import { CreateTestingWorkflowButton } from './testing';
 import { useMutation, useQuery } from './api';
diff --git a/mailpoet/assets/js/src/automation/testing.tsx b/mailpoet/assets/js/src/automation/testing.tsx
index 4043f8703d..74f5de5291 100644
--- a/mailpoet/assets/js/src/automation/testing.tsx
+++ b/mailpoet/assets/js/src/automation/testing.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useMutation } from './api';
 import { id } from './id';
 
diff --git a/mailpoet/assets/js/src/common/background/_stories/background.tsx b/mailpoet/assets/js/src/common/background/_stories/background.tsx
index af0c6b1bf1..8fae9cb5ba 100644
--- a/mailpoet/assets/js/src/common/background/_stories/background.tsx
+++ b/mailpoet/assets/js/src/common/background/_stories/background.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Background from '../background';
 
 export default {
diff --git a/mailpoet/assets/js/src/common/background/background.tsx b/mailpoet/assets/js/src/common/background/background.tsx
index 57f80f611c..d45e3e2565 100644
--- a/mailpoet/assets/js/src/common/background/background.tsx
+++ b/mailpoet/assets/js/src/common/background/background.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 type Props = {
   color: string;
 };
diff --git a/mailpoet/assets/js/src/common/badge/_stories/badge.tsx b/mailpoet/assets/js/src/common/badge/_stories/badge.tsx
index 399d6c5898..833cc5fc6f 100644
--- a/mailpoet/assets/js/src/common/badge/_stories/badge.tsx
+++ b/mailpoet/assets/js/src/common/badge/_stories/badge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Badge from '../badge';
 
 export default {
diff --git a/mailpoet/assets/js/src/common/badge/badge.tsx b/mailpoet/assets/js/src/common/badge/badge.tsx
index 61418b7985..febd2cd847 100644
--- a/mailpoet/assets/js/src/common/badge/badge.tsx
+++ b/mailpoet/assets/js/src/common/badge/badge.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 type Props = {
   title: string;
 };
diff --git a/mailpoet/assets/js/src/common/button/_stories/button.tsx b/mailpoet/assets/js/src/common/button/_stories/button.tsx
index 82b1217c0c..e7c4a7aacd 100644
--- a/mailpoet/assets/js/src/common/button/_stories/button.tsx
+++ b/mailpoet/assets/js/src/common/button/_stories/button.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import Button from '../button';
 import Heading from '../../typography/heading/heading';
diff --git a/mailpoet/assets/js/src/common/button/_stories/button_icons.tsx b/mailpoet/assets/js/src/common/button/_stories/button_icons.tsx
index 73a64954bc..e7a87ab342 100644
--- a/mailpoet/assets/js/src/common/button/_stories/button_icons.tsx
+++ b/mailpoet/assets/js/src/common/button/_stories/button_icons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import Button from '../button';
 import Heading from '../../typography/heading/heading';
diff --git a/mailpoet/assets/js/src/common/button/button.tsx b/mailpoet/assets/js/src/common/button/button.tsx
index 9a433ce85b..d5d184b8fe 100644
--- a/mailpoet/assets/js/src/common/button/button.tsx
+++ b/mailpoet/assets/js/src/common/button/button.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 interface Props extends React.ButtonHTMLAttributes<HTMLButtonElement> {
diff --git a/mailpoet/assets/js/src/common/button/icon/plus.tsx b/mailpoet/assets/js/src/common/button/icon/plus.tsx
index 26d5bf7f28..f4dd6342c5 100644
--- a/mailpoet/assets/js/src/common/button/icon/plus.tsx
+++ b/mailpoet/assets/js/src/common/button/icon/plus.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg viewBox="4 4 16 16">
     <path d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
diff --git a/mailpoet/assets/js/src/common/categories/_stories/categories.tsx b/mailpoet/assets/js/src/common/categories/_stories/categories.tsx
index 81285fe8dc..392f718fe7 100644
--- a/mailpoet/assets/js/src/common/categories/_stories/categories.tsx
+++ b/mailpoet/assets/js/src/common/categories/_stories/categories.tsx
@@ -1,5 +1,4 @@
 import { noop } from 'lodash';
-import React from 'react';
 import Categories from '../categories';
 
 export default {
diff --git a/mailpoet/assets/js/src/common/categories/categories.tsx b/mailpoet/assets/js/src/common/categories/categories.tsx
index 02aaa3cc00..7764aed619 100644
--- a/mailpoet/assets/js/src/common/categories/categories.tsx
+++ b/mailpoet/assets/js/src/common/categories/categories.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import CategoriesItem, { Category } from './categories_item';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/categories/categories_item.tsx b/mailpoet/assets/js/src/common/categories/categories_item.tsx
index 3d3075a195..b366e29763 100644
--- a/mailpoet/assets/js/src/common/categories/categories_item.tsx
+++ b/mailpoet/assets/js/src/common/categories/categories_item.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import classNames from 'classnames';
 
 export type Category = {
diff --git a/mailpoet/assets/js/src/common/confirm_alert.jsx b/mailpoet/assets/js/src/common/confirm_alert.jsx
index 4987beed61..54bb2e125f 100644
--- a/mailpoet/assets/js/src/common/confirm_alert.jsx
+++ b/mailpoet/assets/js/src/common/confirm_alert.jsx
@@ -1,6 +1,5 @@
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
-import React from 'react';
 import ReactDOMServer from 'react-dom/server';
 
 function ConfirmAlert(props) {
diff --git a/mailpoet/assets/js/src/common/datepicker/_stories/datepicker.tsx b/mailpoet/assets/js/src/common/datepicker/_stories/datepicker.tsx
index 7bc8034813..5bc0a64261 100644
--- a/mailpoet/assets/js/src/common/datepicker/_stories/datepicker.tsx
+++ b/mailpoet/assets/js/src/common/datepicker/_stories/datepicker.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { action } from '_storybook/action';
 import Datepicker from '../datepicker';
 import Heading from '../../typography/heading/heading';
diff --git a/mailpoet/assets/js/src/common/datepicker/datepicker.tsx b/mailpoet/assets/js/src/common/datepicker/datepicker.tsx
index a64b459a40..65feb90dde 100644
--- a/mailpoet/assets/js/src/common/datepicker/datepicker.tsx
+++ b/mailpoet/assets/js/src/common/datepicker/datepicker.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import classnames from 'classnames';
 import ReactDatePicker, { ReactDatePickerProps } from 'react-datepicker';
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/common/datepicker/icon/calendar.tsx b/mailpoet/assets/js/src/common/datepicker/icon/calendar.tsx
index 4fbf6bbed4..35463a765c 100644
--- a/mailpoet/assets/js/src/common/datepicker/icon/calendar.tsx
+++ b/mailpoet/assets/js/src/common/datepicker/icon/calendar.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg viewBox="0 0 24 24">
     <path d="M9,10V12H7V10H9M13,10V12H11V10H13M17,10V12H15V10H17M19,3A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5C3.89,21 3,20.1 3,19V5A2,2 0 0,1 5,3H6V1H8V3H16V1H18V3H19M19,19V8H5V19H19M9,14V16H7V14H9M13,14V16H11V14H13M17,14V16H15V14H17Z" />
diff --git a/mailpoet/assets/js/src/common/form/checkbox/_stories/checkbox.tsx b/mailpoet/assets/js/src/common/form/checkbox/_stories/checkbox.tsx
index b91f6042ed..20cf87f4f1 100644
--- a/mailpoet/assets/js/src/common/form/checkbox/_stories/checkbox.tsx
+++ b/mailpoet/assets/js/src/common/form/checkbox/_stories/checkbox.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import Checkbox from '../checkbox';
 import CheckboxGroup from '../group';
diff --git a/mailpoet/assets/js/src/common/form/checkbox/checkbox.tsx b/mailpoet/assets/js/src/common/form/checkbox/checkbox.tsx
index 62f0c71cd9..615ff51161 100644
--- a/mailpoet/assets/js/src/common/form/checkbox/checkbox.tsx
+++ b/mailpoet/assets/js/src/common/form/checkbox/checkbox.tsx
@@ -1,4 +1,5 @@
-import React, { ChangeEvent, InputHTMLAttributes } from 'react';
+import { ChangeEvent, InputHTMLAttributes } from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = InputHTMLAttributes<HTMLInputElement> & {
diff --git a/mailpoet/assets/js/src/common/form/checkbox/group.tsx b/mailpoet/assets/js/src/common/form/checkbox/group.tsx
index 17b0bc10de..973ea3ec05 100644
--- a/mailpoet/assets/js/src/common/form/checkbox/group.tsx
+++ b/mailpoet/assets/js/src/common/form/checkbox/group.tsx
@@ -1,4 +1,4 @@
-import React, { InputHTMLAttributes, useState } from 'react';
+import { InputHTMLAttributes, useState } from 'react';
 import Checkbox from './checkbox';
 
 type CheckboxValueType = string | string[] | number;
diff --git a/mailpoet/assets/js/src/common/form/input/_stories/assets/icon.tsx b/mailpoet/assets/js/src/common/form/input/_stories/assets/icon.tsx
index 6877b67def..f3e8ef4d09 100644
--- a/mailpoet/assets/js/src/common/form/input/_stories/assets/icon.tsx
+++ b/mailpoet/assets/js/src/common/form/input/_stories/assets/icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg viewBox="3 3 18 18">
     <path d="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
diff --git a/mailpoet/assets/js/src/common/form/input/_stories/input.tsx b/mailpoet/assets/js/src/common/form/input/_stories/input.tsx
index 7fad67ff78..e774688ebb 100644
--- a/mailpoet/assets/js/src/common/form/input/_stories/input.tsx
+++ b/mailpoet/assets/js/src/common/form/input/_stories/input.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Input from '../input';
 import Heading from '../../../typography/heading/heading';
 import icon from './assets/icon';
diff --git a/mailpoet/assets/js/src/common/form/input/input.tsx b/mailpoet/assets/js/src/common/form/input/input.tsx
index 196809b003..79955a59e4 100644
--- a/mailpoet/assets/js/src/common/form/input/input.tsx
+++ b/mailpoet/assets/js/src/common/form/input/input.tsx
@@ -1,4 +1,4 @@
-import React, { InputHTMLAttributes } from 'react';
+import { InputHTMLAttributes } from 'react';
 import classnames from 'classnames';
 import Tooltip from 'common/tooltip/tooltip';
 
diff --git a/mailpoet/assets/js/src/common/form/radio/_stories/radio.tsx b/mailpoet/assets/js/src/common/form/radio/_stories/radio.tsx
index 16df05744d..f896f16f25 100644
--- a/mailpoet/assets/js/src/common/form/radio/_stories/radio.tsx
+++ b/mailpoet/assets/js/src/common/form/radio/_stories/radio.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import Radio from '../radio';
 import RadioGroup from '../group';
diff --git a/mailpoet/assets/js/src/common/form/radio/group.tsx b/mailpoet/assets/js/src/common/form/radio/group.tsx
index 1407f6e114..ed38a48754 100644
--- a/mailpoet/assets/js/src/common/form/radio/group.tsx
+++ b/mailpoet/assets/js/src/common/form/radio/group.tsx
@@ -1,4 +1,4 @@
-import React, { InputHTMLAttributes, useState } from 'react';
+import { InputHTMLAttributes, useState } from 'react';
 import Radio from './radio';
 
 type RadioValueType = string | string[] | number;
diff --git a/mailpoet/assets/js/src/common/form/radio/radio.tsx b/mailpoet/assets/js/src/common/form/radio/radio.tsx
index 975ac83287..f9d19c32c1 100644
--- a/mailpoet/assets/js/src/common/form/radio/radio.tsx
+++ b/mailpoet/assets/js/src/common/form/radio/radio.tsx
@@ -1,4 +1,5 @@
-import React, { ChangeEvent, InputHTMLAttributes } from 'react';
+import { ChangeEvent, InputHTMLAttributes } from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = InputHTMLAttributes<HTMLInputElement> & {
diff --git a/mailpoet/assets/js/src/common/form/react_select/_stories/assets/icon.tsx b/mailpoet/assets/js/src/common/form/react_select/_stories/assets/icon.tsx
index 6877b67def..f3e8ef4d09 100644
--- a/mailpoet/assets/js/src/common/form/react_select/_stories/assets/icon.tsx
+++ b/mailpoet/assets/js/src/common/form/react_select/_stories/assets/icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg viewBox="3 3 18 18">
     <path d="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
diff --git a/mailpoet/assets/js/src/common/form/react_select/_stories/react_select.tsx b/mailpoet/assets/js/src/common/form/react_select/_stories/react_select.tsx
index b22f577d1c..a31c177501 100644
--- a/mailpoet/assets/js/src/common/form/react_select/_stories/react_select.tsx
+++ b/mailpoet/assets/js/src/common/form/react_select/_stories/react_select.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import Select from '../react_select';
 import Heading from '../../../typography/heading/heading';
diff --git a/mailpoet/assets/js/src/common/form/react_select/react_select.tsx b/mailpoet/assets/js/src/common/form/react_select/react_select.tsx
index 0ee0b04713..8864dfb9cc 100644
--- a/mailpoet/assets/js/src/common/form/react_select/react_select.tsx
+++ b/mailpoet/assets/js/src/common/form/react_select/react_select.tsx
@@ -1,6 +1,5 @@
-import React, {
-  CSSProperties,
-} from 'react';
+import { CSSProperties } from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 import Select, { Props as ReactSelectProps, OptionProps } from 'react-select';
 
diff --git a/mailpoet/assets/js/src/common/form/select/_stories/assets/icon.tsx b/mailpoet/assets/js/src/common/form/select/_stories/assets/icon.tsx
index 6877b67def..f3e8ef4d09 100644
--- a/mailpoet/assets/js/src/common/form/select/_stories/assets/icon.tsx
+++ b/mailpoet/assets/js/src/common/form/select/_stories/assets/icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg viewBox="3 3 18 18">
     <path d="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
diff --git a/mailpoet/assets/js/src/common/form/select/_stories/select.tsx b/mailpoet/assets/js/src/common/form/select/_stories/select.tsx
index 03f53e0235..d9da9d7fbd 100644
--- a/mailpoet/assets/js/src/common/form/select/_stories/select.tsx
+++ b/mailpoet/assets/js/src/common/form/select/_stories/select.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Select from '../select';
 import Heading from '../../../typography/heading/heading';
 import icon from './assets/icon';
diff --git a/mailpoet/assets/js/src/common/form/select/select.tsx b/mailpoet/assets/js/src/common/form/select/select.tsx
index fed2b4a23e..2f273850ec 100644
--- a/mailpoet/assets/js/src/common/form/select/select.tsx
+++ b/mailpoet/assets/js/src/common/form/select/select.tsx
@@ -1,4 +1,5 @@
-import React, { SelectHTMLAttributes } from 'react';
+import { SelectHTMLAttributes } from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = SelectHTMLAttributes<HTMLSelectElement> & {
diff --git a/mailpoet/assets/js/src/common/form/textarea/_stories/textarea.tsx b/mailpoet/assets/js/src/common/form/textarea/_stories/textarea.tsx
index 211ce71cd0..6c3c426393 100644
--- a/mailpoet/assets/js/src/common/form/textarea/_stories/textarea.tsx
+++ b/mailpoet/assets/js/src/common/form/textarea/_stories/textarea.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Textarea from '../textarea';
 import Heading from '../../../typography/heading/heading';
 
diff --git a/mailpoet/assets/js/src/common/form/textarea/textarea.tsx b/mailpoet/assets/js/src/common/form/textarea/textarea.tsx
index 646422b9ee..8ddd956c0a 100644
--- a/mailpoet/assets/js/src/common/form/textarea/textarea.tsx
+++ b/mailpoet/assets/js/src/common/form/textarea/textarea.tsx
@@ -1,4 +1,4 @@
-import React, { TextareaHTMLAttributes } from 'react';
+import { TextareaHTMLAttributes } from 'react';
 import classnames from 'classnames';
 import Tooltip from 'common/tooltip/tooltip';
 
diff --git a/mailpoet/assets/js/src/common/form/toggle/_stories/toggle.tsx b/mailpoet/assets/js/src/common/form/toggle/_stories/toggle.tsx
index a64b060357..71bcf138de 100644
--- a/mailpoet/assets/js/src/common/form/toggle/_stories/toggle.tsx
+++ b/mailpoet/assets/js/src/common/form/toggle/_stories/toggle.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import Toggle from '../toggle';
 import Heading from '../../../typography/heading/heading';
diff --git a/mailpoet/assets/js/src/common/form/toggle/toggle.tsx b/mailpoet/assets/js/src/common/form/toggle/toggle.tsx
index 003abf7b9c..1918049e27 100644
--- a/mailpoet/assets/js/src/common/form/toggle/toggle.tsx
+++ b/mailpoet/assets/js/src/common/form/toggle/toggle.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEvent, InputHTMLAttributes } from 'react';
+import { ChangeEvent, InputHTMLAttributes } from 'react';
 import classnames from 'classnames';
 
 type Props = InputHTMLAttributes<HTMLInputElement> & {
diff --git a/mailpoet/assets/js/src/common/form/yesno/_stories/yesno.tsx b/mailpoet/assets/js/src/common/form/yesno/_stories/yesno.tsx
index 43666bbb0f..e286f71b0a 100644
--- a/mailpoet/assets/js/src/common/form/yesno/_stories/yesno.tsx
+++ b/mailpoet/assets/js/src/common/form/yesno/_stories/yesno.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import YesNo from '../yesno';
 import Heading from '../../../typography/heading/heading';
diff --git a/mailpoet/assets/js/src/common/form/yesno/icons/no.tsx b/mailpoet/assets/js/src/common/form/yesno/icons/no.tsx
index c8bd702326..5935d13583 100644
--- a/mailpoet/assets/js/src/common/form/yesno/icons/no.tsx
+++ b/mailpoet/assets/js/src/common/form/yesno/icons/no.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg width="17" height="16" viewBox="0 0 17 16">
     <path fill="currentColor" d="M12.407 3.31c.576.576.576 1.509 0 2.084L9.914 7.888l2.411 2.412c.586.585.586 1.535 0 2.121-.585.586-1.535.586-2.12 0l-2.413-2.412L5.3 12.503c-.576.575-1.509.575-2.084 0-.575-.575-.575-1.508 0-2.083l2.493-2.495-2.41-2.41c-.587-.587-.587-1.536 0-2.122.585-.586 1.535-.586 2.12 0L7.83 5.804l2.494-2.493c.575-.576 1.508-.576 2.083 0z" />
diff --git a/mailpoet/assets/js/src/common/form/yesno/icons/yes.tsx b/mailpoet/assets/js/src/common/form/yesno/icons/yes.tsx
index 78d22d6a25..2987e29529 100644
--- a/mailpoet/assets/js/src/common/form/yesno/icons/yes.tsx
+++ b/mailpoet/assets/js/src/common/form/yesno/icons/yes.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg width="13" height="11" viewBox="0 0 13 11">
     <path fill="currentColor" d="M9.967.638c.483-.698 1.405-.846 2.06-.33.654.515.793 1.499.31 2.197l-5.44 7.857c-.55.794-1.64.857-2.267.132l-3.4-3.928c-.552-.638-.515-1.632.083-2.22.598-.59 1.53-.55 2.082.088l2.19 2.532L9.968.638z" />
diff --git a/mailpoet/assets/js/src/common/form/yesno/yesno.tsx b/mailpoet/assets/js/src/common/form/yesno/yesno.tsx
index 45a5796f62..69b4af0817 100644
--- a/mailpoet/assets/js/src/common/form/yesno/yesno.tsx
+++ b/mailpoet/assets/js/src/common/form/yesno/yesno.tsx
@@ -1,4 +1,4 @@
-import React, { InputHTMLAttributes } from 'react';
+import { InputHTMLAttributes } from 'react';
 import classnames from 'classnames';
 import iconYes from './icons/yes';
 import iconNo from './icons/no';
diff --git a/mailpoet/assets/js/src/common/grid/_stories/grid.tsx b/mailpoet/assets/js/src/common/grid/_stories/grid.tsx
index 0938e555d8..cc503b9701 100644
--- a/mailpoet/assets/js/src/common/grid/_stories/grid.tsx
+++ b/mailpoet/assets/js/src/common/grid/_stories/grid.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Heading from '../../typography/heading/heading';
 import { Grid } from '..';
 import Input from '../../form/input/input';
diff --git a/mailpoet/assets/js/src/common/grid/centered_row.tsx b/mailpoet/assets/js/src/common/grid/centered_row.tsx
index b5a2a6092d..c96c6ed728 100644
--- a/mailpoet/assets/js/src/common/grid/centered_row.tsx
+++ b/mailpoet/assets/js/src/common/grid/centered_row.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/grid/column.tsx b/mailpoet/assets/js/src/common/grid/column.tsx
index 28dd32cf36..a58f750073 100644
--- a/mailpoet/assets/js/src/common/grid/column.tsx
+++ b/mailpoet/assets/js/src/common/grid/column.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/grid/space_between.tsx b/mailpoet/assets/js/src/common/grid/space_between.tsx
index 087efb3af3..16f4870621 100644
--- a/mailpoet/assets/js/src/common/grid/space_between.tsx
+++ b/mailpoet/assets/js/src/common/grid/space_between.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/grid/three_columns.tsx b/mailpoet/assets/js/src/common/grid/three_columns.tsx
index 52171ee9cf..a66ec6bde6 100644
--- a/mailpoet/assets/js/src/common/grid/three_columns.tsx
+++ b/mailpoet/assets/js/src/common/grid/three_columns.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/grid/two_columns.tsx b/mailpoet/assets/js/src/common/grid/two_columns.tsx
index 1c3fbc30ab..8cee4abb3e 100644
--- a/mailpoet/assets/js/src/common/grid/two_columns.tsx
+++ b/mailpoet/assets/js/src/common/grid/two_columns.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/grid/two_columns_list.tsx b/mailpoet/assets/js/src/common/grid/two_columns_list.tsx
index 43b45f05bb..3564259243 100644
--- a/mailpoet/assets/js/src/common/grid/two_columns_list.tsx
+++ b/mailpoet/assets/js/src/common/grid/two_columns_list.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/hide_screen_options/hide_screen_options.tsx b/mailpoet/assets/js/src/common/hide_screen_options/hide_screen_options.tsx
index b3b281cb17..aea6c32af5 100644
--- a/mailpoet/assets/js/src/common/hide_screen_options/hide_screen_options.tsx
+++ b/mailpoet/assets/js/src/common/hide_screen_options/hide_screen_options.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 function HideScreenOptions() {
   return (
     <>
diff --git a/mailpoet/assets/js/src/common/key_value_table.jsx b/mailpoet/assets/js/src/common/key_value_table.jsx
index 73a37bdff5..8f7d617722 100644
--- a/mailpoet/assets/js/src/common/key_value_table.jsx
+++ b/mailpoet/assets/js/src/common/key_value_table.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 
 function KeyValueTable(props) {
   return (
diff --git a/mailpoet/assets/js/src/common/listings/_stories/newsletter_stats.tsx b/mailpoet/assets/js/src/common/listings/_stories/newsletter_stats.tsx
index 20dd96863c..9ba5c6a021 100644
--- a/mailpoet/assets/js/src/common/listings/_stories/newsletter_stats.tsx
+++ b/mailpoet/assets/js/src/common/listings/_stories/newsletter_stats.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import NewsletterStats from '../newsletter_stats';
 import Heading from '../../typography/heading/heading';
diff --git a/mailpoet/assets/js/src/common/listings/_stories/newsletter_status.tsx b/mailpoet/assets/js/src/common/listings/_stories/newsletter_status.tsx
index 636689525c..c2ef1fe82b 100644
--- a/mailpoet/assets/js/src/common/listings/_stories/newsletter_status.tsx
+++ b/mailpoet/assets/js/src/common/listings/_stories/newsletter_status.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { addHours, subHours } from 'date-fns';
 import MailPoet from 'mailpoet';
 import NewsletterStatus from '../newsletter_status';
diff --git a/mailpoet/assets/js/src/common/listings/newsletter_stats.tsx b/mailpoet/assets/js/src/common/listings/newsletter_stats.tsx
index 1933548e2b..0d83d6d379 100644
--- a/mailpoet/assets/js/src/common/listings/newsletter_stats.tsx
+++ b/mailpoet/assets/js/src/common/listings/newsletter_stats.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import { StatsBadge } from './newsletter_stats/stats';
 import Tooltip from '../tooltip/tooltip';
diff --git a/mailpoet/assets/js/src/common/listings/newsletter_stats/badge.tsx b/mailpoet/assets/js/src/common/listings/newsletter_stats/badge.tsx
index d36884b711..f53cba30dd 100644
--- a/mailpoet/assets/js/src/common/listings/newsletter_stats/badge.tsx
+++ b/mailpoet/assets/js/src/common/listings/newsletter_stats/badge.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import { Place } from 'react-tooltip';
 import Tag from '../../tag/tag';
 import Tooltip from '../../tooltip/tooltip';
diff --git a/mailpoet/assets/js/src/common/listings/newsletter_stats/stats.tsx b/mailpoet/assets/js/src/common/listings/newsletter_stats/stats.tsx
index 39740d85dc..07217563a7 100644
--- a/mailpoet/assets/js/src/common/listings/newsletter_stats/stats.tsx
+++ b/mailpoet/assets/js/src/common/listings/newsletter_stats/stats.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { Place } from 'react-tooltip';
 import Badge from './badge';
diff --git a/mailpoet/assets/js/src/common/listings/newsletter_status.tsx b/mailpoet/assets/js/src/common/listings/newsletter_status.tsx
index b4dc8a44a9..6c56abce0b 100644
--- a/mailpoet/assets/js/src/common/listings/newsletter_status.tsx
+++ b/mailpoet/assets/js/src/common/listings/newsletter_status.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import classNames from 'classnames';
 import {
diff --git a/mailpoet/assets/js/src/common/loader/_stories/loader.tsx b/mailpoet/assets/js/src/common/loader/_stories/loader.tsx
index 813b3bc4f8..f779323389 100644
--- a/mailpoet/assets/js/src/common/loader/_stories/loader.tsx
+++ b/mailpoet/assets/js/src/common/loader/_stories/loader.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Loader from '../loader';
 
 export default {
diff --git a/mailpoet/assets/js/src/common/loader/loader.tsx b/mailpoet/assets/js/src/common/loader/loader.tsx
index db1e53800a..3a450f21c2 100644
--- a/mailpoet/assets/js/src/common/loader/loader.tsx
+++ b/mailpoet/assets/js/src/common/loader/loader.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 type Props = {
   variant?: 'light' | 'dark';
   size?: number;
diff --git a/mailpoet/assets/js/src/common/loading.jsx b/mailpoet/assets/js/src/common/loading.jsx
index d4eb083480..63c796d937 100644
--- a/mailpoet/assets/js/src/common/loading.jsx
+++ b/mailpoet/assets/js/src/common/loading.jsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 
-class Loading extends React.Component {
+class Loading extends Component {
   componentDidMount() {
     MailPoet.Modal.loading(true);
   }
diff --git a/mailpoet/assets/js/src/common/modal/_stories/modal.tsx b/mailpoet/assets/js/src/common/modal/_stories/modal.tsx
index b62fd1fbe6..ad68fbba65 100644
--- a/mailpoet/assets/js/src/common/modal/_stories/modal.tsx
+++ b/mailpoet/assets/js/src/common/modal/_stories/modal.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import Button from '../../button/button';
 import Modal from '../modal';
 import Heading from '../../typography/heading/heading';
diff --git a/mailpoet/assets/js/src/common/modal/close_icon.tsx b/mailpoet/assets/js/src/common/modal/close_icon.tsx
index e8f8f19066..74db755203 100644
--- a/mailpoet/assets/js/src/common/modal/close_icon.tsx
+++ b/mailpoet/assets/js/src/common/modal/close_icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg viewBox="0 0 48 48">
     <path d="M42 6L6 42M6 6L42 42" strokeWidth="12" strokeLinecap="round" />
diff --git a/mailpoet/assets/js/src/common/modal/frame.tsx b/mailpoet/assets/js/src/common/modal/frame.tsx
index d8d69ebf10..e249d600a1 100644
--- a/mailpoet/assets/js/src/common/modal/frame.tsx
+++ b/mailpoet/assets/js/src/common/modal/frame.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/modal/header.tsx b/mailpoet/assets/js/src/common/modal/header.tsx
index bd17166d97..bacc2dd962 100644
--- a/mailpoet/assets/js/src/common/modal/header.tsx
+++ b/mailpoet/assets/js/src/common/modal/header.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import Heading from '../typography/heading/heading';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/modal/modal.tsx b/mailpoet/assets/js/src/common/modal/modal.tsx
index 3b040a99e9..addb907e60 100644
--- a/mailpoet/assets/js/src/common/modal/modal.tsx
+++ b/mailpoet/assets/js/src/common/modal/modal.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import { createPortal } from 'react-dom';
 import { noop } from 'lodash';
 
diff --git a/mailpoet/assets/js/src/common/modal/overlay.tsx b/mailpoet/assets/js/src/common/modal/overlay.tsx
index beff1402a8..c82a9125b0 100644
--- a/mailpoet/assets/js/src/common/modal/overlay.tsx
+++ b/mailpoet/assets/js/src/common/modal/overlay.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 import { noop } from 'lodash';
 
diff --git a/mailpoet/assets/js/src/common/premium_banner_with_upgrade/premium_banner_with_upgrade.tsx b/mailpoet/assets/js/src/common/premium_banner_with_upgrade/premium_banner_with_upgrade.tsx
index 5f5457573b..11a099aadf 100644
--- a/mailpoet/assets/js/src/common/premium_banner_with_upgrade/premium_banner_with_upgrade.tsx
+++ b/mailpoet/assets/js/src/common/premium_banner_with_upgrade/premium_banner_with_upgrade.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import PremiumRequired from 'common/premium_required/premium_required';
 import Button from 'common/button/button';
diff --git a/mailpoet/assets/js/src/common/premium_required/_stories/premium_required.tsx b/mailpoet/assets/js/src/common/premium_required/_stories/premium_required.tsx
index 75e44d8a46..82e4039fb0 100644
--- a/mailpoet/assets/js/src/common/premium_required/_stories/premium_required.tsx
+++ b/mailpoet/assets/js/src/common/premium_required/_stories/premium_required.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PremiumRequired from '../premium_required';
 import Button from '../../button/button';
 
diff --git a/mailpoet/assets/js/src/common/premium_required/premium_required.tsx b/mailpoet/assets/js/src/common/premium_required/premium_required.tsx
index 73c2da8cb1..5f9e50adff 100644
--- a/mailpoet/assets/js/src/common/premium_required/premium_required.tsx
+++ b/mailpoet/assets/js/src/common/premium_required/premium_required.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Badge from 'common/badge/badge';
 import Heading from 'common/typography/heading/heading';
 
diff --git a/mailpoet/assets/js/src/common/preview/desktop_icon.tsx b/mailpoet/assets/js/src/common/preview/desktop_icon.tsx
index 7a21d37bcb..9a72555c33 100644
--- a/mailpoet/assets/js/src/common/preview/desktop_icon.tsx
+++ b/mailpoet/assets/js/src/common/preview/desktop_icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default function DesktopIcon() {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink" width="24px" height="24px" viewBox="0 0 24 24" version="1.1">
diff --git a/mailpoet/assets/js/src/common/preview/mobile_icon.tsx b/mailpoet/assets/js/src/common/preview/mobile_icon.tsx
index b182fc6de2..d5ec7b55f7 100644
--- a/mailpoet/assets/js/src/common/preview/mobile_icon.tsx
+++ b/mailpoet/assets/js/src/common/preview/mobile_icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default function MobileIcon() {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink" width="16px" height="24px" viewBox="0 0 16 24" version="1.1">
diff --git a/mailpoet/assets/js/src/common/preview/preview.jsx b/mailpoet/assets/js/src/common/preview/preview.jsx
index 39ec5290a6..46d78d24ed 100644
--- a/mailpoet/assets/js/src/common/preview/preview.jsx
+++ b/mailpoet/assets/js/src/common/preview/preview.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import classnames from 'classnames';
diff --git a/mailpoet/assets/js/src/common/print_boolean.jsx b/mailpoet/assets/js/src/common/print_boolean.jsx
index 6ab1cbf03b..21d08854c4 100644
--- a/mailpoet/assets/js/src/common/print_boolean.jsx
+++ b/mailpoet/assets/js/src/common/print_boolean.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import MailPoet from 'mailpoet';
 
 function PrintBoolean(props) {
diff --git a/mailpoet/assets/js/src/common/remove_wrap_margin/remove_wrap_margin.tsx b/mailpoet/assets/js/src/common/remove_wrap_margin/remove_wrap_margin.tsx
index fdddfb5b99..297dc2089a 100644
--- a/mailpoet/assets/js/src/common/remove_wrap_margin/remove_wrap_margin.tsx
+++ b/mailpoet/assets/js/src/common/remove_wrap_margin/remove_wrap_margin.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 function RemoveWrapMargin() {
   return (
     <>
diff --git a/mailpoet/assets/js/src/common/sender_email_address_warning.jsx b/mailpoet/assets/js/src/common/sender_email_address_warning.jsx
index bcbd072742..327f7ad1c6 100644
--- a/mailpoet/assets/js/src/common/sender_email_address_warning.jsx
+++ b/mailpoet/assets/js/src/common/sender_email_address_warning.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/common/set_from_address_modal.tsx b/mailpoet/assets/js/src/common/set_from_address_modal.tsx
index 9011dbfbb4..dd380dee20 100644
--- a/mailpoet/assets/js/src/common/set_from_address_modal.tsx
+++ b/mailpoet/assets/js/src/common/set_from_address_modal.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useContext, useState } from 'react';
 import ReactStringReplace from 'react-string-replace';
 import jQuery from 'jquery';
 import MailPoet from 'mailpoet';
@@ -81,7 +81,7 @@ type Props = {
 function SetFromAddressModal({ onRequestClose, setAuthorizedAddress }: Props) {
   const [address, setAddress] = useState<string>();
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const { notices } = React.useContext<any>(GlobalContext);
+  const { notices } = useContext<any>(GlobalContext);
 
   return (
     <Modal
diff --git a/mailpoet/assets/js/src/common/steps/_stories/steps.tsx b/mailpoet/assets/js/src/common/steps/_stories/steps.tsx
index c8c59d82a5..31d3908108 100644
--- a/mailpoet/assets/js/src/common/steps/_stories/steps.tsx
+++ b/mailpoet/assets/js/src/common/steps/_stories/steps.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import Button from '../../button/button';
 import Heading from '../../typography/heading/heading';
 import Steps from '../steps';
diff --git a/mailpoet/assets/js/src/common/steps/content_wrapper_fix.tsx b/mailpoet/assets/js/src/common/steps/content_wrapper_fix.tsx
index f85d0d8f4e..76fe402b60 100644
--- a/mailpoet/assets/js/src/common/steps/content_wrapper_fix.tsx
+++ b/mailpoet/assets/js/src/common/steps/content_wrapper_fix.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export function ContentWrapperFix() {
   return (
     <>
diff --git a/mailpoet/assets/js/src/common/steps/steps.tsx b/mailpoet/assets/js/src/common/steps/steps.tsx
index 191f1a565c..8ce0d8195b 100644
--- a/mailpoet/assets/js/src/common/steps/steps.tsx
+++ b/mailpoet/assets/js/src/common/steps/steps.tsx
@@ -1,5 +1,4 @@
 import range from 'lodash/range';
-import React from 'react';
 import classNames from 'classnames';
 import { ContentWrapperFix } from './content_wrapper_fix';
 
diff --git a/mailpoet/assets/js/src/common/steps/steps_content.tsx b/mailpoet/assets/js/src/common/steps/steps_content.tsx
index 9884986c14..6bf720df3d 100644
--- a/mailpoet/assets/js/src/common/steps/steps_content.tsx
+++ b/mailpoet/assets/js/src/common/steps/steps_content.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 
 type Props = {
   children: React.ReactNode;
diff --git a/mailpoet/assets/js/src/common/subscribers_cache_message.tsx b/mailpoet/assets/js/src/common/subscribers_cache_message.tsx
index eba66b5c2f..4cc4efc02e 100644
--- a/mailpoet/assets/js/src/common/subscribers_cache_message.tsx
+++ b/mailpoet/assets/js/src/common/subscribers_cache_message.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/common/subscribers_in_plan.tsx b/mailpoet/assets/js/src/common/subscribers_in_plan.tsx
index 401aec2c85..9053428da0 100644
--- a/mailpoet/assets/js/src/common/subscribers_in_plan.tsx
+++ b/mailpoet/assets/js/src/common/subscribers_in_plan.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import HelpTooltip from 'help-tooltip.jsx';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/common/tabs/_stories/assets/icon.tsx b/mailpoet/assets/js/src/common/tabs/_stories/assets/icon.tsx
index 26d5bf7f28..f4dd6342c5 100644
--- a/mailpoet/assets/js/src/common/tabs/_stories/assets/icon.tsx
+++ b/mailpoet/assets/js/src/common/tabs/_stories/assets/icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg viewBox="4 4 16 16">
     <path d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
diff --git a/mailpoet/assets/js/src/common/tabs/_stories/tabs.tsx b/mailpoet/assets/js/src/common/tabs/_stories/tabs.tsx
index 980a513af9..94eea62d03 100644
--- a/mailpoet/assets/js/src/common/tabs/_stories/tabs.tsx
+++ b/mailpoet/assets/js/src/common/tabs/_stories/tabs.tsx
@@ -1,5 +1,5 @@
 import { action } from '_storybook/action';
-import React, { CSSProperties } from 'react';
+import { CSSProperties } from 'react';
 import Heading from '../../typography/heading/heading';
 import RoutedTabs from '../routed_tabs';
 import Tab from '../tab';
diff --git a/mailpoet/assets/js/src/common/tabs/_stories/tabs_icons.tsx b/mailpoet/assets/js/src/common/tabs/_stories/tabs_icons.tsx
index 7478268800..14ad373100 100644
--- a/mailpoet/assets/js/src/common/tabs/_stories/tabs_icons.tsx
+++ b/mailpoet/assets/js/src/common/tabs/_stories/tabs_icons.tsx
@@ -1,5 +1,5 @@
 import { action } from '_storybook/action';
-import React, { CSSProperties } from 'react';
+import { CSSProperties } from 'react';
 import Heading from '../../typography/heading/heading';
 import RoutedTabs from '../routed_tabs';
 import Tab from '../tab';
diff --git a/mailpoet/assets/js/src/common/tabs/routed_tabs.tsx b/mailpoet/assets/js/src/common/tabs/routed_tabs.tsx
index 2a6d5c018f..c8c401a63c 100644
--- a/mailpoet/assets/js/src/common/tabs/routed_tabs.tsx
+++ b/mailpoet/assets/js/src/common/tabs/routed_tabs.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import {
   BrowserRouter,
   HashRouter,
diff --git a/mailpoet/assets/js/src/common/tabs/tab.tsx b/mailpoet/assets/js/src/common/tabs/tab.tsx
index ae58c1bc77..84090784cc 100644
--- a/mailpoet/assets/js/src/common/tabs/tab.tsx
+++ b/mailpoet/assets/js/src/common/tabs/tab.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 
 /* eslint-disable react/no-unused-prop-types -- all properties are used in the Tabs component */
 type Props = {
diff --git a/mailpoet/assets/js/src/common/tabs/tabs.tsx b/mailpoet/assets/js/src/common/tabs/tabs.tsx
index 9098468570..c9df5b56ab 100644
--- a/mailpoet/assets/js/src/common/tabs/tabs.tsx
+++ b/mailpoet/assets/js/src/common/tabs/tabs.tsx
@@ -1,5 +1,6 @@
 import classnames from 'classnames';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
+import * as React from 'react';
 import { noop } from 'lodash';
 
 import Tab from './tab';
diff --git a/mailpoet/assets/js/src/common/tag/_stories/tag.tsx b/mailpoet/assets/js/src/common/tag/_stories/tag.tsx
index 106f1138a1..e71ff902d2 100644
--- a/mailpoet/assets/js/src/common/tag/_stories/tag.tsx
+++ b/mailpoet/assets/js/src/common/tag/_stories/tag.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Heading from 'common/typography/heading/heading';
 import Tag from '../tag';
 
diff --git a/mailpoet/assets/js/src/common/tag/_stories/tags.tsx b/mailpoet/assets/js/src/common/tag/_stories/tags.tsx
index 6feed3dfe3..e305c28917 100644
--- a/mailpoet/assets/js/src/common/tag/_stories/tags.tsx
+++ b/mailpoet/assets/js/src/common/tag/_stories/tags.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Heading from 'common/typography/heading/heading';
 import Tags from '../tags';
 
diff --git a/mailpoet/assets/js/src/common/tag/tag.tsx b/mailpoet/assets/js/src/common/tag/tag.tsx
index dc78657fff..073a7c2e04 100644
--- a/mailpoet/assets/js/src/common/tag/tag.tsx
+++ b/mailpoet/assets/js/src/common/tag/tag.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/common/tag/tags.tsx b/mailpoet/assets/js/src/common/tag/tags.tsx
index bd460498ce..ab5e918b6e 100644
--- a/mailpoet/assets/js/src/common/tag/tags.tsx
+++ b/mailpoet/assets/js/src/common/tag/tags.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Tag from './tag';
 
 type Segment = {
diff --git a/mailpoet/assets/js/src/common/template_box/_stories/template_box.tsx b/mailpoet/assets/js/src/common/template_box/_stories/template_box.tsx
index e7a5ad5efc..ca694a835a 100644
--- a/mailpoet/assets/js/src/common/template_box/_stories/template_box.tsx
+++ b/mailpoet/assets/js/src/common/template_box/_stories/template_box.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { action } from '@storybook/addon-actions';
 import TemplateBox from '../template_box';
diff --git a/mailpoet/assets/js/src/common/template_box/template_box.tsx b/mailpoet/assets/js/src/common/template_box/template_box.tsx
index 8c3063eab9..761c3dd8d1 100644
--- a/mailpoet/assets/js/src/common/template_box/template_box.tsx
+++ b/mailpoet/assets/js/src/common/template_box/template_box.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import Heading from 'common/typography/heading/heading';
 import Button from 'common/button/button';
diff --git a/mailpoet/assets/js/src/common/tooltip/_stories/tooltip.tsx b/mailpoet/assets/js/src/common/tooltip/_stories/tooltip.tsx
index 0bd247a3de..6847e8c11b 100644
--- a/mailpoet/assets/js/src/common/tooltip/_stories/tooltip.tsx
+++ b/mailpoet/assets/js/src/common/tooltip/_stories/tooltip.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Heading from 'common/typography/heading/heading';
 import Tooltip from '../tooltip';
 
diff --git a/mailpoet/assets/js/src/common/tooltip/tooltip.tsx b/mailpoet/assets/js/src/common/tooltip/tooltip.tsx
index 315655803e..fa91b4447b 100644
--- a/mailpoet/assets/js/src/common/tooltip/tooltip.tsx
+++ b/mailpoet/assets/js/src/common/tooltip/tooltip.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import classNames from 'classnames';
 import ReactTooltip, { TooltipProps } from 'react-tooltip';
 
diff --git a/mailpoet/assets/js/src/common/top_bar/_stories/top_bar_no_children.tsx b/mailpoet/assets/js/src/common/top_bar/_stories/top_bar_no_children.tsx
index 89b56c53d1..b3a1ffc0a8 100644
--- a/mailpoet/assets/js/src/common/top_bar/_stories/top_bar_no_children.tsx
+++ b/mailpoet/assets/js/src/common/top_bar/_stories/top_bar_no_children.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import { TopBar } from '../top_bar';
 
diff --git a/mailpoet/assets/js/src/common/top_bar/_stories/top_bar_with_children.tsx b/mailpoet/assets/js/src/common/top_bar/_stories/top_bar_with_children.tsx
index 3203a4220d..2c695ffb3f 100644
--- a/mailpoet/assets/js/src/common/top_bar/_stories/top_bar_with_children.tsx
+++ b/mailpoet/assets/js/src/common/top_bar/_stories/top_bar_with_children.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import { TopBar } from '../top_bar';
 import Button from '../../button/button';
diff --git a/mailpoet/assets/js/src/common/top_bar/beamer_icon.tsx b/mailpoet/assets/js/src/common/top_bar/beamer_icon.tsx
index 3ac0e790e7..9b3ec8caae 100644
--- a/mailpoet/assets/js/src/common/top_bar/beamer_icon.tsx
+++ b/mailpoet/assets/js/src/common/top_bar/beamer_icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export function BeamerIcon() {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
diff --git a/mailpoet/assets/js/src/common/top_bar/mailpoet_logo.tsx b/mailpoet/assets/js/src/common/top_bar/mailpoet_logo.tsx
index 1fe5957044..1c9041fd2b 100644
--- a/mailpoet/assets/js/src/common/top_bar/mailpoet_logo.tsx
+++ b/mailpoet/assets/js/src/common/top_bar/mailpoet_logo.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export function MailPoetLogo() {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 24">
diff --git a/mailpoet/assets/js/src/common/top_bar/mailpoet_logo_mobile.tsx b/mailpoet/assets/js/src/common/top_bar/mailpoet_logo_mobile.tsx
index f49c9c7343..a69036d46c 100644
--- a/mailpoet/assets/js/src/common/top_bar/mailpoet_logo_mobile.tsx
+++ b/mailpoet/assets/js/src/common/top_bar/mailpoet_logo_mobile.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export function MailPoetLogoMobile() {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 39 40">
diff --git a/mailpoet/assets/js/src/common/top_bar/screen_options_fix.tsx b/mailpoet/assets/js/src/common/top_bar/screen_options_fix.tsx
index f7bb49141f..f792cf9c2f 100644
--- a/mailpoet/assets/js/src/common/top_bar/screen_options_fix.tsx
+++ b/mailpoet/assets/js/src/common/top_bar/screen_options_fix.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export function ScreenOptionsFix() {
   return (
     <>
diff --git a/mailpoet/assets/js/src/common/top_bar/top_bar.tsx b/mailpoet/assets/js/src/common/top_bar/top_bar.tsx
index 4976fb765b..bf73c70e54 100644
--- a/mailpoet/assets/js/src/common/top_bar/top_bar.tsx
+++ b/mailpoet/assets/js/src/common/top_bar/top_bar.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import t from 'common/functions/t';
diff --git a/mailpoet/assets/js/src/common/typography/heading/_stories/heading.tsx b/mailpoet/assets/js/src/common/typography/heading/_stories/heading.tsx
index 0e3bfa6b4c..aad70ecd7c 100644
--- a/mailpoet/assets/js/src/common/typography/heading/_stories/heading.tsx
+++ b/mailpoet/assets/js/src/common/typography/heading/_stories/heading.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Heading from '../heading';
 
 export default {
diff --git a/mailpoet/assets/js/src/common/typography/heading/heading.tsx b/mailpoet/assets/js/src/common/typography/heading/heading.tsx
index eff14f1030..98e20a5c40 100644
--- a/mailpoet/assets/js/src/common/typography/heading/heading.tsx
+++ b/mailpoet/assets/js/src/common/typography/heading/heading.tsx
@@ -1,4 +1,5 @@
-import React, { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 type Props = HTMLAttributes<HTMLHeadingElement> & {
diff --git a/mailpoet/assets/js/src/common/typography/list/_stories/list.tsx b/mailpoet/assets/js/src/common/typography/list/_stories/list.tsx
index 29a7eb75b8..af8febf9eb 100644
--- a/mailpoet/assets/js/src/common/typography/list/_stories/list.tsx
+++ b/mailpoet/assets/js/src/common/typography/list/_stories/list.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import List from '../list';
 import Heading from '../../heading/heading';
 
diff --git a/mailpoet/assets/js/src/common/typography/list/list.tsx b/mailpoet/assets/js/src/common/typography/list/list.tsx
index cf750e9315..cdb109e697 100644
--- a/mailpoet/assets/js/src/common/typography/list/list.tsx
+++ b/mailpoet/assets/js/src/common/typography/list/list.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 
 type Props = {
   children: React.ReactNode;
diff --git a/mailpoet/assets/js/src/context/index.jsx b/mailpoet/assets/js/src/context/index.jsx
index 2066b62abc..24bea6bc3d 100644
--- a/mailpoet/assets/js/src/context/index.jsx
+++ b/mailpoet/assets/js/src/context/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { createContext } from 'react';
 import useFeaturesContext from './useFeaturesContext.jsx';
 import useSegmentsContext from './useSegmentsContext.jsx';
 import useUsersContext from './useUsersContext.jsx';
@@ -19,4 +19,4 @@ export function useGlobalContextValue(data) {
   };
 }
 
-export const GlobalContext = React.createContext({});
+export const GlobalContext = createContext({});
diff --git a/mailpoet/assets/js/src/context/useFeaturesContext.jsx b/mailpoet/assets/js/src/context/useFeaturesContext.jsx
index d17e856dd4..c85324b953 100644
--- a/mailpoet/assets/js/src/context/useFeaturesContext.jsx
+++ b/mailpoet/assets/js/src/context/useFeaturesContext.jsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import { useMemo } from 'react';
 
 export default function useFeaturesContext(data) {
-  return React.useMemo(() => {
+  return useMemo(() => {
     const flags = data.mailpoet_feature_flags;
     const isSupported = (feature) => flags[feature] || false;
     return { isSupported };
diff --git a/mailpoet/assets/js/src/context/useNotices.jsx b/mailpoet/assets/js/src/context/useNotices.jsx
index 7a86688150..d44d2a00fa 100644
--- a/mailpoet/assets/js/src/context/useNotices.jsx
+++ b/mailpoet/assets/js/src/context/useNotices.jsx
@@ -1,38 +1,38 @@
-import React from 'react';
+import { useState, useCallback } from 'react';
 
 export default () => {
-  const [state, setState] = React.useState({
+  const [state, setState] = useState({
     items: [],
     nextId: 1,
   });
 
-  const add = React.useCallback((item) => {
+  const add = useCallback((item) => {
     setState(({ items, nextId }) => ({
       items: [...items, { ...item, id: item.id || nextId }],
       nextId: item.id ? nextId : nextId + 1,
     }));
   }, [setState]);
 
-  const remove = React.useCallback((id) => {
+  const remove = useCallback((id) => {
     setState(({ items, nextId }) => ({
       items: items.filter((x) => x.id !== id),
       nextId,
     }));
   }, [setState]);
 
-  const success = React.useCallback(
+  const success = useCallback(
     (content, props = {}) => add({ ...props, type: 'success', children: content }),
     [add]
   );
-  const info = React.useCallback(
+  const info = useCallback(
     (content, props = {}) => add({ ...props, type: 'info', children: content }),
     [add]
   );
-  const warning = React.useCallback(
+  const warning = useCallback(
     (content, props = {}) => add({ ...props, type: 'warning', children: content }),
     [add]
   );
-  const error = React.useCallback(
+  const error = useCallback(
     (content, props = {}) => add({ ...props, type: 'error', children: content }),
     [add]
   );
diff --git a/mailpoet/assets/js/src/context/useSegmentsContext.jsx b/mailpoet/assets/js/src/context/useSegmentsContext.jsx
index d9a09c3dab..dbf7e3486b 100644
--- a/mailpoet/assets/js/src/context/useSegmentsContext.jsx
+++ b/mailpoet/assets/js/src/context/useSegmentsContext.jsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import { useMemo } from 'react';
 
 export default function useSegmentsContext(data) {
-  return React.useMemo(() => ({
+  return useMemo(() => ({
     all: data.mailpoetSegments,
     // eslint-disable-next-line no-param-reassign
     updateAll: (segments) => { data.mailpoetSegments = segments; },
diff --git a/mailpoet/assets/js/src/context/useUsersContext.jsx b/mailpoet/assets/js/src/context/useUsersContext.jsx
index 9f6f615958..013249e846 100644
--- a/mailpoet/assets/js/src/context/useUsersContext.jsx
+++ b/mailpoet/assets/js/src/context/useUsersContext.jsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import { useMemo } from 'react';
 
 export default function useUsersContext(data) {
-  return React.useMemo(() => ({
+  return useMemo(() => ({
     isNewUser: data.mailpoet_is_new_user,
   }), [data]);
 }
diff --git a/mailpoet/assets/js/src/experimental_features/experimental_features.jsx b/mailpoet/assets/js/src/experimental_features/experimental_features.jsx
index 8817041d20..5c4b272cee 100644
--- a/mailpoet/assets/js/src/experimental_features/experimental_features.jsx
+++ b/mailpoet/assets/js/src/experimental_features/experimental_features.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom';
 import MailPoet from 'mailpoet';
 import { GlobalContext, useGlobalContextValue } from 'context/index.jsx';
diff --git a/mailpoet/assets/js/src/features/context.jsx b/mailpoet/assets/js/src/features/context.jsx
index 266345f567..1974bf9e99 100644
--- a/mailpoet/assets/js/src/features/context.jsx
+++ b/mailpoet/assets/js/src/features/context.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { createContext } from 'react';
 import MailPoet from 'mailpoet';
 
-export default React.createContext(MailPoet.FeaturesController);
+export default createContext(MailPoet.FeaturesController);
diff --git a/mailpoet/assets/js/src/form/fields/checkbox.jsx b/mailpoet/assets/js/src/form/fields/checkbox.jsx
index e891e767d7..01ac6dcda5 100644
--- a/mailpoet/assets/js/src/form/fields/checkbox.jsx
+++ b/mailpoet/assets/js/src/form/fields/checkbox.jsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import Checkbox from 'common/form/checkbox/checkbox';
 
-class FormFieldCheckbox extends React.Component {
+class FormFieldCheckbox extends Component {
   constructor(props) {
     super(props);
     this.onValueChange = this.onValueChange.bind(this);
diff --git a/mailpoet/assets/js/src/form/fields/date.jsx b/mailpoet/assets/js/src/form/fields/date.jsx
index a8699742f8..2d7b729940 100644
--- a/mailpoet/assets/js/src/form/fields/date.jsx
+++ b/mailpoet/assets/js/src/form/fields/date.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import moment from 'moment';
 import PropTypes from 'prop-types';
 import Select from '../../common/form/select/select';
@@ -130,7 +130,7 @@ FormFieldDateDay.propTypes = {
   ]).isRequired,
 };
 
-class FormFieldDate extends React.Component {
+class FormFieldDate extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/form/fields/field.jsx b/mailpoet/assets/js/src/form/fields/field.jsx
index f3213aef87..bc3e992136 100644
--- a/mailpoet/assets/js/src/form/fields/field.jsx
+++ b/mailpoet/assets/js/src/form/fields/field.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import FormFieldText from 'form/fields/text.jsx';
 import FormFieldTextarea from 'form/fields/textarea.jsx';
 import FormFieldSelect from 'form/fields/select.jsx';
@@ -10,7 +10,7 @@ import Heading from 'common/typography/heading/heading';
 import jQuery from 'jquery';
 import PropTypes from 'prop-types';
 
-class FormField extends React.Component {
+class FormField extends Component {
   renderField = (data) => {
     let description = false;
     if (data.field.description) {
diff --git a/mailpoet/assets/js/src/form/fields/radio.jsx b/mailpoet/assets/js/src/form/fields/radio.jsx
index 0b84ee6dc9..e1a37002e3 100644
--- a/mailpoet/assets/js/src/form/fields/radio.jsx
+++ b/mailpoet/assets/js/src/form/fields/radio.jsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import Radio from 'common/form/radio/radio';
 
-class FormFieldRadio extends React.Component { // eslint-disable-line react/prefer-stateless-function, max-len
+class FormFieldRadio extends Component { // eslint-disable-line react/prefer-stateless-function, max-len
   constructor(props) {
     super(props);
     this.onValueChange = this.onValueChange.bind(this);
diff --git a/mailpoet/assets/js/src/form/fields/select.jsx b/mailpoet/assets/js/src/form/fields/select.jsx
index 8004106ab7..69925167c8 100644
--- a/mailpoet/assets/js/src/form/fields/select.jsx
+++ b/mailpoet/assets/js/src/form/fields/select.jsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Component } from 'react';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
 import Select from 'common/form/select/select';
 
-class FormFieldSelect extends React.Component {
+class FormFieldSelect extends Component {
   render() {
     if (this.props.field.values === undefined) {
       return false;
diff --git a/mailpoet/assets/js/src/form/fields/selection.jsx b/mailpoet/assets/js/src/form/fields/selection.jsx
index 7946b175af..7cb52be005 100644
--- a/mailpoet/assets/js/src/form/fields/selection.jsx
+++ b/mailpoet/assets/js/src/form/fields/selection.jsx
@@ -1,14 +1,14 @@
-import React from 'react';
+import { createRef, Component } from 'react';
 import jQuery from 'jquery';
 import _ from 'underscore';
 import 'react-dom';
 import 'select2/dist/js/select2.full';
 import PropTypes from 'prop-types';
 
-class Selection extends React.Component {
+class Selection extends Component {
   constructor(props) {
     super(props);
-    this.selectRef = React.createRef();
+    this.selectRef = createRef();
   }
 
   componentDidMount() {
diff --git a/mailpoet/assets/js/src/form/fields/text.jsx b/mailpoet/assets/js/src/form/fields/text.jsx
index e7b7a75930..a023f8dea5 100644
--- a/mailpoet/assets/js/src/form/fields/text.jsx
+++ b/mailpoet/assets/js/src/form/fields/text.jsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import Input from 'common/form/input/input';
 
-class FormFieldText extends React.Component { // eslint-disable-line react/prefer-stateless-function, max-len
+class FormFieldText extends Component { // eslint-disable-line react/prefer-stateless-function, max-len
   render() {
     const name = this.props.field.name || null;
     const item = this.props.item || {};
diff --git a/mailpoet/assets/js/src/form/fields/textarea.jsx b/mailpoet/assets/js/src/form/fields/textarea.jsx
index b1a3727152..bbf8aec592 100644
--- a/mailpoet/assets/js/src/form/fields/textarea.jsx
+++ b/mailpoet/assets/js/src/form/fields/textarea.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import Textarea from 'common/form/textarea/textarea';
 
diff --git a/mailpoet/assets/js/src/form/form.jsx b/mailpoet/assets/js/src/form/form.jsx
index 02d5ec8e82..85fa4feee8 100644
--- a/mailpoet/assets/js/src/form/form.jsx
+++ b/mailpoet/assets/js/src/form/form.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { createRef, Component } from 'react';
 import MailPoet from 'mailpoet';
 import classNames from 'classnames';
 import FormField from 'form/fields/field.jsx';
@@ -7,10 +7,10 @@ import PropTypes from 'prop-types';
 import { withRouter } from 'react-router-dom';
 import { Button } from 'common';
 
-class Form extends React.Component {
+class Form extends Component {
   constructor(props) {
     super(props);
-    this.formRef = React.createRef();
+    this.formRef = createRef();
     this.state = {
       loading: false,
       errors: [],
diff --git a/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/add_custom_field_form.jsx b/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/add_custom_field_form.jsx
index 1e668b3477..c1f4438ef8 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/add_custom_field_form.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/add_custom_field_form.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import PropTypes from 'prop-types';
 import {
   Button,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/edit.jsx
index 337583e0eb..b884907abf 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import {
   Placeholder,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/icon.jsx
index 240b9412f8..a48ef9f5c0 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/add_custom_field/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { G, Path, SVG } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_checkbox/custom_field_settings.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_checkbox/custom_field_settings.jsx
index b8b09bd55d..6a2d994821 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_checkbox/custom_field_settings.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_checkbox/custom_field_settings.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import {
   BaseControl,
   Button, TextControl,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_checkbox/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_checkbox/edit.jsx
index 26bbc9f3e5..54a7ebed4e 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_checkbox/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_checkbox/edit.jsx
@@ -1,5 +1,4 @@
 /* eslint-disable react/no-danger */
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_date/custom_field_settings.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_date/custom_field_settings.jsx
index 857cff590e..0ff3821913 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_date/custom_field_settings.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_date/custom_field_settings.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import {
   Button,
   ToggleControl,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_date/date.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_date/date.jsx
index e89d5eb664..6192e44e1b 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_date/date.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_date/date.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import moment from 'moment';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
@@ -133,7 +133,7 @@ FormFieldDateDay.propTypes = {
   addDefaultClasses: PropTypes.bool.isRequired,
 };
 
-class FormFieldDate extends React.Component {
+class FormFieldDate extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_date/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_date/edit.jsx
index 6a0be768e8..af67dd39c1 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_date/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_date/edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import moment from 'moment';
 import {
   Panel,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_field_delete.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_field_delete.jsx
index 9986db4e47..7042e24310 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_field_delete.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_field_delete.jsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
 import {
   Button,
 } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_radio/custom_field_settings.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_radio/custom_field_settings.jsx
index 5d61910ee8..cd8c3a8bb8 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_radio/custom_field_settings.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_radio/custom_field_settings.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import {
   Button, TextControl,
   ToggleControl,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_radio/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_radio/edit.jsx
index 5b8279ef0d..e410783050 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_radio/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_radio/edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_radio/settings_preview.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_radio/settings_preview.jsx
index 3d6bd0f393..125831d24a 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_radio/settings_preview.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_radio/settings_preview.jsx
@@ -1,7 +1,4 @@
-import React, {
-  useState,
-  useEffect,
-} from 'react';
+import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Dashicon } from '@wordpress/components';
 import { partial } from 'lodash';
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_select/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_select/edit.jsx
index a4dbaea22d..fac0d5756a 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_select/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_select/edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_text/custom_field_settings.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_text/custom_field_settings.jsx
index 9995782ed0..317bdcc523 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_text/custom_field_settings.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_text/custom_field_settings.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import {
   Button,
   SelectControl, TextControl,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_text/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_text/edit.jsx
index 6f70f12339..bf06b6f36c 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_text/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_text/edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_text/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_text/icon.jsx
index 8dcffde571..903279fbb6 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_text/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_text/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Path, Rect, SVG } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx
index 3532751f44..9d45781887 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import {
   Panel,
   PanelBody, SelectControl,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/divider/edit.tsx b/mailpoet/assets/js/src/form_editor/blocks/divider/edit.tsx
index a5ae585d54..d0b969c631 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/divider/edit.tsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/divider/edit.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 import MailPoet from 'mailpoet';
 import { InspectorControls } from '@wordpress/block-editor';
diff --git a/mailpoet/assets/js/src/form_editor/blocks/divider/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/divider/icon.jsx
index 9f0898690a..48d8741ace 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/divider/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/divider/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Path, SVG } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/email/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/email/edit.jsx
index d9fe43d0ad..4e66499d27 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/email/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/email/edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/email/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/email/icon.jsx
index fa5f2fda77..8413ab58eb 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/email/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/email/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { G, Path, SVG } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/first_name/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/first_name/edit.jsx
index af4b6964a5..d5d8b0fb8d 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/first_name/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/first_name/edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/first_name/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/first_name/icon.jsx
index 0382726f67..8f9a097c6f 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/first_name/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/first_name/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { G, Path, SVG } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/html/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/html/edit.jsx
index 43ebb496d9..c2040757c8 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/html/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/html/edit.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback } from 'react';
+import { useState, useCallback } from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/html/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/html/icon.jsx
index dc5fe381ec..84cecde744 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/html/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/html/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SVG, Path } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/input_styles_settings.jsx b/mailpoet/assets/js/src/form_editor/blocks/input_styles_settings.jsx
index 74be50755e..9738ae4474 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/input_styles_settings.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/input_styles_settings.jsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
 import MailPoet from 'mailpoet';
 import {
   Button,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/last_name/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/last_name/edit.jsx
index 658c272fe9..87911cd7fc 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/last_name/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/last_name/edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/last_name/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/last_name/icon.jsx
index 0382726f67..8f9a097c6f 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/last_name/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/last_name/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { G, Path, SVG } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/paragraph_edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/paragraph_edit.jsx
index e7602fa2b4..6160c9b7e7 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/paragraph_edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/paragraph_edit.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
diff --git a/mailpoet/assets/js/src/form_editor/blocks/segment_select/edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/segment_select/edit.jsx
index f92b87024a..fe5251388e 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/segment_select/edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/segment_select/edit.jsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import { useSelect } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/form_editor/blocks/segment_select/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/segment_select/icon.jsx
index a1d989f275..f49b8d1d94 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/segment_select/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/segment_select/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { G, Path, SVG } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/segment_select/settings.jsx b/mailpoet/assets/js/src/form_editor/blocks/segment_select/settings.jsx
index c136e8df9b..7413030f4a 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/segment_select/settings.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/segment_select/settings.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 import { InspectorControls } from '@wordpress/block-editor';
diff --git a/mailpoet/assets/js/src/form_editor/blocks/segment_select/settings_preview.jsx b/mailpoet/assets/js/src/form_editor/blocks/segment_select/settings_preview.jsx
index 50bf8d3d82..f86c4924f0 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/segment_select/settings_preview.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/segment_select/settings_preview.jsx
@@ -1,7 +1,4 @@
-import React, {
-  useState,
-  useEffect,
-} from 'react';
+import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { CheckboxControl, Dashicon } from '@wordpress/components';
 import { partial } from 'lodash';
diff --git a/mailpoet/assets/js/src/form_editor/blocks/submit/edit.tsx b/mailpoet/assets/js/src/form_editor/blocks/submit/edit.tsx
index 884a47b153..b3a42d796e 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/submit/edit.tsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/submit/edit.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/submit/icon.jsx b/mailpoet/assets/js/src/form_editor/blocks/submit/icon.jsx
index 0382726f67..8f9a097c6f 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/submit/icon.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/submit/icon.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { G, Path, SVG } from '@wordpress/components';
 
 export default (
diff --git a/mailpoet/assets/js/src/form_editor/blocks/submit/styles_settings.tsx b/mailpoet/assets/js/src/form_editor/blocks/submit/styles_settings.tsx
index a70a3f25f3..adc1c2bc86 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/submit/styles_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/submit/styles_settings.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
 import MailPoet from 'mailpoet';
 import {
   Panel,
diff --git a/mailpoet/assets/js/src/form_editor/blocks/text_input_edit.jsx b/mailpoet/assets/js/src/form_editor/blocks/text_input_edit.jsx
index 7873f78dc9..8fe477d312 100644
--- a/mailpoet/assets/js/src/form_editor/blocks/text_input_edit.jsx
+++ b/mailpoet/assets/js/src/form_editor/blocks/text_input_edit.jsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useSelect } from '@wordpress/data';
 import ParagraphEdit from './paragraph_edit.jsx';
diff --git a/mailpoet/assets/js/src/form_editor/components/_stories/size_settings.tsx b/mailpoet/assets/js/src/form_editor/components/_stories/size_settings.tsx
index 269bedc469..19602b14a7 100644
--- a/mailpoet/assets/js/src/form_editor/components/_stories/size_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/_stories/size_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import { SizeSettings } from '../size_settings';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/close_button_settings.tsx b/mailpoet/assets/js/src/form_editor/components/close_button_settings.tsx
index a480249e43..7af0bd0613 100644
--- a/mailpoet/assets/js/src/form_editor/components/close_button_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/close_button_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useSelect } from '@wordpress/data';
 import { BaseControl } from '@wordpress/components';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/color_gradient_settings.tsx b/mailpoet/assets/js/src/form_editor/components/color_gradient_settings.tsx
index fe0c0ea7d9..36674f7bdd 100644
--- a/mailpoet/assets/js/src/form_editor/components/color_gradient_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/color_gradient_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ColorGradientControl from '@wordpress/block-editor/build-module/components/colors-gradients/control';
 import { useSetting } from '@wordpress/block-editor';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/color_settings.tsx b/mailpoet/assets/js/src/form_editor/components/color_settings.tsx
index 9c53fcfdfa..604e9f8a5b 100644
--- a/mailpoet/assets/js/src/form_editor/components/color_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/color_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   ColorPalette,
   BaseControl,
diff --git a/mailpoet/assets/js/src/form_editor/components/editor.jsx b/mailpoet/assets/js/src/form_editor/components/editor.jsx
index ea50cbe6fd..0ace822d77 100644
--- a/mailpoet/assets/js/src/form_editor/components/editor.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/editor.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import '@wordpress/core-data';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
diff --git a/mailpoet/assets/js/src/form_editor/components/feature_toggle.tsx b/mailpoet/assets/js/src/form_editor/components/feature_toggle.tsx
index 145a21a0c5..86636d6326 100644
--- a/mailpoet/assets/js/src/form_editor/components/feature_toggle.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/feature_toggle.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuItem } from '@wordpress/components';
 
 import { check } from '@wordpress/icons';
diff --git a/mailpoet/assets/js/src/form_editor/components/font_family_settings.tsx b/mailpoet/assets/js/src/form_editor/components/font_family_settings.tsx
index bff919476b..ca664da947 100644
--- a/mailpoet/assets/js/src/form_editor/components/font_family_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/font_family_settings.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import {
   CustomSelectControl,
 } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/components/font_size_settings.tsx b/mailpoet/assets/js/src/form_editor/components/font_size_settings.tsx
index a6d22e2c9d..9e124b23d5 100644
--- a/mailpoet/assets/js/src/form_editor/components/font_size_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/font_size_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   FontSizePicker,
 } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/_stories/selection_item.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/_stories/selection_item.tsx
index 3cf4920e51..429619c868 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/_stories/selection_item.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/_stories/selection_item.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import SelectionItem from '../selection_item';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx b/mailpoet/assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx
index 09c000bfc5..66659a4fb9 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx
@@ -8,7 +8,6 @@ import {
   SelectControl,
 } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
-import React from 'react';
 import MailPoet from 'mailpoet';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/codemirror_wrap.jsx b/mailpoet/assets/js/src/form_editor/components/form_settings/codemirror_wrap.jsx
index 02d85e349d..40436fde78 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/codemirror_wrap.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/codemirror_wrap.jsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import codemirror from 'codemirror';
 import 'codemirror/mode/css/css'; // Side effect
 import PropTypes from 'prop-types';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/custom_css_panel.jsx b/mailpoet/assets/js/src/form_editor/components/form_settings/custom_css_panel.jsx
index bab812e084..f319155a34 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/custom_css_panel.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/custom_css_panel.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/_stories/form_placement_option.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/_stories/form_placement_option.tsx
index a3a6e2756b..da700f1347 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/_stories/form_placement_option.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/_stories/form_placement_option.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { action } from '_storybook/action';
 import Option from '../form_placement_option';
 import Icon from '../icons/sidebar_icon';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/below_pages.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/below_pages.tsx
index d54bbc97cc..c5f064987a 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/below_pages.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/below_pages.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/fixed_bar.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/fixed_bar.tsx
index d390c0dbbd..3ca11cb117 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/fixed_bar.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/fixed_bar.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/form_placement_option.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/form_placement_option.tsx
index f342053703..6f309eb3da 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/form_placement_option.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/form_placement_option.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import SelectionItem from '../selection_item';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/below_pages_icon.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/below_pages_icon.tsx
index 1a3f1a6df5..ccb30cb683 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/below_pages_icon.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/below_pages_icon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   SVG,
   Path,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/checkbox_icon.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/checkbox_icon.tsx
index e924d53ec8..26b3ede7b1 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/checkbox_icon.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/checkbox_icon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   SVG,
   Path,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/fixed_bar_icon.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/fixed_bar_icon.tsx
index d343b832fc..c427c9456b 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/fixed_bar_icon.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/fixed_bar_icon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   SVG,
   Path,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/popup_icon.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/popup_icon.tsx
index 2c710af5ae..8f7fe9ea7c 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/popup_icon.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/popup_icon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   SVG,
   Path,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/settings_icon.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/settings_icon.tsx
index b53e98975c..ef30a88521 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/settings_icon.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/settings_icon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   SVG,
   Path,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/sidebar_icon.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/sidebar_icon.tsx
index f9ca53aba6..9f8e788c2d 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/sidebar_icon.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/sidebar_icon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   SVG,
   Path,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/slide_in_icon.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/slide_in_icon.tsx
index 00da664014..153d739aae 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/slide_in_icon.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/icons/slide_in_icon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   SVG,
   Path,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/other.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/other.tsx
index 501a1abe7f..f99602d388 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/other.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/other.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useDispatch } from '@wordpress/data';
 import Icon from './icons/sidebar_icon';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/popup.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/popup.tsx
index 75efb0f143..cf5506175d 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/popup.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/popup.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panel.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panel.tsx
index 35f2000336..60d739fd8d 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panel.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panel.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import BelowPostsSettings from './settings_panels/below_posts_settings';
 import PopUpSettings from './settings_panels/popup_settings';
 import OtherSettings from './settings_panels/other_settings';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/animation_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/animation_settings.tsx
index fde5a6a348..4bca40a89c 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/animation_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/animation_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { assocPath, compose, __ } from 'lodash/fp';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/below_posts_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/below_posts_settings.tsx
index 201bff39c7..797393e913 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/below_posts_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/below_posts_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { ToggleControl } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/cookie_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/cookie_settings.tsx
index c31c635739..056ea83194 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/cookie_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/cookie_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { assocPath, compose, __ } from 'lodash/fp';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/fixed_bar_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/fixed_bar_settings.tsx
index 3cbd259d74..e5b580647a 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/fixed_bar_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/fixed_bar_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { SelectControl, RadioControl, ToggleControl } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/other_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/other_settings.tsx
index 70665b5151..ce95b55c41 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/other_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/other_settings.tsx
@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/placement_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/placement_settings.tsx
index 26e7d0cd9b..6ddab2232f 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/placement_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/placement_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { ToggleControl } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/popup_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/popup_settings.tsx
index a341e78081..ab46224a4b 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/popup_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/popup_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { SelectControl, ToggleControl } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/slide_in_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/slide_in_settings.tsx
index 39ec693f36..838720225f 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/slide_in_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/settings_panels/slide_in_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { SelectControl, RadioControl, ToggleControl } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/slide_in.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/slide_in.tsx
index 86db0ef1b1..48cfc6f5de 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/slide_in.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_options/slide_in.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_panel.jsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_panel.jsx
index 4e8debab67..9d6f2b4820 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_panel.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_placement_panel.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/form_settings.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/form_settings.tsx
index f45a2a314b..e9e4a02592 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/form_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/form_settings.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { useDispatch, useSelect } from '@wordpress/data';
 import { partial } from 'lodash';
 import BasicSettingsPanel from './basic_settings_panel';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/selection.jsx b/mailpoet/assets/js/src/form_editor/components/form_settings/selection.jsx
index 8bde21cac1..9a7b900304 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/selection.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/selection.jsx
@@ -1,14 +1,14 @@
-import React from 'react';
+import { createRef, Component } from 'react';
 import jQuery from 'jquery';
 import _ from 'underscore';
 import 'react-dom';
 import 'select2';
 import PropTypes from 'prop-types';
 
-class Selection extends React.Component {
+class Selection extends Component {
   constructor(props) {
     super(props);
-    this.selectRef = React.createRef();
+    this.selectRef = createRef();
   }
 
   componentDidMount() {
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/selection_item.tsx b/mailpoet/assets/js/src/form_editor/components/form_settings/selection_item.tsx
index f075ec922a..2a315569c8 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/selection_item.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/selection_item.tsx
@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
+import * as React from 'react';
 import classnames from 'classnames';
 
 import SettingsIcon from './form_placement_options/icons/settings_icon';
diff --git a/mailpoet/assets/js/src/form_editor/components/form_settings/styles_settings_panel.jsx b/mailpoet/assets/js/src/form_editor/components/form_settings/styles_settings_panel.jsx
index 77ced9bf71..2bc953f4f3 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_settings/styles_settings_panel.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_settings/styles_settings_panel.jsx
@@ -1,4 +1,4 @@
-import React, { useRef, useEffect } from 'react';
+import { useRef, useEffect } from 'react';
 import {
   Panel,
   PanelBody,
diff --git a/mailpoet/assets/js/src/form_editor/components/form_styling_background.jsx b/mailpoet/assets/js/src/form_editor/components/form_styling_background.jsx
index f247751660..be9e29c670 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_styling_background.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_styling_background.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelect } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/form_title.jsx b/mailpoet/assets/js/src/form_editor/components/form_title.jsx
index c1fd30a8aa..21749543bb 100644
--- a/mailpoet/assets/js/src/form_editor/components/form_title.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/form_title.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { useDispatch, useSelect } from '@wordpress/data';
 import classnames from 'classnames';
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/form_editor/components/header.jsx b/mailpoet/assets/js/src/form_editor/components/header.jsx
index e21c9a230b..8def1c7640 100644
--- a/mailpoet/assets/js/src/form_editor/components/header.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/header.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   MenuGroup,
diff --git a/mailpoet/assets/js/src/form_editor/components/history_redo.tsx b/mailpoet/assets/js/src/form_editor/components/history_redo.tsx
index 29a3b2eea8..50b314a0c2 100644
--- a/mailpoet/assets/js/src/form_editor/components/history_redo.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/history_redo.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/form_editor/components/history_undo.tsx b/mailpoet/assets/js/src/form_editor/components/history_undo.tsx
index 5742bd4286..95405f7dd4 100644
--- a/mailpoet/assets/js/src/form_editor/components/history_undo.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/history_undo.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/form_editor/components/image_settings.tsx b/mailpoet/assets/js/src/form_editor/components/image_settings.tsx
index 3773fc7372..54d0eb1774 100644
--- a/mailpoet/assets/js/src/form_editor/components/image_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/image_settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MediaUpload } from '@wordpress/block-editor';
 import MailPoet from 'mailpoet';
 import { Button, BaseControl, SelectControl } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/components/inserter.tsx b/mailpoet/assets/js/src/form_editor/components/inserter.tsx
index 59623a6069..b09ea54c47 100644
--- a/mailpoet/assets/js/src/form_editor/components/inserter.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/inserter.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useSelect } from '@wordpress/data';
 import { close } from '@wordpress/icons';
 import {
diff --git a/mailpoet/assets/js/src/form_editor/components/notices.jsx b/mailpoet/assets/js/src/form_editor/components/notices.jsx
index 1069a68c11..651cd94ce6 100644
--- a/mailpoet/assets/js/src/form_editor/components/notices.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/notices.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { memoize } from 'lodash';
 import { NoticeList } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/form_editor/components/preview/preview.tsx b/mailpoet/assets/js/src/form_editor/components/preview/preview.tsx
index e61bdb1549..91dfe5242c 100644
--- a/mailpoet/assets/js/src/form_editor/components/preview/preview.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/preview/preview.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
   useCallback,
   useEffect,
   useState,
diff --git a/mailpoet/assets/js/src/form_editor/components/sidebar/block_settings.jsx b/mailpoet/assets/js/src/form_editor/components/sidebar/block_settings.jsx
index 174e53f025..bb19b789f2 100644
--- a/mailpoet/assets/js/src/form_editor/components/sidebar/block_settings.jsx
+++ b/mailpoet/assets/js/src/form_editor/components/sidebar/block_settings.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Panel,
 } from '@wordpress/components';
diff --git a/mailpoet/assets/js/src/form_editor/components/sidebar/default_sidebar.tsx b/mailpoet/assets/js/src/form_editor/components/sidebar/default_sidebar.tsx
index e7cfdfdea6..c63ae0957c 100644
--- a/mailpoet/assets/js/src/form_editor/components/sidebar/default_sidebar.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/sidebar/default_sidebar.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import classnames from 'classnames';
diff --git a/mailpoet/assets/js/src/form_editor/components/sidebar/placement_settings_sidebar.tsx b/mailpoet/assets/js/src/form_editor/components/sidebar/placement_settings_sidebar.tsx
index e088c9e85c..b030d2f661 100644
--- a/mailpoet/assets/js/src/form_editor/components/sidebar/placement_settings_sidebar.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/sidebar/placement_settings_sidebar.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useSelect } from '@wordpress/data';
 import { Panel, PanelBody } from '@wordpress/components';
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/form_editor/components/sidebar/sidebar.tsx b/mailpoet/assets/js/src/form_editor/components/sidebar/sidebar.tsx
index e8247e1495..e9e3f9207f 100644
--- a/mailpoet/assets/js/src/form_editor/components/sidebar/sidebar.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/sidebar/sidebar.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useDispatch, useSelect } from '@wordpress/data';
 import DefaultSidebar from './default_sidebar';
 import PlacementSettingsSidebar from './placement_settings_sidebar';
diff --git a/mailpoet/assets/js/src/form_editor/components/sidebar/sidebar_header.tsx b/mailpoet/assets/js/src/form_editor/components/sidebar/sidebar_header.tsx
index 8e21d07da4..5996c145e8 100644
--- a/mailpoet/assets/js/src/form_editor/components/sidebar/sidebar_header.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/sidebar/sidebar_header.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import { Button } from '@wordpress/components';
 
diff --git a/mailpoet/assets/js/src/form_editor/components/size_settings.tsx b/mailpoet/assets/js/src/form_editor/components/size_settings.tsx
index c2a1bd1f5a..6421ae5278 100644
--- a/mailpoet/assets/js/src/form_editor/components/size_settings.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/size_settings.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { RangeControl, RadioControl, BaseControl } from '@wordpress/components';
 
 export type SizeDefinition = {
diff --git a/mailpoet/assets/js/src/form_editor/components/tutorial.tsx b/mailpoet/assets/js/src/form_editor/components/tutorial.tsx
index f7ad6c2897..a3ff4529f9 100644
--- a/mailpoet/assets/js/src/form_editor/components/tutorial.tsx
+++ b/mailpoet/assets/js/src/form_editor/components/tutorial.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 import Modal from 'common/modal/modal';
diff --git a/mailpoet/assets/js/src/form_editor/form_editor.jsx b/mailpoet/assets/js/src/form_editor/form_editor.jsx
index eca07302ec..eb833e4f11 100644
--- a/mailpoet/assets/js/src/form_editor/form_editor.jsx
+++ b/mailpoet/assets/js/src/form_editor/form_editor.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { StrictMode } from 'react';
 import ReactDOM from 'react-dom';
 import apiFetch from '@wordpress/api-fetch';
 import { GlobalContext, useGlobalContextValue } from 'context/index.jsx';
@@ -34,9 +34,9 @@ window.addEventListener('DOMContentLoaded', () => {
     initRichText();
     initTranslations(window.mailpoet_translations);
     ReactDOM.render(
-      <React.StrictMode>
+      <StrictMode>
         <App />
-      </React.StrictMode>,
+      </StrictMode>,
       appElement
     );
   }
diff --git a/mailpoet/assets/js/src/form_editor/hooks.tsx b/mailpoet/assets/js/src/form_editor/hooks.tsx
index 5c821dbff9..0e54fb702c 100644
--- a/mailpoet/assets/js/src/form_editor/hooks.tsx
+++ b/mailpoet/assets/js/src/form_editor/hooks.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 // Hook for displaying warning when a block is inserted multiple times
 import '@wordpress/edit-post/build-module/hooks/validate-multiple-use/index.js';
 
diff --git a/mailpoet/assets/js/src/form_editor/rich_text/font_selection_format.tsx b/mailpoet/assets/js/src/form_editor/rich_text/font_selection_format.tsx
index 1ade6e516f..55178e565e 100644
--- a/mailpoet/assets/js/src/form_editor/rich_text/font_selection_format.tsx
+++ b/mailpoet/assets/js/src/form_editor/rich_text/font_selection_format.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { applyFormat } from '@wordpress/rich-text';
 import MailPoet from 'mailpoet';
 import { BlockFormatControls } from '@wordpress/block-editor';
diff --git a/mailpoet/assets/js/src/form_editor/template_selection.tsx b/mailpoet/assets/js/src/form_editor/template_selection.tsx
index 90400f45d4..4fa76b7554 100644
--- a/mailpoet/assets/js/src/form_editor/template_selection.tsx
+++ b/mailpoet/assets/js/src/form_editor/template_selection.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { StrictMode } from 'react';
 import ReactDOM from 'react-dom';
 import { GlobalContext, useGlobalContextValue } from 'context/index.jsx';
 import Notices from 'notices/notices.jsx';
@@ -20,9 +20,9 @@ const appElement = document.querySelector('#mailpoet_form_edit_templates');
 if (appElement) {
   initStore();
   ReactDOM.render(
-    <React.StrictMode>
+    <StrictMode>
       <App />
-    </React.StrictMode>,
+    </StrictMode>,
     appElement
   );
 }
diff --git a/mailpoet/assets/js/src/form_editor/templates/selection.tsx b/mailpoet/assets/js/src/form_editor/templates/selection.tsx
index 50ea78e907..49ea7629ee 100644
--- a/mailpoet/assets/js/src/form_editor/templates/selection.tsx
+++ b/mailpoet/assets/js/src/form_editor/templates/selection.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 import Categories from 'common/categories/categories';
diff --git a/mailpoet/assets/js/src/forms/forms.jsx b/mailpoet/assets/js/src/forms/forms.jsx
index 86272d107b..3d0ffb89ac 100644
--- a/mailpoet/assets/js/src/forms/forms.jsx
+++ b/mailpoet/assets/js/src/forms/forms.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, HashRouter } from 'react-router-dom';
 import { GlobalContext, useGlobalContextValue } from 'context/index.jsx';
diff --git a/mailpoet/assets/js/src/forms/heading.jsx b/mailpoet/assets/js/src/forms/heading.jsx
index 7a7dea668f..1cc97c879f 100644
--- a/mailpoet/assets/js/src/forms/heading.jsx
+++ b/mailpoet/assets/js/src/forms/heading.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import MailPoet from 'mailpoet';
 import { TopBarWithBeamer } from 'common/top_bar/top_bar';
 import Button from 'common/button/button';
diff --git a/mailpoet/assets/js/src/forms/list.jsx b/mailpoet/assets/js/src/forms/list.jsx
index 89b5f8f40b..9e8ffafea3 100644
--- a/mailpoet/assets/js/src/forms/list.jsx
+++ b/mailpoet/assets/js/src/forms/list.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import classNames from 'classnames';
 import MailPoet from 'mailpoet';
 import jQuery from 'jquery';
@@ -165,7 +165,7 @@ const itemActions = [
   },
 ];
 
-class FormList extends React.Component {
+class FormList extends Component {
   updateStatus = (checked, e) => {
     // make the event persist so that we can still override the selected value
     // in the ajax callback
diff --git a/mailpoet/assets/js/src/help-tooltip.js b/mailpoet/assets/js/src/help-tooltip.js
index 76fd657943..5f6f593d32 100644
--- a/mailpoet/assets/js/src/help-tooltip.js
+++ b/mailpoet/assets/js/src/help-tooltip.js
@@ -1,10 +1,10 @@
 import TooltipComponent from 'help-tooltip.jsx';
-import React from 'react';
+import { createElement } from 'react';
 import ReactDOM from 'react-dom';
 
 export const MailPoetHelpTooltip = {
   show: function show(domContainerNode, opts) {
-    ReactDOM.render(React.createElement(TooltipComponent, {
+    ReactDOM.render(createElement(TooltipComponent, {
       tooltip: opts.tooltip,
       tooltipId: opts.tooltipId,
       place: opts.place,
diff --git a/mailpoet/assets/js/src/help-tooltip.jsx b/mailpoet/assets/js/src/help-tooltip.jsx
index 8ca2955da7..1a5c828789 100644
--- a/mailpoet/assets/js/src/help-tooltip.jsx
+++ b/mailpoet/assets/js/src/help-tooltip.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import ReactTooltip from 'react-tooltip';
 import ReactHtmlParser from 'react-html-parser';
 
diff --git a/mailpoet/assets/js/src/help/cron_status.jsx b/mailpoet/assets/js/src/help/cron_status.jsx
index 614ebe1a4a..6682d6e483 100644
--- a/mailpoet/assets/js/src/help/cron_status.jsx
+++ b/mailpoet/assets/js/src/help/cron_status.jsx
@@ -1,6 +1,5 @@
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
-import React from 'react';
 import KeyValueTable from 'common/key_value_table.jsx';
 import PrintBoolean from 'common/print_boolean.jsx';
 
diff --git a/mailpoet/assets/js/src/help/help.jsx b/mailpoet/assets/js/src/help/help.jsx
index a79fd72c43..5d551bb24a 100644
--- a/mailpoet/assets/js/src/help/help.jsx
+++ b/mailpoet/assets/js/src/help/help.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import MailPoet from 'mailpoet';
 import KnowledgeBase from 'help/knowledge_base.jsx';
diff --git a/mailpoet/assets/js/src/help/knowledge_base.jsx b/mailpoet/assets/js/src/help/knowledge_base.jsx
index f9e46110a0..c692945605 100644
--- a/mailpoet/assets/js/src/help/knowledge_base.jsx
+++ b/mailpoet/assets/js/src/help/knowledge_base.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
 
diff --git a/mailpoet/assets/js/src/help/queue_status.jsx b/mailpoet/assets/js/src/help/queue_status.jsx
index 8695510e8b..1c50ab7050 100644
--- a/mailpoet/assets/js/src/help/queue_status.jsx
+++ b/mailpoet/assets/js/src/help/queue_status.jsx
@@ -1,6 +1,5 @@
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
-import React from 'react';
 import KeyValueTable from 'common/key_value_table.jsx';
 import TasksList from './tasks_list/tasks_list.jsx';
 import TasksListDataRow from './tasks_list/tasks_list_data_row.jsx';
diff --git a/mailpoet/assets/js/src/help/system_info.jsx b/mailpoet/assets/js/src/help/system_info.jsx
index 7ea85b3919..7d7e988ad4 100644
--- a/mailpoet/assets/js/src/help/system_info.jsx
+++ b/mailpoet/assets/js/src/help/system_info.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import _ from 'underscore';
 
diff --git a/mailpoet/assets/js/src/help/system_status.jsx b/mailpoet/assets/js/src/help/system_status.jsx
index edf553b2ef..a1447229e9 100644
--- a/mailpoet/assets/js/src/help/system_status.jsx
+++ b/mailpoet/assets/js/src/help/system_status.jsx
@@ -1,5 +1,4 @@
 import MailPoet from 'mailpoet';
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 import CronStatus from './cron_status.jsx';
 import QueueStatus from './queue_status.jsx';
diff --git a/mailpoet/assets/js/src/help/tasks_list/tasks_list.jsx b/mailpoet/assets/js/src/help/tasks_list/tasks_list.jsx
index 56dc7b85c2..53a9cb48b9 100644
--- a/mailpoet/assets/js/src/help/tasks_list/tasks_list.jsx
+++ b/mailpoet/assets/js/src/help/tasks_list/tasks_list.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import MailPoet from 'mailpoet';
 import TaskListDataRow from './tasks_list_data_row.jsx';
 import TaskListLabelsRow from './tasks_list_labels_row.jsx';
diff --git a/mailpoet/assets/js/src/help/tasks_list/tasks_list_data_row.jsx b/mailpoet/assets/js/src/help/tasks_list/tasks_list_data_row.jsx
index 54eec3e9e6..f11b9fbacf 100644
--- a/mailpoet/assets/js/src/help/tasks_list/tasks_list_data_row.jsx
+++ b/mailpoet/assets/js/src/help/tasks_list/tasks_list_data_row.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import MailPoet from 'mailpoet';
 import parseDate from 'date-fns/parse';
 
diff --git a/mailpoet/assets/js/src/help/tasks_list/tasks_list_labels_row.jsx b/mailpoet/assets/js/src/help/tasks_list/tasks_list_labels_row.jsx
index 8756576363..9592b7497a 100644
--- a/mailpoet/assets/js/src/help/tasks_list/tasks_list_labels_row.jsx
+++ b/mailpoet/assets/js/src/help/tasks_list/tasks_list_labels_row.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import MailPoet from 'mailpoet';
 
 function TasksListLabelsRow(props) {
diff --git a/mailpoet/assets/js/src/help/your_privacy.jsx b/mailpoet/assets/js/src/help/your_privacy.jsx
index ac758e09ed..4a9859eddd 100644
--- a/mailpoet/assets/js/src/help/your_privacy.jsx
+++ b/mailpoet/assets/js/src/help/your_privacy.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
 
diff --git a/mailpoet/assets/js/src/listing/assets/search_icon.tsx b/mailpoet/assets/js/src/listing/assets/search_icon.tsx
index 6877b67def..f3e8ef4d09 100644
--- a/mailpoet/assets/js/src/listing/assets/search_icon.tsx
+++ b/mailpoet/assets/js/src/listing/assets/search_icon.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default (
   <svg viewBox="3 3 18 18">
     <path d="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
diff --git a/mailpoet/assets/js/src/listing/bulk_actions.jsx b/mailpoet/assets/js/src/listing/bulk_actions.jsx
index 41e5d09660..94e38ea1cd 100644
--- a/mailpoet/assets/js/src/listing/bulk_actions.jsx
+++ b/mailpoet/assets/js/src/listing/bulk_actions.jsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 
-class ListingBulkActions extends React.Component {
+class ListingBulkActions extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/listing/filters.jsx b/mailpoet/assets/js/src/listing/filters.jsx
index 684dc962f3..2945f71454 100644
--- a/mailpoet/assets/js/src/listing/filters.jsx
+++ b/mailpoet/assets/js/src/listing/filters.jsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Component } from 'react';
 import jQuery from 'jquery';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 import Button from 'common/button/button.tsx';
 import Select from 'common/form/select/select.tsx';
 
-class ListingFilters extends React.Component {
+class ListingFilters extends Component {
   componentDidUpdate() {
     const selectedFilters = this.props.filter;
     this.getAvailableFilters().forEach(
diff --git a/mailpoet/assets/js/src/listing/header.jsx b/mailpoet/assets/js/src/listing/header.jsx
index 0962a983d3..633f41df81 100644
--- a/mailpoet/assets/js/src/listing/header.jsx
+++ b/mailpoet/assets/js/src/listing/header.jsx
@@ -1,10 +1,10 @@
 import MailPoet from 'mailpoet';
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import Checkbox from 'common/form/checkbox/checkbox.tsx';
 import ListingColumn from './listing_column.jsx';
 
-class ListingHeader extends React.Component {
+class ListingHeader extends Component {
   constructor(props) {
     super(props);
     this.handleSelectItems = this.handleSelectItems.bind(this);
diff --git a/mailpoet/assets/js/src/listing/listing.jsx b/mailpoet/assets/js/src/listing/listing.jsx
index 532ee70024..c63959e345 100644
--- a/mailpoet/assets/js/src/listing/listing.jsx
+++ b/mailpoet/assets/js/src/listing/listing.jsx
@@ -1,5 +1,5 @@
 import jQuery from 'jquery';
-import React from 'react';
+import { Component } from 'react';
 import _ from 'underscore';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
@@ -14,7 +14,7 @@ import MailerError from 'listing/notices.jsx';
 import { withRouter } from 'react-router-dom';
 import { GlobalContext } from 'context/index.jsx';
 
-class Listing extends React.Component {
+class Listing extends Component {
   constructor(props) {
     super(props);
     this.state = this.getEmptyState();
diff --git a/mailpoet/assets/js/src/listing/listing_column.jsx b/mailpoet/assets/js/src/listing/listing_column.jsx
index 92b6a391e0..8de6260e0a 100644
--- a/mailpoet/assets/js/src/listing/listing_column.jsx
+++ b/mailpoet/assets/js/src/listing/listing_column.jsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Component } from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
-class ListingColumn extends React.Component {
+class ListingColumn extends Component {
   handleSort = () => {
     const sortBy = this.props.column.name;
     const sortOrder = (this.props.column.sorted === 'asc') ? 'desc' : 'asc';
diff --git a/mailpoet/assets/js/src/listing/listing_item.jsx b/mailpoet/assets/js/src/listing/listing_item.jsx
index 34edc11033..3447828987 100644
--- a/mailpoet/assets/js/src/listing/listing_item.jsx
+++ b/mailpoet/assets/js/src/listing/listing_item.jsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import { Link } from 'react-router-dom';
 import classNames from 'classnames';
 import Checkbox from 'common/form/checkbox/checkbox.tsx';
 
-class ListingItem extends React.Component {
+class ListingItem extends Component {
   handleSelectItem = (e) => {
     this.props.onSelectItem(
       parseInt(e.target.value, 10),
diff --git a/mailpoet/assets/js/src/listing/listing_items.jsx b/mailpoet/assets/js/src/listing/listing_items.jsx
index 63b6bdeb8e..d82e409593 100644
--- a/mailpoet/assets/js/src/listing/listing_items.jsx
+++ b/mailpoet/assets/js/src/listing/listing_items.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import MailPoet from 'mailpoet';
@@ -6,7 +6,7 @@ import ListingBulkActions from 'listing/bulk_actions.jsx';
 import ListingItem from 'listing/listing_item.jsx';
 import { Grid } from 'common/grid';
 
-class ListingItems extends React.Component { // eslint-disable-line react/prefer-stateless-function, max-len
+class ListingItems extends Component { // eslint-disable-line react/prefer-stateless-function, max-len
   render() {
     if (this.props.items.length === 0) {
       let message;
diff --git a/mailpoet/assets/js/src/listing/notices.jsx b/mailpoet/assets/js/src/listing/notices.jsx
index 98a1c54295..1d954f1cbc 100644
--- a/mailpoet/assets/js/src/listing/notices.jsx
+++ b/mailpoet/assets/js/src/listing/notices.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/listing/pages.jsx b/mailpoet/assets/js/src/listing/pages.jsx
index 43d52cb5f6..e6c52dc6cb 100644
--- a/mailpoet/assets/js/src/listing/pages.jsx
+++ b/mailpoet/assets/js/src/listing/pages.jsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Component } from 'react';
 import classNames from 'classnames';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 
-class ListingPages extends React.Component {
+class ListingPages extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/listing/search.jsx b/mailpoet/assets/js/src/listing/search.jsx
index 55e0987e0b..9b3916a074 100644
--- a/mailpoet/assets/js/src/listing/search.jsx
+++ b/mailpoet/assets/js/src/listing/search.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
@@ -23,7 +23,7 @@ import icon from './assets/search_icon.tsx';
  *   setSearch(props.search)
  *  }, [props.search]);
  */
-class ListingSearch extends React.Component {
+class ListingSearch extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/loading.jsx b/mailpoet/assets/js/src/loading.jsx
index dbb00af764..f0b801f087 100644
--- a/mailpoet/assets/js/src/loading.jsx
+++ b/mailpoet/assets/js/src/loading.jsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 function Loading() {
   return (
     <div className="mailpoet_loading">
diff --git a/mailpoet/assets/js/src/logs/list.tsx b/mailpoet/assets/js/src/logs/list.tsx
index 876757c0a1..15c2890071 100644
--- a/mailpoet/assets/js/src/logs/list.tsx
+++ b/mailpoet/assets/js/src/logs/list.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
 import MailPoet from 'mailpoet';
 import { curry } from 'lodash';
 import { parseISO } from 'date-fns';
diff --git a/mailpoet/assets/js/src/logs/logs.tsx b/mailpoet/assets/js/src/logs/logs.tsx
index 2384bd8254..e473b0c21c 100644
--- a/mailpoet/assets/js/src/logs/logs.tsx
+++ b/mailpoet/assets/js/src/logs/logs.tsx
@@ -1,5 +1,4 @@
 import ReactDOM from 'react-dom';
-import React from 'react';
 
 import { List, Logs, FilterType } from './list';
 
diff --git a/mailpoet/assets/js/src/newsletter_editor/initializer.jsx b/mailpoet/assets/js/src/newsletter_editor/initializer.jsx
index a2df8f1980..c1970738a9 100644
--- a/mailpoet/assets/js/src/newsletter_editor/initializer.jsx
+++ b/mailpoet/assets/js/src/newsletter_editor/initializer.jsx
@@ -1,6 +1,5 @@
 import Hooks from 'wp-js-hooks';
 import MailPoet from 'mailpoet';
-import React from 'react';
 import ReactDOM from 'react-dom';
 import ListingHeadingSteps from 'newsletters/listings/heading_steps';
 import { newsletterTypesWithActivation } from 'newsletters/listings/utils';
diff --git a/mailpoet/assets/js/src/newsletters/automatic_emails/events/event_options.tsx b/mailpoet/assets/js/src/newsletters/automatic_emails/events/event_options.tsx
index f806cf1797..910653a9f4 100644
--- a/mailpoet/assets/js/src/newsletters/automatic_emails/events/event_options.tsx
+++ b/mailpoet/assets/js/src/newsletters/automatic_emails/events/event_options.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Selection from 'form/fields/selection.jsx';
 import _ from 'underscore';
 
diff --git a/mailpoet/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx b/mailpoet/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx
index 1f8b189ee2..f0c9709daa 100644
--- a/mailpoet/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx
+++ b/mailpoet/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import Selection from 'form/fields/selection.jsx';
 import Text from 'form/fields/text.jsx';
@@ -11,7 +11,7 @@ const defaultAfterTimeNumber = 1;
 const defaultAfterTimeNumberForMinutes = 30;
 const defaultAfterTimeNumberInputFieldSize = 3;
 
-class EventScheduling extends React.Component {
+class EventScheduling extends Component {
   constructor(props) {
     super(props);
     const { item, event } = this.props;
diff --git a/mailpoet/assets/js/src/newsletters/automatic_emails/events_conditions.jsx b/mailpoet/assets/js/src/newsletters/automatic_emails/events_conditions.jsx
index 9063e56936..c30fc63e53 100644
--- a/mailpoet/assets/js/src/newsletters/automatic_emails/events_conditions.jsx
+++ b/mailpoet/assets/js/src/newsletters/automatic_emails/events_conditions.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import Background from 'common/background/background';
 import Button from 'common/button/button';
 import Heading from 'common/typography/heading/heading';
@@ -16,7 +16,7 @@ import jQuery from 'jquery';
 const defaultAfterTimeType = 'immediate';
 const defaultAfterTimeNumber = 1;
 
-class EventsConditions extends React.Component {
+class EventsConditions extends Component {
   static getEventOptions(event) {
     return event.options || null;
   }
diff --git a/mailpoet/assets/js/src/newsletters/automatic_emails/listings.jsx b/mailpoet/assets/js/src/newsletters/automatic_emails/listings.jsx
index 69e16e6af1..96d45afc45 100644
--- a/mailpoet/assets/js/src/newsletters/automatic_emails/listings.jsx
+++ b/mailpoet/assets/js/src/newsletters/automatic_emails/listings.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import ReactStringReplace from 'react-string-replace';
 
 import Listing from 'listing/listing.jsx';
@@ -148,7 +148,7 @@ let newsletterActions = [
 
 newsletterActions = addStatsCTAAction(newsletterActions);
 
-class Listings extends React.Component {
+class Listings extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/automatic_emails/send_event_conditions.jsx b/mailpoet/assets/js/src/newsletters/automatic_emails/send_event_conditions.jsx
index 075c97131a..666b2cb5f4 100644
--- a/mailpoet/assets/js/src/newsletters/automatic_emails/send_event_conditions.jsx
+++ b/mailpoet/assets/js/src/newsletters/automatic_emails/send_event_conditions.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import Heading from 'common/typography/heading/heading';
 import Selection from 'form/fields/selection.jsx';
 import EventScheduling from 'newsletters/automatic_emails/events/event_scheduling.jsx';
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 const defaultAfterTimeType = 'immediate';
 const defaultAfterTimeNumber = 1;
 
-class SendEventConditions extends React.Component {
+class SendEventConditions extends Component {
   constructor(props) {
     super(props);
     const { field } = props;
diff --git a/mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_general_stats.tsx b/mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_general_stats.tsx
index 00f32a6f98..2e37ad9ffe 100644
--- a/mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_general_stats.tsx
+++ b/mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_general_stats.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 import MailPoet from 'mailpoet';
 import Hooks from 'wp-js-hooks';
diff --git a/mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_stats_info.tsx b/mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_stats_info.tsx
index d69a8b760e..fa2120a8b6 100644
--- a/mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_stats_info.tsx
+++ b/mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_stats_info.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Heading from 'common/typography/heading/heading';
 import { Grid } from 'common/grid';
diff --git a/mailpoet/assets/js/src/newsletters/campaign_stats/page.tsx b/mailpoet/assets/js/src/newsletters/campaign_stats/page.tsx
index 909247bbd9..e75739daf5 100644
--- a/mailpoet/assets/js/src/newsletters/campaign_stats/page.tsx
+++ b/mailpoet/assets/js/src/newsletters/campaign_stats/page.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import Hooks from 'wp-js-hooks';
 import MailPoet from 'mailpoet';
 import { withRouter } from 'react-router-dom';
diff --git a/mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx b/mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx
index af8f6ee69f..786250fa6f 100644
--- a/mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx
+++ b/mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
 import PremiumRequired from 'common/premium_required/premium_required';
diff --git a/mailpoet/assets/js/src/newsletters/listings/heading.jsx b/mailpoet/assets/js/src/newsletters/listings/heading.jsx
index a208945209..d136e4e80d 100644
--- a/mailpoet/assets/js/src/newsletters/listings/heading.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/heading.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link } from 'react-router-dom';
 import MailPoet from 'mailpoet';
 import { TopBarWithBeamer } from 'common/top_bar/top_bar';
diff --git a/mailpoet/assets/js/src/newsletters/listings/heading_steps.tsx b/mailpoet/assets/js/src/newsletters/listings/heading_steps.tsx
index 55ca5d8e5a..beb0147d5a 100644
--- a/mailpoet/assets/js/src/newsletters/listings/heading_steps.tsx
+++ b/mailpoet/assets/js/src/newsletters/listings/heading_steps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Location } from 'history';
 import MailPoet from 'mailpoet';
 import HideScreenOptions from '../../common/hide_screen_options/hide_screen_options';
diff --git a/mailpoet/assets/js/src/newsletters/listings/heading_steps_route.tsx b/mailpoet/assets/js/src/newsletters/listings/heading_steps_route.tsx
index bb71a155d2..0bef1592a2 100644
--- a/mailpoet/assets/js/src/newsletters/listings/heading_steps_route.tsx
+++ b/mailpoet/assets/js/src/newsletters/listings/heading_steps_route.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import ListingHeadingSteps, { Props } from './heading_steps';
 
diff --git a/mailpoet/assets/js/src/newsletters/listings/notification.jsx b/mailpoet/assets/js/src/newsletters/listings/notification.jsx
index a2ad01250e..62cc6a729b 100644
--- a/mailpoet/assets/js/src/newsletters/listings/notification.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/notification.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { Link, withRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import ReactStringReplace from 'react-string-replace';
@@ -160,7 +160,7 @@ const newsletterActions = [
   },
 ];
 
-class NewsletterListNotification extends React.Component {
+class NewsletterListNotification extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/listings/notification_history.jsx b/mailpoet/assets/js/src/newsletters/listings/notification_history.jsx
index 1fe26d9d10..c1894750e4 100644
--- a/mailpoet/assets/js/src/newsletters/listings/notification_history.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/notification_history.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link, withRouter } from 'react-router-dom';
 import classNames from 'classnames';
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/newsletters/listings/queue_status.jsx b/mailpoet/assets/js/src/newsletters/listings/queue_status.jsx
index 821547212d..f4393c7651 100644
--- a/mailpoet/assets/js/src/newsletters/listings/queue_status.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/queue_status.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
@@ -25,8 +25,8 @@ const NewsletterPropType = PropTypes.shape({
 });
 
 function QueueSending({ newsletter }) {
-  const [paused, setPaused] = React.useState(newsletter.queue.status === 'paused');
-  const [errors, setErrors] = React.useState([]);
+  const [paused, setPaused] = useState(newsletter.queue.status === 'paused');
+  const [errors, setErrors] = useState([]);
 
   const pauseSending = () => {
     setErrors([]);
diff --git a/mailpoet/assets/js/src/newsletters/listings/re_engagement.jsx b/mailpoet/assets/js/src/newsletters/listings/re_engagement.jsx
index 6405de57ef..0b5ae94a8e 100644
--- a/mailpoet/assets/js/src/newsletters/listings/re_engagement.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/re_engagement.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import classNames from 'classnames';
@@ -151,7 +151,7 @@ let newsletterActions = [
 ];
 newsletterActions = addStatsCTAAction(newsletterActions);
 
-class NewsletterListReEngagement extends React.Component {
+class NewsletterListReEngagement extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/listings/standard.jsx b/mailpoet/assets/js/src/newsletters/listings/standard.jsx
index 0a2718882b..90e96cfbfa 100644
--- a/mailpoet/assets/js/src/newsletters/listings/standard.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/standard.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import classNames from 'classnames';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
@@ -171,7 +171,7 @@ let newsletterActions = [
 ];
 newsletterActions = addStatsCTAAction(newsletterActions);
 
-class NewsletterListStandard extends React.Component {
+class NewsletterListStandard extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/listings/statistics.jsx b/mailpoet/assets/js/src/newsletters/listings/statistics.jsx
index 4b1d382f8f..448e7ed71a 100644
--- a/mailpoet/assets/js/src/newsletters/listings/statistics.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/statistics.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import moment from 'moment';
 import MailPoet from 'mailpoet';
 import Hooks from 'wp-js-hooks';
diff --git a/mailpoet/assets/js/src/newsletters/listings/utils.jsx b/mailpoet/assets/js/src/newsletters/listings/utils.jsx
index 19c25e2e07..6b0593adcb 100644
--- a/mailpoet/assets/js/src/newsletters/listings/utils.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/utils.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import { Link } from 'react-router-dom';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/newsletters/listings/welcome.jsx b/mailpoet/assets/js/src/newsletters/listings/welcome.jsx
index 33d610104d..c9ad1cf1ca 100644
--- a/mailpoet/assets/js/src/newsletters/listings/welcome.jsx
+++ b/mailpoet/assets/js/src/newsletters/listings/welcome.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Link, withRouter } from 'react-router-dom';
 import ReactStringReplace from 'react-string-replace';
@@ -155,7 +155,7 @@ let newsletterActions = [
 ];
 newsletterActions = addStatsCTAAction(newsletterActions);
 
-class NewsletterListWelcome extends React.Component {
+class NewsletterListWelcome extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/newsletters.jsx b/mailpoet/assets/js/src/newsletters/newsletters.jsx
index 4f93ae3db8..7954893f4e 100644
--- a/mailpoet/assets/js/src/newsletters/newsletters.jsx
+++ b/mailpoet/assets/js/src/newsletters/newsletters.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import {
   HashRouter, Switch, Route, Redirect, useParams,
diff --git a/mailpoet/assets/js/src/newsletters/send.jsx b/mailpoet/assets/js/src/newsletters/send.jsx
index 04d46d0ebd..9aad0c773a 100644
--- a/mailpoet/assets/js/src/newsletters/send.jsx
+++ b/mailpoet/assets/js/src/newsletters/send.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import _ from 'underscore';
 import ListingHeadingStepsRoute from 'newsletters/listings/heading_steps_route';
@@ -88,7 +88,7 @@ function validateNewsletter(newsletter) {
   return undefined;
 }
 
-class NewsletterSend extends React.Component {
+class NewsletterSend extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/send/congratulate/congratulate.jsx b/mailpoet/assets/js/src/newsletters/send/congratulate/congratulate.jsx
index 00e9c983fe..ce12599eab 100644
--- a/mailpoet/assets/js/src/newsletters/send/congratulate/congratulate.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/congratulate/congratulate.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import moment from 'moment';
@@ -69,7 +69,7 @@ function renderLoading(showRichLoadingScreen) {
   );
 }
 
-class Congratulate extends React.Component {
+class Congratulate extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/send/congratulate/fail.jsx b/mailpoet/assets/js/src/newsletters/send/congratulate/fail.jsx
index 46f9f49181..e2532d6b38 100644
--- a/mailpoet/assets/js/src/newsletters/send/congratulate/fail.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/congratulate/fail.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import PropTypes from 'prop-types';
 import ReactStringReplace from 'react-string-replace';
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/newsletters/send/congratulate/loading.jsx b/mailpoet/assets/js/src/newsletters/send/congratulate/loading.jsx
index e872e1824b..e4cf183ff7 100644
--- a/mailpoet/assets/js/src/newsletters/send/congratulate/loading.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/congratulate/loading.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import Loader from 'common/loader/loader';
diff --git a/mailpoet/assets/js/src/newsletters/send/congratulate/success.jsx b/mailpoet/assets/js/src/newsletters/send/congratulate/success.jsx
index f6684bc569..640c995520 100644
--- a/mailpoet/assets/js/src/newsletters/send/congratulate/success.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/congratulate/success.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 
 import MSSUserSuccess from './success_for_mss_users.jsx';
diff --git a/mailpoet/assets/js/src/newsletters/send/congratulate/success_for_mss_users.jsx b/mailpoet/assets/js/src/newsletters/send/congratulate/success_for_mss_users.jsx
index f809119c46..a442e3e854 100644
--- a/mailpoet/assets/js/src/newsletters/send/congratulate/success_for_mss_users.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/congratulate/success_for_mss_users.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import Heading from 'common/typography/heading/heading';
diff --git a/mailpoet/assets/js/src/newsletters/send/congratulate/success_pitch_mss.tsx b/mailpoet/assets/js/src/newsletters/send/congratulate/success_pitch_mss.tsx
index 4e9603dd1e..b4a8257199 100644
--- a/mailpoet/assets/js/src/newsletters/send/congratulate/success_pitch_mss.tsx
+++ b/mailpoet/assets/js/src/newsletters/send/congratulate/success_pitch_mss.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import MailPoet from 'mailpoet';
 
 import Heading from 'common/typography/heading/heading';
diff --git a/mailpoet/assets/js/src/newsletters/send/date_text.jsx b/mailpoet/assets/js/src/newsletters/send/date_text.jsx
index ee10e1104b..d81ea611d0 100644
--- a/mailpoet/assets/js/src/newsletters/send/date_text.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/date_text.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 import Datepicker from 'common/datepicker/datepicker.tsx';
@@ -82,7 +82,7 @@ locale.options.weekStartsOn = typeof MailPoet.wpWeekStartsOn !== 'undefined'
 
 registerLocale('mailpoet', locale);
 
-class DateText extends React.Component {
+class DateText extends Component {
   onChange = (value, event) => {
     const changeEvent = event;
     // Swap display format to storage format
diff --git a/mailpoet/assets/js/src/newsletters/send/date_time.jsx b/mailpoet/assets/js/src/newsletters/send/date_time.jsx
index 8757fd29d7..25c1a4bfa7 100644
--- a/mailpoet/assets/js/src/newsletters/send/date_time.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/date_time.jsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import { Grid } from 'common/grid';
 import DateText from 'newsletters/send/date_text.jsx';
 import TimeSelect from 'newsletters/send/time_select.jsx';
 
-class DateTime extends React.Component {
+class DateTime extends Component {
   DATE_TIME_SEPARATOR = ' ';
 
   constructor(props) {
diff --git a/mailpoet/assets/js/src/newsletters/send/ga_tracking.tsx b/mailpoet/assets/js/src/newsletters/send/ga_tracking.tsx
index 97c33ccf31..14ccfa5a5a 100644
--- a/mailpoet/assets/js/src/newsletters/send/ga_tracking.tsx
+++ b/mailpoet/assets/js/src/newsletters/send/ga_tracking.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import _ from 'underscore';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/newsletters/send/re_engagement.tsx b/mailpoet/assets/js/src/newsletters/send/re_engagement.tsx
index f151b61741..54de9b8893 100644
--- a/mailpoet/assets/js/src/newsletters/send/re_engagement.tsx
+++ b/mailpoet/assets/js/src/newsletters/send/re_engagement.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { assoc, find, map } from 'lodash/fp';
 
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/newsletters/send/sender_address_field.jsx b/mailpoet/assets/js/src/newsletters/send/sender_address_field.jsx
index a0a60c252b..ff2d9cc6ea 100644
--- a/mailpoet/assets/js/src/newsletters/send/sender_address_field.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/sender_address_field.jsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Component } from 'react';
 import FormFieldText from 'form/fields/text.jsx';
 import PropTypes from 'prop-types';
 import SenderEmailAddressWarning from 'common/sender_email_address_warning.jsx';
 
-class SenderField extends React.Component {
+class SenderField extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/send/standard.tsx b/mailpoet/assets/js/src/newsletters/send/standard.tsx
index aeae68a8d2..2eb6fd59ae 100644
--- a/mailpoet/assets/js/src/newsletters/send/standard.tsx
+++ b/mailpoet/assets/js/src/newsletters/send/standard.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEvent, Component } from 'react';
+import { ChangeEvent, Component } from 'react';
 import MailPoet from 'mailpoet';
 import Hooks from 'wp-js-hooks';
 import Moment from 'moment';
diff --git a/mailpoet/assets/js/src/newsletters/send/time_select.jsx b/mailpoet/assets/js/src/newsletters/send/time_select.jsx
index 4c2db493b7..ea8ece22c6 100644
--- a/mailpoet/assets/js/src/newsletters/send/time_select.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/time_select.jsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import Select from 'common/form/select/select.tsx';
 
-class TimeSelect extends React.Component { // eslint-disable-line react/prefer-stateless-function
+class TimeSelect extends Component { // eslint-disable-line react/prefer-stateless-function
   render() {
     const options = Object.keys(this.props.timeOfDayItems).map(
       (value) => (
diff --git a/mailpoet/assets/js/src/newsletters/sending_status.jsx b/mailpoet/assets/js/src/newsletters/sending_status.jsx
index f0586174d9..d5866e5b62 100644
--- a/mailpoet/assets/js/src/newsletters/sending_status.jsx
+++ b/mailpoet/assets/js/src/newsletters/sending_status.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState, useEffect, memo } from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -27,13 +27,13 @@ const messages = {
 };
 
 function SendingStatus(props) {
-  const [newsletter, setNewsletter] = React.useState({
+  const [newsletter, setNewsletter] = useState({
     id: props.match.params.id,
     subject: '',
     sent: false,
   });
 
-  React.useEffect(() => {
+  useEffect(() => {
     MailPoet.Ajax.post({
       api_version: window.mailpoet_api_version,
       endpoint: 'newsletters',
@@ -82,7 +82,7 @@ const onRenderItem = (item) => (
   </div>
 );
 
-const SendingStatusListing = React.memo(({ location, params }) => (
+const SendingStatusListing = memo(({ location, params }) => (
   <Listing
     limit={window.mailpoet_listing_per_page}
     location={location}
diff --git a/mailpoet/assets/js/src/newsletters/templates.jsx b/mailpoet/assets/js/src/newsletters/templates.jsx
index e8fbe35c39..7e13ff3f6d 100644
--- a/mailpoet/assets/js/src/newsletters/templates.jsx
+++ b/mailpoet/assets/js/src/newsletters/templates.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import ListingHeadingStepsRoute from 'newsletters/listings/heading_steps_route';
 import Loading from 'common/loading.jsx';
@@ -61,7 +61,7 @@ templatesCategories.push(
   ]
 );
 
-class NewsletterTemplates extends React.Component {
+class NewsletterTemplates extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/templates/import_template.jsx b/mailpoet/assets/js/src/newsletters/templates/import_template.jsx
index c40c82b2c8..03e8c75fc4 100644
--- a/mailpoet/assets/js/src/newsletters/templates/import_template.jsx
+++ b/mailpoet/assets/js/src/newsletters/templates/import_template.jsx
@@ -1,14 +1,14 @@
-import React from 'react';
+import { createRef, Component } from 'react';
 import _ from 'underscore';
 import MailPoet from 'mailpoet';
 import HelpTooltip from 'help-tooltip.jsx';
 import PropTypes from 'prop-types';
 import { GlobalContext } from 'context/index.jsx';
 
-class ImportTemplate extends React.Component {
+class ImportTemplate extends Component {
   constructor(props) {
     super(props);
-    this.fileRef = React.createRef();
+    this.fileRef = createRef();
     this.handleSubmit = this.handleSubmit.bind(this);
   }
 
diff --git a/mailpoet/assets/js/src/newsletters/templates/template_box.jsx b/mailpoet/assets/js/src/newsletters/templates/template_box.jsx
index 0f194a6a7e..3992ab7580 100644
--- a/mailpoet/assets/js/src/newsletters/templates/template_box.jsx
+++ b/mailpoet/assets/js/src/newsletters/templates/template_box.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 
@@ -13,7 +13,7 @@ import { GlobalContext } from 'context/index.jsx';
  *   beforeDelete, afterDelete, beforeSelect, afterSelect
  * }
  */
-class TemplateBox extends React.Component {
+class TemplateBox extends Component {
   constructor(props) {
     super(props);
     this.onPreview = this.onPreview.bind(this);
diff --git a/mailpoet/assets/js/src/newsletters/types.tsx b/mailpoet/assets/js/src/newsletters/types.tsx
index 2db88d2fe8..585efebe1d 100644
--- a/mailpoet/assets/js/src/newsletters/types.tsx
+++ b/mailpoet/assets/js/src/newsletters/types.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentType, useState } from 'react';
+import { Fragment, ComponentType, useState } from 'react';
 import MailPoet from 'mailpoet';
 import Hooks from 'wp-js-hooks';
 import _ from 'underscore';
@@ -141,7 +141,7 @@ function NewsletterTypes({
     return _.map(automaticEmails, (automaticEmail) => {
       const email = automaticEmail;
       return (
-        <React.Fragment key={email.slug}>
+        <Fragment key={email.slug}>
           {!filter && (
             <div className="mailpoet-newsletter-types-separator">
               <div className="mailpoet-newsletter-types-separator-line" />
@@ -158,7 +158,7 @@ function NewsletterTypes({
           />
 
           {email.slug === 'woocommerce' && getAdditionalTypes().map((type) => renderType(type), this)}
-        </React.Fragment>
+        </Fragment>
       );
     });
   };
diff --git a/mailpoet/assets/js/src/newsletters/types/automatic_emails/event.jsx b/mailpoet/assets/js/src/newsletters/types/automatic_emails/event.jsx
index 104d8b17a9..c767a5c030 100644
--- a/mailpoet/assets/js/src/newsletters/types/automatic_emails/event.jsx
+++ b/mailpoet/assets/js/src/newsletters/types/automatic_emails/event.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { PureComponent } from 'react';
 import MailPoet from 'mailpoet';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
@@ -6,7 +6,7 @@ import Badge from 'common/badge/badge';
 import Button from 'common/button/button';
 import Heading from 'common/typography/heading/heading';
 
-class AutomaticEmailEvent extends React.PureComponent {
+class AutomaticEmailEvent extends PureComponent {
   render() {
     const event = this.props.event;
     const disabled = event.soon;
diff --git a/mailpoet/assets/js/src/newsletters/types/automatic_emails/event_group_logos.jsx b/mailpoet/assets/js/src/newsletters/types/automatic_emails/event_group_logos.jsx
index fa590cbe14..c763401d07 100644
--- a/mailpoet/assets/js/src/newsletters/types/automatic_emails/event_group_logos.jsx
+++ b/mailpoet/assets/js/src/newsletters/types/automatic_emails/event_group_logos.jsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 const AutomaticEmailEventGroupLogos = {
   woocommerce: (
     <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 120 71" style={{ enableBackground: 'new 0 0 120 71' }}>
diff --git a/mailpoet/assets/js/src/newsletters/types/automatic_emails/events_list.jsx b/mailpoet/assets/js/src/newsletters/types/automatic_emails/events_list.jsx
index 429a096188..10e1920190 100644
--- a/mailpoet/assets/js/src/newsletters/types/automatic_emails/events_list.jsx
+++ b/mailpoet/assets/js/src/newsletters/types/automatic_emails/events_list.jsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Component } from 'react';
 import AutomaticEmailEvent from 'newsletters/types/automatic_emails/event.jsx';
 import MailPoet from 'mailpoet';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router-dom';
 
-class AutomaticEmailEventsList extends React.Component {
+class AutomaticEmailEventsList extends Component {
   constructor(props) {
     super(props);
     this.email = this.props.email;
diff --git a/mailpoet/assets/js/src/newsletters/types/notification/notification.jsx b/mailpoet/assets/js/src/newsletters/types/notification/notification.jsx
index 24f460dfa2..e2da8425c4 100644
--- a/mailpoet/assets/js/src/newsletters/types/notification/notification.jsx
+++ b/mailpoet/assets/js/src/newsletters/types/notification/notification.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import ListingHeadingStepsRoute from 'newsletters/listings/heading_steps_route';
 import _ from 'underscore';
@@ -17,7 +17,7 @@ const field = {
   component: Scheduling,
 };
 
-class NewsletterNotification extends React.Component {
+class NewsletterNotification extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/mailpoet/assets/js/src/newsletters/types/notification/scheduling.jsx b/mailpoet/assets/js/src/newsletters/types/notification/scheduling.jsx
index 5e9649e030..249fd9050c 100644
--- a/mailpoet/assets/js/src/newsletters/types/notification/scheduling.jsx
+++ b/mailpoet/assets/js/src/newsletters/types/notification/scheduling.jsx
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import Select from 'form/fields/select.jsx';
 import {
@@ -35,7 +35,7 @@ const nthWeekDayField = {
   values: nthWeekDayValues,
 };
 
-class NotificationScheduling extends React.Component {
+class NotificationScheduling extends Component {
   getCurrentValue = () => this.props.item[this.props.field.name] || {};
 
   handleValueChanges = (changes) => {
diff --git a/mailpoet/assets/js/src/newsletters/types/re_engagement/re_engagement.tsx b/mailpoet/assets/js/src/newsletters/types/re_engagement/re_engagement.tsx
index 3d5498d9be..bd2bd50662 100644
--- a/mailpoet/assets/js/src/newsletters/types/re_engagement/re_engagement.tsx
+++ b/mailpoet/assets/js/src/newsletters/types/re_engagement/re_engagement.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import {
   __,
   assoc,
diff --git a/mailpoet/assets/js/src/newsletters/types/re_engagement/scheduling.tsx b/mailpoet/assets/js/src/newsletters/types/re_engagement/scheduling.tsx
index 0ecd512666..6be32ce329 100644
--- a/mailpoet/assets/js/src/newsletters/types/re_engagement/scheduling.tsx
+++ b/mailpoet/assets/js/src/newsletters/types/re_engagement/scheduling.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/newsletters/types/standard.jsx b/mailpoet/assets/js/src/newsletters/types/standard.jsx
index b0f220bbc5..81f70e5eed 100644
--- a/mailpoet/assets/js/src/newsletters/types/standard.jsx
+++ b/mailpoet/assets/js/src/newsletters/types/standard.jsx
@@ -1,11 +1,11 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import ListingHeadingStepsRoute from 'newsletters/listings/heading_steps_route';
 import { withRouter } from 'react-router-dom';
 import { GlobalContext } from 'context/index.jsx';
 
-class NewsletterStandard extends React.Component {
+class NewsletterStandard extends Component {
   componentDidMount() {
     // No options for this type, create a newsletter upon mounting
     MailPoet.Ajax.post({
diff --git a/mailpoet/assets/js/src/newsletters/types/welcome/scheduling.jsx b/mailpoet/assets/js/src/newsletters/types/welcome/scheduling.jsx
index 00fd7231bc..66645b90b1 100644
--- a/mailpoet/assets/js/src/newsletters/types/welcome/scheduling.jsx
+++ b/mailpoet/assets/js/src/newsletters/types/welcome/scheduling.jsx
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React from 'react';
+import { Component } from 'react';
 import MailPoet from 'mailpoet';
 import Select from 'form/fields/select.jsx';
 import Selection from 'form/fields/selection.jsx';
@@ -52,7 +52,7 @@ const afterTimeTypeField = {
   values: timeDelayValues,
 };
 
-class WelcomeScheduling extends React.Component {
+class WelcomeScheduling extends Component {
   getCurrentValue = () => this.props.item[this.props.field.name] || {};
 
   handleValueChange = (name, value) => {
diff --git a/mailpoet/assets/js/src/newsletters/types/welcome/welcome.jsx b/mailpoet/assets/js/src/newsletters/types/welcome/welcome.jsx
index 21529ded71..a977a71d69 100644
--- a/mailpoet/assets/js/src/newsletters/types/welcome/welcome.jsx
+++ b/mailpoet/assets/js/src/newsletters/types/welcome/welcome.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import _ from 'underscore';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
@@ -17,7 +17,7 @@ const field = {
   component: WelcomeScheduling,
 };
 
-class NewsletterWelcome extends React.Component {
+class NewsletterWelcome extends Component {
   constructor(props) {
     super(props);
     let availableSegments = window.mailpoet_segments || [];
diff --git a/mailpoet/assets/js/src/notices/api_errors_notice.tsx b/mailpoet/assets/js/src/notices/api_errors_notice.tsx
index c3a12a5736..4642a54308 100644
--- a/mailpoet/assets/js/src/notices/api_errors_notice.tsx
+++ b/mailpoet/assets/js/src/notices/api_errors_notice.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Notice from 'notices/notice';
 
 type Props = {
diff --git a/mailpoet/assets/js/src/notices/email_volume_limit_notice.tsx b/mailpoet/assets/js/src/notices/email_volume_limit_notice.tsx
index 61fc9083a3..8e9a1b9915 100644
--- a/mailpoet/assets/js/src/notices/email_volume_limit_notice.tsx
+++ b/mailpoet/assets/js/src/notices/email_volume_limit_notice.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 import ReactHtmlParser from 'react-html-parser';
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/notices/invalid_mss_key_notice.tsx b/mailpoet/assets/js/src/notices/invalid_mss_key_notice.tsx
index c3ae6cb8d0..231c23f69c 100644
--- a/mailpoet/assets/js/src/notices/invalid_mss_key_notice.tsx
+++ b/mailpoet/assets/js/src/notices/invalid_mss_key_notice.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Notice from 'notices/notice';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/notices/mailer_status_notice.jsx b/mailpoet/assets/js/src/notices/mailer_status_notice.jsx
index 4859034b07..43fdda56c1 100644
--- a/mailpoet/assets/js/src/notices/mailer_status_notice.jsx
+++ b/mailpoet/assets/js/src/notices/mailer_status_notice.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import Notice from 'notices/notice.tsx';
 
diff --git a/mailpoet/assets/js/src/notices/notice.tsx b/mailpoet/assets/js/src/notices/notice.tsx
index 45dcac6ee0..f628f9ab60 100644
--- a/mailpoet/assets/js/src/notices/notice.tsx
+++ b/mailpoet/assets/js/src/notices/notice.tsx
@@ -1,4 +1,11 @@
-import React, { ReactNode } from 'react';
+import {
+  useState,
+  useRef,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  ReactNode,
+} from 'react';
 import ReactDOM from 'react-dom';
 import MailPoet from 'mailpoet';
 
@@ -23,29 +30,29 @@ function Notice({
   closable,
   type,
 }: Props) {
-  const [hidden, setHidden] = React.useState(false);
-  const elementRef = React.useRef(null);
-  const timeoutRef = React.useRef<ReturnType<typeof setTimeout>>(null);
+  const [hidden, setHidden] = useState(false);
+  const elementRef = useRef(null);
+  const timeoutRef = useRef<ReturnType<typeof setTimeout>>(null);
 
-  const close = React.useCallback(() => {
+  const close = useCallback(() => {
     if (onClose) onClose();
     setHidden(true);
   }, [onClose]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (timeout) {
       timeoutRef.current = setTimeout(close, timeout);
     }
     return () => (timeoutRef.current ? clearTimeout(timeoutRef.current) : null);
   }, [close, timeout]);
 
-  React.useLayoutEffect(() => {
+  useLayoutEffect(() => {
     if (scroll && elementRef.current) {
       elementRef.current.scrollIntoView(false);
     }
   }, [scroll]);
 
-  React.useLayoutEffect(() => {
+  useLayoutEffect(() => {
     if (onDisplay) onDisplay();
   }, [onDisplay]);
 
diff --git a/mailpoet/assets/js/src/notices/notices.jsx b/mailpoet/assets/js/src/notices/notices.jsx
index 6d2c961ba4..b5c8602318 100644
--- a/mailpoet/assets/js/src/notices/notices.jsx
+++ b/mailpoet/assets/js/src/notices/notices.jsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { useContext } from 'react';
 import { GlobalContext } from 'context/index.jsx';
 import Notice from './notice.tsx';
 
 export default () => {
-  const { notices } = React.useContext(GlobalContext);
+  const { notices } = useContext(GlobalContext);
   return notices.items.map(
     ({
       id,
diff --git a/mailpoet/assets/js/src/notices/subscribers_limit_notice.jsx b/mailpoet/assets/js/src/notices/subscribers_limit_notice.jsx
index 8e39e533ea..f15a6ed5d0 100644
--- a/mailpoet/assets/js/src/notices/subscribers_limit_notice.jsx
+++ b/mailpoet/assets/js/src/notices/subscribers_limit_notice.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 import MailPoet from 'mailpoet';
 import Notice from 'notices/notice.tsx';
diff --git a/mailpoet/assets/js/src/notices/transactional_emails_propose_opt_in_notice.tsx b/mailpoet/assets/js/src/notices/transactional_emails_propose_opt_in_notice.tsx
index e41cb94588..db649432f2 100644
--- a/mailpoet/assets/js/src/notices/transactional_emails_propose_opt_in_notice.tsx
+++ b/mailpoet/assets/js/src/notices/transactional_emails_propose_opt_in_notice.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import Notice from 'notices/notice';
 import MailPoet from 'mailpoet';
 
diff --git a/mailpoet/assets/js/src/nps_poll.jsx b/mailpoet/assets/js/src/nps_poll.jsx
index 17bce6376a..c19874505f 100644
--- a/mailpoet/assets/js/src/nps_poll.jsx
+++ b/mailpoet/assets/js/src/nps_poll.jsx
@@ -1,4 +1,4 @@
-import React, { useLayoutEffect } from 'react';
+import { useLayoutEffect } from 'react';
 import MailPoet from 'mailpoet';
 import ReactDOMServer from 'react-dom/server';
 import satismeter from 'satismeter-loader';
diff --git a/mailpoet/assets/js/src/review_request.jsx b/mailpoet/assets/js/src/review_request.jsx
index e37ac13dd7..934b4d282e 100644
--- a/mailpoet/assets/js/src/review_request.jsx
+++ b/mailpoet/assets/js/src/review_request.jsx
@@ -1,6 +1,5 @@
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
-import React from 'react';
 
 function ReviewRequest(props) {
   const days = props.installedDaysAgo;
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx
index 384dea1291..a38c0ddc68 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/date.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/date.tsx
index d6fc4dcb9a..fecd17bf4f 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/date.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/date.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import {
   assign,
   range,
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/select.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/select.tsx
index f29bc3fcb8..4b7864ae81 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/select.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/select.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   find,
 } from 'lodash/fp';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/text.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/text.tsx
index af7ef79638..d38509ed93 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/text.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/text.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email.tsx
index 2942e49b6a..ee8f46c55c 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_opens_absolute_count.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_opens_absolute_count.tsx
index 4fc5776c5d..5cf1eab49f 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_opens_absolute_count.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_opens_absolute_count.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 import { Grid } from 'common/grid';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_statistics_clicks.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_statistics_clicks.tsx
index 64cf0e5b4e..26c1ea7f73 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_statistics_clicks.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_statistics_clicks.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import MailPoet from 'mailpoet';
 import { find, filter } from 'lodash/fp';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_statistics_opens.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_statistics_opens.tsx
index 8d881064b5..8a348fabf9 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_statistics_opens.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/email_statistics_opens.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import MailPoet from 'mailpoet';
 import { filter, map } from 'lodash/fp';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber.tsx
index e71809fbe6..e4aa588d4e 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_mailpoet_custom_field.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_mailpoet_custom_field.tsx
index daf5dba51e..e560613773 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_mailpoet_custom_field.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_mailpoet_custom_field.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { find } from 'lodash/fp';
 import { useSelect, useDispatch } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_score.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_score.tsx
index 08082a8a54..0e09feb376 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_score.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_score.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_date.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_date.tsx
index e9433890cd..42fd82755a 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_date.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_date.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { isValid, parseISO } from 'date-fns';
 import { useSelect, useDispatch } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_to_list.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_to_list.tsx
index 3338f88875..4dbf6dd245 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_to_list.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_to_list.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { map, filter } from 'lodash/fp';
 import { useDispatch, useSelect } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_wordpress_role.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_wordpress_role.tsx
index 4233c9d1d4..a3d7b06086 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_wordpress_role.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_wordpress_role.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { filter, map } from 'lodash/fp';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx
index a2218d4f41..49e4329b59 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import { filter } from 'lodash/fp';
 import ReactSelect from 'common/form/react_select/react_select';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce_membership.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce_membership.tsx
index 5310ed6415..ecd4e124af 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce_membership.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce_membership.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import MailPoet from 'mailpoet';
 import { filter } from 'lodash/fp';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce_subscription.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce_subscription.tsx
index 14d5793f5b..e5bef61a37 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce_subscription.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce_subscription.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import MailPoet from 'mailpoet';
 import { filter } from 'lodash/fp';
 import { useSelect, useDispatch } from '@wordpress/data';
diff --git a/mailpoet/assets/js/src/segments/dynamic/editor.tsx b/mailpoet/assets/js/src/segments/dynamic/editor.tsx
index ef10c5e1e6..451d8632b9 100644
--- a/mailpoet/assets/js/src/segments/dynamic/editor.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/editor.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useDispatch } from '@wordpress/data';
 import { useRouteMatch, Link } from 'react-router-dom';
 
diff --git a/mailpoet/assets/js/src/segments/dynamic/form.tsx b/mailpoet/assets/js/src/segments/dynamic/form.tsx
index 06913c987f..249ce175e9 100644
--- a/mailpoet/assets/js/src/segments/dynamic/form.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/form.tsx
@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
+import * as React from 'react';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 import Hooks from 'wp-js-hooks';
diff --git a/mailpoet/assets/js/src/segments/dynamic/form_filter_fields.tsx b/mailpoet/assets/js/src/segments/dynamic/form_filter_fields.tsx
index 02b6d994e3..10bf3a50f5 100644
--- a/mailpoet/assets/js/src/segments/dynamic/form_filter_fields.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/form_filter_fields.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useSelect } from '@wordpress/data';
 
 import {
diff --git a/mailpoet/assets/js/src/segments/dynamic/list.jsx b/mailpoet/assets/js/src/segments/dynamic/list.jsx
index 48918a55a0..d865d7c485 100644
--- a/mailpoet/assets/js/src/segments/dynamic/list.jsx
+++ b/mailpoet/assets/js/src/segments/dynamic/list.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link, withRouter } from 'react-router-dom';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/segments/dynamic/premium_banner.tsx b/mailpoet/assets/js/src/segments/dynamic/premium_banner.tsx
index 17b7bc1ef8..921ad17146 100644
--- a/mailpoet/assets/js/src/segments/dynamic/premium_banner.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/premium_banner.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import PremiumBannerWithUpgrade from 'common/premium_banner_with_upgrade/premium_banner_with_upgrade';
 import Button from 'common/button/button';
diff --git a/mailpoet/assets/js/src/segments/dynamic/privacy_protection_notice.tsx b/mailpoet/assets/js/src/segments/dynamic/privacy_protection_notice.tsx
index 79070a1662..e36a93406d 100644
--- a/mailpoet/assets/js/src/segments/dynamic/privacy_protection_notice.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/privacy_protection_notice.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect } from '@wordpress/data';
 
diff --git a/mailpoet/assets/js/src/segments/dynamic/subscribers_counter.tsx b/mailpoet/assets/js/src/segments/dynamic/subscribers_counter.tsx
index 0d81ee37c7..b874596dc1 100644
--- a/mailpoet/assets/js/src/segments/dynamic/subscribers_counter.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/subscribers_counter.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 import MailPoet from 'mailpoet';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { debounce } from 'lodash';
diff --git a/mailpoet/assets/js/src/segments/form.jsx b/mailpoet/assets/js/src/segments/form.jsx
index 09c47a9265..462bc30017 100644
--- a/mailpoet/assets/js/src/segments/form.jsx
+++ b/mailpoet/assets/js/src/segments/form.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link } from 'react-router-dom';
 import MailPoet from 'mailpoet';
 import Form from 'form/form.jsx';
diff --git a/mailpoet/assets/js/src/segments/heading.jsx b/mailpoet/assets/js/src/segments/heading.jsx
index 727a01beac..f05947e5f1 100644
--- a/mailpoet/assets/js/src/segments/heading.jsx
+++ b/mailpoet/assets/js/src/segments/heading.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link } from 'react-router-dom';
 import MailPoet from 'mailpoet';
 import { TopBarWithBeamer } from 'common/top_bar/top_bar';
diff --git a/mailpoet/assets/js/src/segments/list.jsx b/mailpoet/assets/js/src/segments/list.jsx
index 2627ddfcb7..80fa4d9552 100644
--- a/mailpoet/assets/js/src/segments/list.jsx
+++ b/mailpoet/assets/js/src/segments/list.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { Link, withRouter } from 'react-router-dom';
 import MailPoet from 'mailpoet';
 import classNames from 'classnames';
@@ -230,7 +230,7 @@ const itemActions = [
   },
 ];
 
-class SegmentList extends React.Component {
+class SegmentList extends Component {
   renderItem = (segment, actions) => {
     const rowClasses = classNames(
       'manage-column',
diff --git a/mailpoet/assets/js/src/segments/segments.jsx b/mailpoet/assets/js/src/segments/segments.jsx
index 3cb6fceda6..8ab2bcf75c 100644
--- a/mailpoet/assets/js/src/segments/segments.jsx
+++ b/mailpoet/assets/js/src/segments/segments.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import {
   HashRouter, Switch, Route, Redirect,
diff --git a/mailpoet/assets/js/src/sending-paused-notices-fix-button.tsx b/mailpoet/assets/js/src/sending-paused-notices-fix-button.tsx
index 5949b2504a..07b3981ad7 100644
--- a/mailpoet/assets/js/src/sending-paused-notices-fix-button.tsx
+++ b/mailpoet/assets/js/src/sending-paused-notices-fix-button.tsx
@@ -1,5 +1,5 @@
 import jQuery from 'jquery';
-import React, { useState } from 'react';
+import { useState } from 'react';
 import ReactDOM from 'react-dom';
 import SetFromAddressModal from 'common/set_from_address_modal';
 import { GlobalContext, useGlobalContextValue } from 'context/index.jsx';
diff --git a/mailpoet/assets/js/src/settings/components/inputs.tsx b/mailpoet/assets/js/src/settings/components/inputs.tsx
index faf33d597b..6a91622fd9 100644
--- a/mailpoet/assets/js/src/settings/components/inputs.tsx
+++ b/mailpoet/assets/js/src/settings/components/inputs.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
 
 type Props = {
   children: ReactNode;
diff --git a/mailpoet/assets/js/src/settings/components/label.tsx b/mailpoet/assets/js/src/settings/components/label.tsx
index 3c59eabcfe..07bc25c950 100644
--- a/mailpoet/assets/js/src/settings/components/label.tsx
+++ b/mailpoet/assets/js/src/settings/components/label.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
 
 type Props = {
   title: string;
diff --git a/mailpoet/assets/js/src/settings/components/pages_select.tsx b/mailpoet/assets/js/src/settings/components/pages_select.tsx
index 59fe391cf0..d761ffec57 100644
--- a/mailpoet/assets/js/src/settings/components/pages_select.tsx
+++ b/mailpoet/assets/js/src/settings/components/pages_select.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useSelector } from 'settings/store/hooks';
 import { onChange, t } from 'common/functions';
 import Select from 'common/form/select/select';
diff --git a/mailpoet/assets/js/src/settings/components/save_button.tsx b/mailpoet/assets/js/src/settings/components/save_button.tsx
index 5b7a90a6e4..4987eb1439 100644
--- a/mailpoet/assets/js/src/settings/components/save_button.tsx
+++ b/mailpoet/assets/js/src/settings/components/save_button.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState, useContext, useEffect } from 'react';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
 import { useAction, useSelector } from 'settings/store/hooks';
@@ -29,7 +29,7 @@ const showReEngagementNotice = (action, showError, showSuccess) => {
 };
 
 export default function SaveButton() {
-  const [clicked, setClicked] = React.useState(false);
+  const [clicked, setClicked] = useState(false);
   const isSaving = useSelector('isSaving')();
   const hasError = useSelector('hasErrorFlag')();
   const error = useSelector('getSavingError')();
@@ -37,10 +37,10 @@ export default function SaveButton() {
   const reEngagementAction = useSelector('getReEngagementAction')();
   const save = useAction('saveSettings');
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const { notices } = React.useContext<any>(GlobalContext);
+  const { notices } = useContext<any>(GlobalContext);
   const showError = notices.error;
   const showSuccess = notices.success;
-  React.useEffect(() => {
+  useEffect(() => {
     if (clicked && !isSaving) {
       if (error) showError(error.map((err) => <p>{err}</p>), { scroll: true });
       else {
diff --git a/mailpoet/assets/js/src/settings/components/segments_select.tsx b/mailpoet/assets/js/src/settings/components/segments_select.tsx
index 60f5508935..05e9dc9230 100644
--- a/mailpoet/assets/js/src/settings/components/segments_select.tsx
+++ b/mailpoet/assets/js/src/settings/components/segments_select.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import React from 'react';
 import { useSelector } from 'settings/store/hooks';
 import ReactSelect from 'common/form/react_select/react_select';
 
diff --git a/mailpoet/assets/js/src/settings/index.tsx b/mailpoet/assets/js/src/settings/index.tsx
index 78b2e67c9b..be4fb5d7dd 100644
--- a/mailpoet/assets/js/src/settings/index.tsx
+++ b/mailpoet/assets/js/src/settings/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import 'parsleyjs';
 import ReactDOM from 'react-dom';
 import { GlobalContext, useGlobalContextValue } from 'context';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/advanced.tsx b/mailpoet/assets/js/src/settings/pages/advanced/advanced.tsx
index 9232f10573..4d35b62281 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/advanced.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/advanced.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SaveButton } from 'settings/components';
 import TaskScheduler from './task_scheduler';
 import Roles from './roles';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/bounce_address.tsx b/mailpoet/assets/js/src/settings/pages/advanced/bounce_address.tsx
index a267b4dc9a..69d5146584 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/bounce_address.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/bounce_address.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t, onChange, setLowercaseValue } from 'common/functions';
 import Input from 'common/form/input/input';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/captcha.tsx b/mailpoet/assets/js/src/settings/pages/advanced/captcha.tsx
index 6b2b31de67..7d9bc29bd6 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/captcha.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/captcha.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 
 import { t, onChange } from 'common/functions';
 import Input from 'common/form/input/input';
@@ -14,7 +14,7 @@ export default function Captcha() {
   const setErrorFlag = useAction('setErrorFlag');
   const missingToken = (type === 'recaptcha' && token.trim() === '');
   const missingSecret = (type === 'recaptcha' && secret.trim() === '');
-  React.useEffect(() => {
+  useEffect(() => {
     setErrorFlag(missingToken || missingSecret);
   }, [missingSecret, missingToken, setErrorFlag]);
 
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/engagement_tracking.tsx b/mailpoet/assets/js/src/settings/pages/advanced/engagement_tracking.tsx
index f792b9a285..273954870f 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/engagement_tracking.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/engagement_tracking.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import { t } from 'common/functions';
 import Radio from 'common/form/radio/radio';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/inactive_subscribers.tsx b/mailpoet/assets/js/src/settings/pages/advanced/inactive_subscribers.tsx
index 05e7653b12..c2b0e03937 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/inactive_subscribers.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/inactive_subscribers.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { t } from 'common/functions';
 import Radio from 'common/form/radio/radio';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/libs_3rd_party.tsx b/mailpoet/assets/js/src/settings/pages/advanced/libs_3rd_party.tsx
index 9b95f43c81..a27d36a624 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/libs_3rd_party.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/libs_3rd_party.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { t } from 'common/functions';
 import Radio from 'common/form/radio/radio';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/logging.tsx b/mailpoet/assets/js/src/settings/pages/advanced/logging.tsx
index dc4ddca652..d03315e710 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/logging.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/logging.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { t, onChange } from 'common/functions';
 import Select from 'common/form/select/select';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/recalculate_subscriber_score.tsx b/mailpoet/assets/js/src/settings/pages/advanced/recalculate_subscriber_score.tsx
index cb53a0a4fc..c6700be91b 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/recalculate_subscriber_score.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/recalculate_subscriber_score.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useContext } from 'react';
 
 import Button from 'common/button/button';
 import { t } from 'common/functions';
@@ -9,7 +9,7 @@ import { Label, Inputs } from 'settings/components';
 export function RecalculateSubscriberScore(): JSX.Element {
   const recalculateSubscribersScore = useAction('recalculateSubscribersScore');
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const { notices } = React.useContext<any>(GlobalContext);
+  const { notices } = useContext<any>(GlobalContext);
   const onClick = async (): Promise<void> => {
     await recalculateSubscribersScore();
     notices.info(<p>{t('recalculateSubscribersScoreNotice')}</p>, { scroll: true });
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/reinstall.tsx b/mailpoet/assets/js/src/settings/pages/advanced/reinstall.tsx
index a255b4998a..a934666251 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/reinstall.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/reinstall.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useContext } from 'react';
 
 import Button from 'common/button/button';
 import { t } from 'common/functions';
@@ -9,7 +9,7 @@ import { Label, Inputs } from 'settings/components';
 export default function Reinstall() {
   const reinstall = useAction('reinstall');
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const { notices } = React.useContext<any>(GlobalContext);
+  const { notices } = useContext<any>(GlobalContext);
   const onClick = async () => {
     if (window.confirm(t('reinstallConfirmation'))) { // eslint-disable-line
       type Result = { type: 'SAVE_FAILED' | 'SAVE_DONE'; error?: string[] }
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/roles.tsx b/mailpoet/assets/js/src/settings/pages/advanced/roles.tsx
index e2ed95cf3b..8a85679b85 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/roles.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/roles.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 
 import { t } from 'common/functions';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/share_data.tsx b/mailpoet/assets/js/src/settings/pages/advanced/share_data.tsx
index e0c4cac744..946e5b9a3b 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/share_data.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/share_data.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { t } from 'common/functions';
 import Radio from 'common/form/radio/radio';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/task_scheduler.tsx b/mailpoet/assets/js/src/settings/pages/advanced/task_scheduler.tsx
index 5df72a32b1..0a97a49874 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/task_scheduler.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/task_scheduler.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 
 import { t } from 'common/functions';
diff --git a/mailpoet/assets/js/src/settings/pages/advanced/transactional.tsx b/mailpoet/assets/js/src/settings/pages/advanced/transactional.tsx
index 822ad5a896..5cb86bd4d9 100644
--- a/mailpoet/assets/js/src/settings/pages/advanced/transactional.tsx
+++ b/mailpoet/assets/js/src/settings/pages/advanced/transactional.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 
 import { t } from 'common/functions';
diff --git a/mailpoet/assets/js/src/settings/pages/basics/basics.tsx b/mailpoet/assets/js/src/settings/pages/basics/basics.tsx
index b8b31b2304..1cd846b966 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/basics.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/basics.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SaveButton } from 'settings/components';
 import { t } from 'common/functions';
 import DefaultSender from './default_sender';
diff --git a/mailpoet/assets/js/src/settings/pages/basics/default_sender.tsx b/mailpoet/assets/js/src/settings/pages/basics/default_sender.tsx
index fe6c1b7cca..ed0f09dd19 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/default_sender.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/default_sender.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import { Label, Inputs } from 'settings/components';
 import {
   isEmail,
@@ -19,7 +19,7 @@ export default function DefaultSender() {
   const setErrorFlag = useAction('setErrorFlag');
   const invalidSenderEmail = (senderEmail && !isEmail(senderEmail));
   const invalidReplyToEmail = replyToEmail && !isEmail(replyToEmail);
-  React.useEffect(() => {
+  useEffect(() => {
     setErrorFlag(invalidSenderEmail || invalidReplyToEmail);
   }, [invalidReplyToEmail, invalidSenderEmail, setErrorFlag]);
   return (
diff --git a/mailpoet/assets/js/src/settings/pages/basics/gdpr_compliant.tsx b/mailpoet/assets/js/src/settings/pages/basics/gdpr_compliant.tsx
index 0043a8c79e..38a15de960 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/gdpr_compliant.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/gdpr_compliant.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t } from 'common/functions';
 import { Label, Inputs } from 'settings/components';
 
diff --git a/mailpoet/assets/js/src/settings/pages/basics/manage_subscription.tsx b/mailpoet/assets/js/src/settings/pages/basics/manage_subscription.tsx
index a799c84434..deb2c3dd28 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/manage_subscription.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/manage_subscription.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 import { t } from 'common/functions';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/basics/new_subscriber_notifications.tsx b/mailpoet/assets/js/src/settings/pages/basics/new_subscriber_notifications.tsx
index 2c44e8e2f7..bf854d0392 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/new_subscriber_notifications.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/new_subscriber_notifications.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import {
   isEmail,
   t,
@@ -16,7 +16,7 @@ export default function NewSubscriberNotifications() {
   const setErrorFlag = useAction('setErrorFlag');
   const hasError = enabled === '1' && email.trim() === '';
   const invalidEmail = email && !isEmail(email);
-  React.useEffect(() => {
+  useEffect(() => {
     setErrorFlag(hasError || invalidEmail);
   }, [hasError, invalidEmail, setErrorFlag]);
 
diff --git a/mailpoet/assets/js/src/settings/pages/basics/re_engagement_page.tsx b/mailpoet/assets/js/src/settings/pages/basics/re_engagement_page.tsx
index cfc2cde698..a643359d85 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/re_engagement_page.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/re_engagement_page.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t } from 'common/functions';
 import { useSetting } from 'settings/store/hooks';
 import { Label, Inputs, PagesSelect } from 'settings/components';
diff --git a/mailpoet/assets/js/src/settings/pages/basics/shortcode.tsx b/mailpoet/assets/js/src/settings/pages/basics/shortcode.tsx
index 1a65672da1..b4d266fd53 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/shortcode.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/shortcode.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { t } from 'common/functions';
 import Input from 'common/form/input/input';
 import { Label, Inputs, SegmentsSelect } from 'settings/components';
@@ -10,7 +10,7 @@ type Props = {
 }
 
 export default function Shortcode({ name, title, description }: Props) {
-  const [segments, setSegments] = React.useState([]);
+  const [segments, setSegments] = useState([]);
   const shortcode = `[${name}${segments.length ? ` segments="${segments.join(',')}"` : ''}]`;
   const selectText = (event) => {
     event.target.focus();
diff --git a/mailpoet/assets/js/src/settings/pages/basics/stats_notifications.tsx b/mailpoet/assets/js/src/settings/pages/basics/stats_notifications.tsx
index 647e70119b..9a0a50db9e 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/stats_notifications.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/stats_notifications.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import {
   isEmail,
   t,
@@ -17,7 +17,7 @@ export default function StatsNotifications() {
   const setErrorFlag = useAction('setErrorFlag');
   const hasError = (enabled === '1' || automated === '1') && email.trim() === '';
   const invalidEmail = email && !isEmail(email);
-  React.useEffect(() => {
+  useEffect(() => {
     setErrorFlag(hasError || invalidEmail);
   }, [hasError, invalidEmail, setErrorFlag]);
 
diff --git a/mailpoet/assets/js/src/settings/pages/basics/subscribe_on.tsx b/mailpoet/assets/js/src/settings/pages/basics/subscribe_on.tsx
index 6fcfe773d5..adfedc9ce2 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/subscribe_on.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/subscribe_on.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import { t, onChange } from 'common/functions';
 import Checkbox from 'common/form/checkbox/checkbox';
 import Input from 'common/form/input/input';
@@ -15,7 +15,7 @@ export default function SubscribeOn({ title, description, event }: Props) {
   const [enabled, setEnabled] = useSetting('subscribe', event, 'enabled');
   const [label, setLabel] = useSetting('subscribe', event, 'label');
   const [segments, setSegments] = useSetting('subscribe', event, 'segments');
-  React.useEffect(() => {
+  useEffect(() => {
     if (label === '') setLabel(t('yesAddMe'));
   }, [label, setLabel]);
 
diff --git a/mailpoet/assets/js/src/settings/pages/basics/unsubscribe_page.tsx b/mailpoet/assets/js/src/settings/pages/basics/unsubscribe_page.tsx
index 12bc90a822..90860cebfd 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/unsubscribe_page.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/unsubscribe_page.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 import { t } from 'common/functions';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/key_activation/key_activation.tsx b/mailpoet/assets/js/src/settings/pages/key_activation/key_activation.tsx
index bc32e25aa4..b72e0ea225 100644
--- a/mailpoet/assets/js/src/settings/pages/key_activation/key_activation.tsx
+++ b/mailpoet/assets/js/src/settings/pages/key_activation/key_activation.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import { useContext } from 'react';
 import MailPoet from 'mailpoet';
 import { useSelector, useAction, useSetting } from 'settings/store/hooks';
 import { GlobalContext } from 'context';
diff --git a/mailpoet/assets/js/src/settings/pages/key_activation/messages/key_messages.tsx b/mailpoet/assets/js/src/settings/pages/key_activation/messages/key_messages.tsx
index 1b8fea3000..10d3c8bb55 100644
--- a/mailpoet/assets/js/src/settings/pages/key_activation/messages/key_messages.tsx
+++ b/mailpoet/assets/js/src/settings/pages/key_activation/messages/key_messages.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelector } from 'settings/store/hooks';
 
diff --git a/mailpoet/assets/js/src/settings/pages/key_activation/messages/mss_messages.tsx b/mailpoet/assets/js/src/settings/pages/key_activation/messages/mss_messages.tsx
index e4170a3ab3..340a930c12 100644
--- a/mailpoet/assets/js/src/settings/pages/key_activation/messages/mss_messages.tsx
+++ b/mailpoet/assets/js/src/settings/pages/key_activation/messages/mss_messages.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelector } from 'settings/store/hooks';
 import { MssStatus } from 'settings/store/types';
diff --git a/mailpoet/assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx b/mailpoet/assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx
index 1535d9f56c..d20f17634c 100644
--- a/mailpoet/assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx
+++ b/mailpoet/assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { useSelector } from 'settings/store/hooks/index';
 import { PremiumStatus } from 'settings/store/types';
diff --git a/mailpoet/assets/js/src/settings/pages/key_activation/messages/service_unavailable_messages.tsx b/mailpoet/assets/js/src/settings/pages/key_activation/messages/service_unavailable_messages.tsx
index 977962800e..8d7b3cd6b9 100644
--- a/mailpoet/assets/js/src/settings/pages/key_activation/messages/service_unavailable_messages.tsx
+++ b/mailpoet/assets/js/src/settings/pages/key_activation/messages/service_unavailable_messages.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 
 export default function ServiceUnavailableMessages() {
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/activate_or_cancel.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/activate_or_cancel.tsx
index c9341c01bc..1d48195398 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/activate_or_cancel.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/activate_or_cancel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useHistory } from 'react-router-dom';
 
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/amazon_ses_fields.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/amazon_ses_fields.tsx
index 93d3539a29..20193f93a9 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/amazon_ses_fields.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/amazon_ses_fields.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, Inputs } from 'settings/components';
 import { t, onChange } from 'common/functions';
 import Input from 'common/form/input/input';
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/other_sending_methods.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/other_sending_methods.tsx
index 986b5367cc..607e56da3d 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/other_sending_methods.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/other_sending_methods.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useSetting } from 'settings/store/hooks';
 import SendingMethod from './sending_method';
 import SPF from './spf';
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/php_mail_fields.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/php_mail_fields.tsx
index 311b819ca3..b545c45b22 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/php_mail_fields.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/php_mail_fields.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, Inputs } from 'settings/components';
 import { t, onChange } from 'common/functions';
 import Select from 'common/form/select/select';
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/sendgrid_fields.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/sendgrid_fields.tsx
index e5b81067cd..8a327b69ad 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/sendgrid_fields.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/sendgrid_fields.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, Inputs } from 'settings/components';
 import { t, onChange } from 'common/functions';
 import Input from 'common/form/input/input';
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/sending_frequency.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/sending_frequency.tsx
index 4ced544935..cd847ae987 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/sending_frequency.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/sending_frequency.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import ReactStringReplace from 'react-string-replace';
 
 import { Label, Inputs } from 'settings/components';
@@ -26,7 +26,7 @@ export default function SendingFrequency({ recommendedEmails, recommendedInterva
   const [frequency, setFrequency] = useSetting('mailpoet_sending_frequency');
   const [frequencyEmails, setFrequencyEmails] = useSetting('mta', 'frequency', 'emails');
   const [frequencyInterval, setFrequencyInterval] = useSetting('mta', 'frequency', 'interval');
-  React.useEffect(() => {
+  useEffect(() => {
     if (frequency === 'auto') {
       setFrequencyEmails(`${recommendedEmails}`);
       setFrequencyInterval(`${recommendedInterval}`);
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/sending_method.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/sending_method.tsx
index 54d81b865e..5d41ac6501 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/sending_method.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/sending_method.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import { Label, Inputs } from 'settings/components';
 import { t, onChange } from 'common/functions';
 import Select from 'common/form/select/select';
@@ -8,7 +8,7 @@ export default function SendingMethod() {
   const [provider, setProvider] = useSetting('smtp_provider');
   const [, setGroup] = useSetting('mta_group');
   const [, setMethod] = useSetting('mta', 'method');
-  React.useEffect(() => {
+  useEffect(() => {
     switch (provider) {
       case 'server':
         setGroup('website');
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/smtp_fields.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/smtp_fields.tsx
index b2ab1a4aca..7fc5d3af3d 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/smtp_fields.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/smtp_fields.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, Inputs } from 'settings/components';
 import { t, onChange } from 'common/functions';
 import Input from 'common/form/input/input';
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/spf.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/spf.tsx
index eb66e2f390..8894812557 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/spf.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/spf.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t } from 'common/functions';
 import { Label, Inputs } from 'settings/components';
 
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/other/test_sending.tsx b/mailpoet/assets/js/src/settings/pages/send_with/other/test_sending.tsx
index ad67169209..e3b047f573 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/other/test_sending.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/other/test_sending.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import ReactStringReplace from 'react-string-replace';
 
 import HelpTooltip from 'help-tooltip';
@@ -18,7 +18,7 @@ interface TestSendingWindow extends Window {
 declare let window: TestSendingWindow;
 
 export default function TestSending() {
-  const [email, setEmail] = React.useState<string>(window.mailpoet_current_user_email);
+  const [email, setEmail] = useState<string>(window.mailpoet_current_user_email);
   const [mailer] = useSetting('mta');
   const { state, error } = useSelector('getTestEmailState')();
   const sendTestEmail = useAction('sendTestEmail');
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/send_with.tsx b/mailpoet/assets/js/src/settings/pages/send_with/send_with.tsx
index 98dc782406..bd60064069 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/send_with.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/send_with.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { useParams } from 'react-router-dom';
 import SendWithChoice from './send_with_choice';
 import OtherSendingMethods from './other/other_sending_methods';
diff --git a/mailpoet/assets/js/src/settings/pages/send_with/send_with_choice.tsx b/mailpoet/assets/js/src/settings/pages/send_with/send_with_choice.tsx
index 1dd93938fe..240f6d5a5d 100644
--- a/mailpoet/assets/js/src/settings/pages/send_with/send_with_choice.tsx
+++ b/mailpoet/assets/js/src/settings/pages/send_with/send_with_choice.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link, useHistory } from 'react-router-dom';
 import ReactStringReplace from 'react-string-replace';
 
diff --git a/mailpoet/assets/js/src/settings/pages/signup_confirmation/confirmation_page.tsx b/mailpoet/assets/js/src/settings/pages/signup_confirmation/confirmation_page.tsx
index f49e94324a..8d0fd4252f 100644
--- a/mailpoet/assets/js/src/settings/pages/signup_confirmation/confirmation_page.tsx
+++ b/mailpoet/assets/js/src/settings/pages/signup_confirmation/confirmation_page.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t } from 'common/functions';
 import { Label, Inputs, PagesSelect } from 'settings/components';
 import { useSetting } from 'settings/store/hooks';
diff --git a/mailpoet/assets/js/src/settings/pages/signup_confirmation/email_content.tsx b/mailpoet/assets/js/src/settings/pages/signup_confirmation/email_content.tsx
index 62859fee5b..37cd8ef523 100644
--- a/mailpoet/assets/js/src/settings/pages/signup_confirmation/email_content.tsx
+++ b/mailpoet/assets/js/src/settings/pages/signup_confirmation/email_content.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { t, onChange } from 'common/functions';
 import Textarea from 'common/form/textarea/textarea';
 import { Label, Inputs } from 'settings/components';
diff --git a/mailpoet/assets/js/src/settings/pages/signup_confirmation/email_subject.tsx b/mailpoet/assets/js/src/settings/pages/signup_confirmation/email_subject.tsx
index bd9b3f20c1..6d15892546 100644
--- a/mailpoet/assets/js/src/settings/pages/signup_confirmation/email_subject.tsx
+++ b/mailpoet/assets/js/src/settings/pages/signup_confirmation/email_subject.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t, onChange } from 'common/functions';
 import Input from 'common/form/input/input';
 import { Label, Inputs } from 'settings/components';
diff --git a/mailpoet/assets/js/src/settings/pages/signup_confirmation/enable_signup_confirmation.tsx b/mailpoet/assets/js/src/settings/pages/signup_confirmation/enable_signup_confirmation.tsx
index acc762b7e7..55f963c35b 100644
--- a/mailpoet/assets/js/src/settings/pages/signup_confirmation/enable_signup_confirmation.tsx
+++ b/mailpoet/assets/js/src/settings/pages/signup_confirmation/enable_signup_confirmation.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t } from 'common/functions';
 import Radio from 'common/form/radio/radio';
 import { Label, Inputs } from 'settings/components';
diff --git a/mailpoet/assets/js/src/settings/pages/signup_confirmation/signup_confirmation.tsx b/mailpoet/assets/js/src/settings/pages/signup_confirmation/signup_confirmation.tsx
index f1fa201a3b..1ffa22ac2d 100644
--- a/mailpoet/assets/js/src/settings/pages/signup_confirmation/signup_confirmation.tsx
+++ b/mailpoet/assets/js/src/settings/pages/signup_confirmation/signup_confirmation.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SaveButton } from 'settings/components';
 import EnableSignupConfirmation from './enable_signup_confirmation';
 import EmailSubject from './email_subject';
diff --git a/mailpoet/assets/js/src/settings/pages/woo_commerce/checkout_optin.tsx b/mailpoet/assets/js/src/settings/pages/woo_commerce/checkout_optin.tsx
index 0db98cec21..599b77d79c 100644
--- a/mailpoet/assets/js/src/settings/pages/woo_commerce/checkout_optin.tsx
+++ b/mailpoet/assets/js/src/settings/pages/woo_commerce/checkout_optin.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import { t, onChange } from 'common/functions';
 import Checkbox from 'common/form/checkbox/checkbox';
 import Input from 'common/form/input/input';
@@ -11,7 +11,7 @@ export default function CheckoutOptin() {
   const [message, setMessage] = useSetting('woocommerce', 'optin_on_checkout', 'message');
   const setErrorFlag = useAction('setErrorFlag');
   const emptyMessage = message.trim() === '';
-  React.useEffect(() => {
+  useEffect(() => {
     setErrorFlag(emptyMessage);
   }, [emptyMessage, setErrorFlag]);
 
diff --git a/mailpoet/assets/js/src/settings/pages/woo_commerce/email_customizer.tsx b/mailpoet/assets/js/src/settings/pages/woo_commerce/email_customizer.tsx
index c134e85370..206c0df8ab 100644
--- a/mailpoet/assets/js/src/settings/pages/woo_commerce/email_customizer.tsx
+++ b/mailpoet/assets/js/src/settings/pages/woo_commerce/email_customizer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t } from 'common/functions';
 import Button from 'common/button/button';
 import Checkbox from 'common/form/checkbox/checkbox';
diff --git a/mailpoet/assets/js/src/settings/pages/woo_commerce/subscribe_old_customers.tsx b/mailpoet/assets/js/src/settings/pages/woo_commerce/subscribe_old_customers.tsx
index 7a8d3b435a..cdcd6b1ac2 100644
--- a/mailpoet/assets/js/src/settings/pages/woo_commerce/subscribe_old_customers.tsx
+++ b/mailpoet/assets/js/src/settings/pages/woo_commerce/subscribe_old_customers.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { t } from 'common/functions';
 import { useSetting } from 'settings/store/hooks';
 import { Label, Inputs } from 'settings/components';
diff --git a/mailpoet/assets/js/src/settings/pages/woo_commerce/woo_commerce.tsx b/mailpoet/assets/js/src/settings/pages/woo_commerce/woo_commerce.tsx
index 5846cac488..0aa2a854db 100644
--- a/mailpoet/assets/js/src/settings/pages/woo_commerce/woo_commerce.tsx
+++ b/mailpoet/assets/js/src/settings/pages/woo_commerce/woo_commerce.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SaveButton } from 'settings/components';
 import EmailCustomizer from './email_customizer';
 import CheckoutOptin from './checkout_optin';
diff --git a/mailpoet/assets/js/src/settings/settings.tsx b/mailpoet/assets/js/src/settings/settings.tsx
index 9db8361f91..9de63e6a96 100644
--- a/mailpoet/assets/js/src/settings/settings.tsx
+++ b/mailpoet/assets/js/src/settings/settings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Notices from 'notices/notices.jsx';
 import Loading from 'common/loading';
diff --git a/mailpoet/assets/js/src/settings/store/hooks/useSetting.ts b/mailpoet/assets/js/src/settings/store/hooks/useSetting.ts
index cdd416ef4f..b8d576bc68 100644
--- a/mailpoet/assets/js/src/settings/store/hooks/useSetting.ts
+++ b/mailpoet/assets/js/src/settings/store/hooks/useSetting.ts
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useCallback } from 'react';
 import { Settings } from '../types';
 import useSelector from './useSelector';
 import { ValueAndSetter } from './types';
@@ -29,6 +29,6 @@ export function useSetting(...path: string[]): [any, (value: any) => any] {
   return [
     getValue(path),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    React.useCallback((value) => setValue(path, value), path),
+    useCallback((value) => setValue(path, value), path),
   ];
 }
diff --git a/mailpoet/assets/js/src/subscribers/form.jsx b/mailpoet/assets/js/src/subscribers/form.jsx
index ce17013d11..343c570134 100644
--- a/mailpoet/assets/js/src/subscribers/form.jsx
+++ b/mailpoet/assets/js/src/subscribers/form.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link, useLocation, useHistory } from 'react-router-dom';
 import MailPoet from 'mailpoet';
 import moment from 'moment';
diff --git a/mailpoet/assets/js/src/subscribers/heading.jsx b/mailpoet/assets/js/src/subscribers/heading.jsx
index 8a90a7205e..a278286c61 100644
--- a/mailpoet/assets/js/src/subscribers/heading.jsx
+++ b/mailpoet/assets/js/src/subscribers/heading.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import { Link, withRouter } from 'react-router-dom';
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import.jsx b/mailpoet/assets/js/src/subscribers/importExport/import.jsx
index 3e369db237..2cfb747be1 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import ReactDOM from 'react-dom';
 import {
   HashRouter, Switch, Route, Redirect,
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/clean_list.tsx b/mailpoet/assets/js/src/subscribers/importExport/import/clean_list.tsx
index 2dd689d512..f55a7bea0e 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/clean_list.tsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/clean_list.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Button from 'common/button/button';
 import MailPoet from 'mailpoet';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/context.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/context.jsx
index f1c297a268..4e82915409 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/context.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/context.jsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import { createContext } from 'react';
 
-const ImportContext = React.createContext({
+const ImportContext = createContext({
   isNewUser: window.mailpoet_is_new_user,
   segments: window.mailpoetSegments,
 });
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/previous_next_step_buttons.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/previous_next_step_buttons.jsx
index ec6062e491..83f2427189 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/previous_next_step_buttons.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/previous_next_step_buttons.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_clean_list.tsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_clean_list.tsx
index 2355b4d8c0..847c1136f0 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_clean_list.tsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_clean_list.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import CleanList from './clean_list';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx
index 3a01653e8b..b6a4345770 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router-dom';
 import PreviousNextStepButtons from './previous_next_step_buttons.jsx';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/consent_description.tsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/consent_description.tsx
index d501898e23..c7a5b8a2fd 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/consent_description.tsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/consent_description.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/existing_subscribers_status.tsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/existing_subscribers_status.tsx
index 3bf2c07e2e..dd30bdef61 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/existing_subscribers_status.tsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/existing_subscribers_status.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
 import MailPoet from 'mailpoet';
 import Select from 'common/form/select/select';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/match_table.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/match_table.jsx
index 510710d543..5680d1a1f0 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/match_table.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/match_table.jsx
@@ -1,4 +1,4 @@
-import React, { useLayoutEffect } from 'react';
+import { useLayoutEffect } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/new_subscribers_status.tsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/new_subscribers_status.tsx
index fff144f3cd..f43ffb38ab 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/new_subscribers_status.tsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/new_subscribers_status.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
 import MailPoet from 'mailpoet';
 import Select from 'common/form/select/select';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/select_segment.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/select_segment.jsx
index 60cf4820a5..ae259408b0 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/select_segment.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/select_segment.jsx
@@ -1,4 +1,4 @@
-import React, { useLayoutEffect, useContext, useState } from 'react';
+import { useLayoutEffect, useContext, useState } from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/update_existing_subscribers.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/update_existing_subscribers.jsx
index 2faad94b94..707740caa7 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/update_existing_subscribers.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/update_existing_subscribers.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 import Radio from 'common/form/radio/radio';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx
index 5399f6f58a..42a7c6879e 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation.jsx
index c6b58f951c..83e0ec3de2 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useCallback } from 'react';
+import { useEffect, useState, useCallback } from 'react';
 import { withRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/initial_question.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/initial_question.jsx
index 3ecd96b16a..4063aec1ef 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/initial_question.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/initial_question.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import Radio from 'common/form/radio/radio';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/last_sent_question.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/last_sent_question.jsx
index fe398c7139..946e18ed5e 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/last_sent_question.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/last_sent_question.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback } from 'react';
+import { useState, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/wrong_source_block.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/wrong_source_block.jsx
index 898a54f9d6..fba055d92d 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/wrong_source_block.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_input_validation/wrong_source_block.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
 
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection.jsx
index f40487682e..c30288831d 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { withRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_mailchimp.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_mailchimp.jsx
index 675c900caa..a4304f30a3 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_mailchimp.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_mailchimp.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_paste.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_paste.jsx
index 96500a145c..3dcd3e9966 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_paste.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_paste.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_upload.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_upload.jsx
index 6ff0c758e4..bb1f18538e 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_upload.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/method_upload.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/select_import_method.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/select_import_method.jsx
index ad2b77676d..265510b1de 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/select_import_method.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_method_selection/select_import_method.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import PropTypes from 'prop-types';
 import Radio from 'common/form/radio/radio';
diff --git a/mailpoet/assets/js/src/subscribers/importExport/import/step_results.jsx b/mailpoet/assets/js/src/subscribers/importExport/import/step_results.jsx
index 7c26a8fe7d..2150b32079 100644
--- a/mailpoet/assets/js/src/subscribers/importExport/import/step_results.jsx
+++ b/mailpoet/assets/js/src/subscribers/importExport/import/step_results.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import MailPoet from 'mailpoet';
 import _ from 'underscore';
diff --git a/mailpoet/assets/js/src/subscribers/list.jsx b/mailpoet/assets/js/src/subscribers/list.jsx
index fd26c46f44..2ac2636b16 100644
--- a/mailpoet/assets/js/src/subscribers/list.jsx
+++ b/mailpoet/assets/js/src/subscribers/list.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link, useLocation } from 'react-router-dom';
 
 import jQuery from 'jquery';
diff --git a/mailpoet/assets/js/src/subscribers/listings_engagement_score.tsx b/mailpoet/assets/js/src/subscribers/listings_engagement_score.tsx
index 6f2650d16b..e3939dd4c3 100644
--- a/mailpoet/assets/js/src/subscribers/listings_engagement_score.tsx
+++ b/mailpoet/assets/js/src/subscribers/listings_engagement_score.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import Badge from '../common/listings/newsletter_stats/badge';
 import MailPoet from '../mailpoet';
 
diff --git a/mailpoet/assets/js/src/subscribers/stats.tsx b/mailpoet/assets/js/src/subscribers/stats.tsx
index 7800cf0206..bef214f42c 100644
--- a/mailpoet/assets/js/src/subscribers/stats.tsx
+++ b/mailpoet/assets/js/src/subscribers/stats.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import {
   useRouteMatch,
   useLocation,
diff --git a/mailpoet/assets/js/src/subscribers/stats/heading.tsx b/mailpoet/assets/js/src/subscribers/stats/heading.tsx
index 8824b650f4..7b85850e3e 100644
--- a/mailpoet/assets/js/src/subscribers/stats/heading.tsx
+++ b/mailpoet/assets/js/src/subscribers/stats/heading.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import MailPoet from 'mailpoet';
 import { Link, useLocation } from 'react-router-dom';
 import Heading from 'common/typography/heading/heading';
diff --git a/mailpoet/assets/js/src/subscribers/stats/no_access_info.tsx b/mailpoet/assets/js/src/subscribers/stats/no_access_info.tsx
index b12feb8fcd..0a3d9b10a6 100644
--- a/mailpoet/assets/js/src/subscribers/stats/no_access_info.tsx
+++ b/mailpoet/assets/js/src/subscribers/stats/no_access_info.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import MailPoet from 'mailpoet';
 import PremiumRequired from 'common/premium_required/premium_required';
 import Button from 'common/button/button';
diff --git a/mailpoet/assets/js/src/subscribers/stats/opened_email_stats.tsx b/mailpoet/assets/js/src/subscribers/stats/opened_email_stats.tsx
index 8f114a3def..93de37dd27 100644
--- a/mailpoet/assets/js/src/subscribers/stats/opened_email_stats.tsx
+++ b/mailpoet/assets/js/src/subscribers/stats/opened_email_stats.tsx
@@ -1,5 +1,4 @@
 import Hooks from 'hooks';
-import React from 'react';
 import { Location } from 'history';
 import MailPoet from 'mailpoet';
 import Heading from 'common/typography/heading/heading';
diff --git a/mailpoet/assets/js/src/subscribers/stats/summary.tsx b/mailpoet/assets/js/src/subscribers/stats/summary.tsx
index 6ce294bf98..0be55b1660 100644
--- a/mailpoet/assets/js/src/subscribers/stats/summary.tsx
+++ b/mailpoet/assets/js/src/subscribers/stats/summary.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactStringReplace from 'react-string-replace';
 import MailPoet from 'mailpoet';
 import Tag from 'common/tag/tag';
diff --git a/mailpoet/assets/js/src/subscribers/stats/woocommerce_revenues.tsx b/mailpoet/assets/js/src/subscribers/stats/woocommerce_revenues.tsx
index 5ef490697c..294fbab090 100644
--- a/mailpoet/assets/js/src/subscribers/stats/woocommerce_revenues.tsx
+++ b/mailpoet/assets/js/src/subscribers/stats/woocommerce_revenues.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 export type PropTypes = {
   count: number;
   revenueValue: string;
diff --git a/mailpoet/assets/js/src/subscribers/subscribers.jsx b/mailpoet/assets/js/src/subscribers/subscribers.jsx
index 290c51097b..cbc56e210d 100644
--- a/mailpoet/assets/js/src/subscribers/subscribers.jsx
+++ b/mailpoet/assets/js/src/subscribers/subscribers.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import { HashRouter, Switch, Route } from 'react-router-dom';
 
diff --git a/mailpoet/assets/js/src/wizard/layout/step_layout.jsx b/mailpoet/assets/js/src/wizard/layout/step_layout.jsx
index 7349542842..36801c2dea 100644
--- a/mailpoet/assets/js/src/wizard/layout/step_layout.jsx
+++ b/mailpoet/assets/js/src/wizard/layout/step_layout.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 
 import WelcomeWizardStepLayoutBody from './step_layout_body.jsx';
 
diff --git a/mailpoet/assets/js/src/wizard/layout/step_layout_body.jsx b/mailpoet/assets/js/src/wizard/layout/step_layout_body.jsx
index 5eecb757fb..dd5e0c4bf5 100644
--- a/mailpoet/assets/js/src/wizard/layout/step_layout_body.jsx
+++ b/mailpoet/assets/js/src/wizard/layout/step_layout_body.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 
 function WelcomeWizardStepLayoutBody(props) {
   return (
diff --git a/mailpoet/assets/js/src/wizard/steps/email_course_step.jsx b/mailpoet/assets/js/src/wizard/steps/email_course_step.jsx
index e3966c3978..21bbcf5040 100644
--- a/mailpoet/assets/js/src/wizard/steps/email_course_step.jsx
+++ b/mailpoet/assets/js/src/wizard/steps/email_course_step.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Button from '../../common/button/button';
 import Heading from '../../common/typography/heading/heading';
diff --git a/mailpoet/assets/js/src/wizard/steps/migrated_user_step.jsx b/mailpoet/assets/js/src/wizard/steps/migrated_user_step.jsx
index 36aa5b7402..08ab9c9e09 100644
--- a/mailpoet/assets/js/src/wizard/steps/migrated_user_step.jsx
+++ b/mailpoet/assets/js/src/wizard/steps/migrated_user_step.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Button from '../../common/button/button';
 import Heading from '../../common/typography/heading/heading';
diff --git a/mailpoet/assets/js/src/wizard/steps/pitch_mss_step.jsx b/mailpoet/assets/js/src/wizard/steps/pitch_mss_step.jsx
index 4c0083b80f..67dc357f72 100644
--- a/mailpoet/assets/js/src/wizard/steps/pitch_mss_step.jsx
+++ b/mailpoet/assets/js/src/wizard/steps/pitch_mss_step.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import MailPoet from 'mailpoet';
 import Button from '../../common/button/button';
 import Heading from '../../common/typography/heading/heading';
diff --git a/mailpoet/assets/js/src/wizard/steps/sender_step.jsx b/mailpoet/assets/js/src/wizard/steps/sender_step.jsx
index 1e201985b6..13eeaf58f8 100644
--- a/mailpoet/assets/js/src/wizard/steps/sender_step.jsx
+++ b/mailpoet/assets/js/src/wizard/steps/sender_step.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import React from 'react';
 import MailPoet from 'mailpoet';
 import jQuery from 'jquery';
 import Button from '../../common/button/button';
diff --git a/mailpoet/assets/js/src/wizard/steps/usage_tracking_step.jsx b/mailpoet/assets/js/src/wizard/steps/usage_tracking_step.jsx
index 59905f9c2a..fa633e14a1 100644
--- a/mailpoet/assets/js/src/wizard/steps/usage_tracking_step.jsx
+++ b/mailpoet/assets/js/src/wizard/steps/usage_tracking_step.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React, { useState } from 'react';
+import { useState } from 'react';
 import MailPoet from 'mailpoet';
 import Button from 'common/button/button';
 import { Grid } from 'common/grid';
diff --git a/mailpoet/assets/js/src/wizard/steps/woo_commerce_step.jsx b/mailpoet/assets/js/src/wizard/steps/woo_commerce_step.jsx
index 81002273ce..36bb6d77ef 100644
--- a/mailpoet/assets/js/src/wizard/steps/woo_commerce_step.jsx
+++ b/mailpoet/assets/js/src/wizard/steps/woo_commerce_step.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React, { useState } from 'react';
+import { useState } from 'react';
 import MailPoet from 'mailpoet';
 import ReactStringReplace from 'react-string-replace';
 
diff --git a/mailpoet/assets/js/src/wizard/welcome_wizard_controller.jsx b/mailpoet/assets/js/src/wizard/welcome_wizard_controller.jsx
index 9b7c451cdc..0caee53779 100644
--- a/mailpoet/assets/js/src/wizard/welcome_wizard_controller.jsx
+++ b/mailpoet/assets/js/src/wizard/welcome_wizard_controller.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React, { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { partial } from 'underscore';
 import MailPoet from 'mailpoet';
 import WelcomeWizardSenderStep from './steps/sender_step.jsx';
diff --git a/mailpoet/assets/js/src/wizard/wizard.jsx b/mailpoet/assets/js/src/wizard/wizard.jsx
index b1f3b510a9..e57e5f410a 100644
--- a/mailpoet/assets/js/src/wizard/wizard.jsx
+++ b/mailpoet/assets/js/src/wizard/wizard.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import {
   Route,
diff --git a/mailpoet/assets/js/src/wizard/woocommerce_controller.jsx b/mailpoet/assets/js/src/wizard/woocommerce_controller.jsx
index 2dc96ed536..9699a9522a 100644
--- a/mailpoet/assets/js/src/wizard/woocommerce_controller.jsx
+++ b/mailpoet/assets/js/src/wizard/woocommerce_controller.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React, { useState } from 'react';
+import { useState } from 'react';
 import MailPoet from 'mailpoet';
 import StepsContent from 'common/steps/steps_content.tsx';
 import WooCommerceStep from './steps/woo_commerce_step.jsx';