address feedback + cleanup

app/scripts/controllers/mmi-controller.ts

@@ -791,15 +791,10 @@ export default class MMIController extends EventEmitter {
     const updatedMsgParams = { ...msgParams, deferSetAsSigned: isCustodial };
 
     if (
-      req.method !== 'eth_signTypedData' &&
-      req.method !== 'eth_signTypedData_v3' &&
-      req.method !== 'eth_signTypedData_v4' &&
-      req.method !== 'personal_sign'
+      req.method === 'eth_signTypedData' ||
+      req.method === 'eth_signTypedData_v3' ||
+      req.method === 'eth_signTypedData_v4'
     ) {
-      throw new Error('Unexpected method');
-    }
-
-    if (req.method.includes('eth_signTypedData')) {
       return await this.signatureController.newUnsignedTypedMessage(
         updatedMsgParams as PersonalMessageParams,
         req as OriginalRequest,
@@ -812,7 +807,8 @@ export default class MMIController extends EventEmitter {
         req as OriginalRequest,
       );
     }
-    return undefined;
+
+    throw new Error('Unexpected method');
   }
 
   async handleSigningEvents(

app/scripts/metamask-controller.js

@@ -1798,8 +1798,6 @@ export default class MetamaskController extends EventEmitter {
           `${this.loggingController.name}:add`,
         ],
       }),
-      // TODO remove this option
-      isEthSignEnabled: () => false,
       getAllState: this.getState.bind(this),
       getCurrentChainId: () =>
         this.networkController.state.providerConfig.chainId,

ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js

@@ -51,7 +51,6 @@ import SnapLegacyAuthorshipHeader from '../../../../components/app/snaps/snap-le
 import InsightWarnings from '../../../../components/app/snaps/insight-warnings';
 import { BlockaidResultType } from '../../../../../shared/constants/security-provider';
 import { QueuedRequestsBannerAlert } from '../../confirmation/components/queued-requests-banner-alert';
-import SignatureRequestOriginalWarning from './signature-request-original-warning';
 
 export default class SignatureRequestOriginal extends Component {
   static contextTypes = {
@@ -87,7 +86,6 @@ export default class SignatureRequestOriginal extends Component {
   };
 
   state = {
-    showSignatureRequestWarning: false,
     showSignatureInsights: false,
   };
 
@@ -350,13 +348,7 @@ export default class SignatureRequestOriginal extends Component {
   };
 
   render = () => {
-    const {
-      messagesCount,
-      fromAccount: { address, name },
-      txData,
-      warnings,
-    } = this.props;
-    const { showSignatureRequestWarning } = this.state;
+    const { messagesCount, txData, warnings } = this.props;
     const { t } = this.context;
 
     const rejectNText = t('rejectRequestsN', [messagesCount]);
@@ -375,23 +367,7 @@ export default class SignatureRequestOriginal extends Component {
             <LedgerInstructionField showDataInstruction />
           </div>
         ) : null}
-        {showSignatureRequestWarning && (
-          <SignatureRequestOriginalWarning
-            senderAddress={address}
-            name={name}
-            onSubmit={async () => {
-              if (warnings?.length >= 1) {
-                return this.setState({
-                  showSignatureInsights: true,
-                  showSignatureRequestWarning: false,
-                });
-              }
 
-              return await this.onSubmit();
-            }}
-            onCancel={async (event) => await this.onCancel(event)}
-          />
-        )}
         {this.state.showSignatureInsights && (
           <InsightWarnings
             warnings={warnings}