diff --git a/mailpoet/assets/js/src/common/sender-email-address-warning.jsx b/mailpoet/assets/js/src/common/sender-email-address-warning.tsx
similarity index 88%
rename from mailpoet/assets/js/src/common/sender-email-address-warning.jsx
rename to mailpoet/assets/js/src/common/sender-email-address-warning.tsx
index fef3c22a2e..afb26df1e8 100644
--- a/mailpoet/assets/js/src/common/sender-email-address-warning.jsx
+++ b/mailpoet/assets/js/src/common/sender-email-address-warning.tsx
@@ -1,21 +1,28 @@
 import { useState } from 'react';
 import { __, _x } from '@wordpress/i18n';
+import { extractEmailDomain } from 'common/functions';
 import { MailPoet } from 'mailpoet';
-import PropTypes from 'prop-types';
-import { noop } from 'lodash';
 import ReactStringReplace from 'react-string-replace';
 import { AuthorizeSenderEmailAndDomainModal } from 'common/authorize-sender-email-and-domain-modal';
 
 const userHostDomain = window.location.hostname.replace('www.', '');
 const suggestedEmailAddress = `contact@${userHostDomain}`;
 
+type Props = {
+  emailAddress: string;
+  mssActive: boolean;
+  isEmailAuthorized?: boolean;
+  showSenderDomainWarning?: boolean;
+  onSuccessfulEmailOrDomainAuthorization?: (data) => void;
+};
+
 function SenderEmailAddressWarning({
   emailAddress,
   mssActive,
-  isEmailAuthorized,
-  showSenderDomainWarning,
-  onSuccessfulEmailOrDomainAuthorization,
-}) {
+  isEmailAuthorized = true,
+  showSenderDomainWarning = false,
+  onSuccessfulEmailOrDomainAuthorization = () => {},
+}: Props) {
   const [showAuthorizedEmailModal, setShowAuthorizedEmailModal] =
     useState(null);
 
@@ -28,7 +35,7 @@ function SenderEmailAddressWarning({
     setShowAuthorizedEmailModal(newTab);
   };
 
-  const emailAddressDomain = emailAddress.split('@').pop().toLowerCase();
+  const emailAddressDomain = extractEmailDomain(emailAddress);
 
   const displayElements = [];
 
@@ -164,18 +171,5 @@ function SenderEmailAddressWarning({
   return null;
 }
 
-SenderEmailAddressWarning.propTypes = {
-  emailAddress: PropTypes.string.isRequired,
-  mssActive: PropTypes.bool.isRequired,
-  isEmailAuthorized: PropTypes.bool,
-  showSenderDomainWarning: PropTypes.bool,
-  onSuccessfulEmailOrDomainAuthorization: PropTypes.func,
-};
-
-SenderEmailAddressWarning.defaultProps = {
-  isEmailAuthorized: true, // don't show error message by default
-  showSenderDomainWarning: false,
-  onSuccessfulEmailOrDomainAuthorization: noop,
-};
 SenderEmailAddressWarning.displayName = 'SenderEmailAddressWarning';
 export { SenderEmailAddressWarning };
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 578aa5499d..d4984f743b 100644
--- a/mailpoet/assets/js/src/newsletters/send/sender-address-field.jsx
+++ b/mailpoet/assets/js/src/newsletters/send/sender-address-field.jsx
@@ -2,7 +2,7 @@ import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { MailPoet } from 'mailpoet';
 import { FormFieldText } from 'form/fields/text.jsx';
-import { SenderEmailAddressWarning } from 'common/sender-email-address-warning.jsx';
+import { SenderEmailAddressWarning } from 'common/sender-email-address-warning.tsx';
 import {
   isFieldValid,
   addOrUpdateError,
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 8651330522..2243bfd62f 100644
--- a/mailpoet/assets/js/src/settings/pages/basics/default-sender.tsx
+++ b/mailpoet/assets/js/src/settings/pages/basics/default-sender.tsx
@@ -10,7 +10,7 @@ import {
 } from 'common/functions';
 import { Input } from 'common/form/input/input';
 import { useSetting, useSelector, useAction } from 'settings/store/hooks';
-import { SenderEmailAddressWarning } from 'common/sender-email-address-warning.jsx';
+import { SenderEmailAddressWarning } from 'common/sender-email-address-warning';
 import { checkSenderEmailDomainDmarcPolicy } from 'common/check-sender-domain-dmarc-policy';
 
 export function DefaultSender() {