From 16d77c9f7c61e25d524e68701b8a8d49f5d26259 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 4 Aug 2022 16:01:08 -0230
Subject: [PATCH 1/2] Prevent confirm screen from showing method name from
 contract registry for txes created within MetaMask

---
 .../confirm-transaction-base.component.js                    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
index 704880c6ca0e..6ff85abe70cc 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -1054,7 +1054,10 @@ export default class ConfirmTransactionBase extends Component {
     } = this.getNavigateTxData();
 
     let functionType;
-    if (txData.type === TRANSACTION_TYPES.CONTRACT_INTERACTION) {
+    if (
+      txData.type === TRANSACTION_TYPES.CONTRACT_INTERACTION &&
+      txData.origin !== 'metamask'
+    ) {
       functionType = getMethodName(name);
     }
 

From 6fb0efb4af0e8fb6e2a22653901c2f579c774cbd Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 4 Aug 2022 16:31:39 -0230
Subject: [PATCH 2/2] Ensure method name does not get sent in state when
 sending to a contract, with tx data, from metamask send screen

---
 .../confirm-transaction.component.js                 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui/pages/confirm-transaction/confirm-transaction.component.js b/ui/pages/confirm-transaction/confirm-transaction.component.js
index 01e876fdb3ae..fb853741f45e 100644
--- a/ui/pages/confirm-transaction/confirm-transaction.component.js
+++ b/ui/pages/confirm-transaction/confirm-transaction.component.js
@@ -68,7 +68,7 @@ export default class ConfirmTransaction extends Component {
       sendTo,
       history,
       mostRecentOverviewPage,
-      transaction: { txParams: { data } = {} } = {},
+      transaction: { txParams: { data } = {}, origin } = {},
       getContractMethodData,
       transactionId,
       paramsTransactionId,
@@ -91,7 +91,9 @@ export default class ConfirmTransaction extends Component {
       return;
     }
 
-    getContractMethodData(data);
+    if (origin !== 'metamask') {
+      getContractMethodData(data);
+    }
 
     const txId = transactionId || paramsTransactionId;
     if (txId) {
@@ -107,7 +109,7 @@ export default class ConfirmTransaction extends Component {
   componentDidUpdate(prevProps) {
     const {
       setTransactionToConfirm,
-      transaction: { txData: { txParams: { data } = {} } = {} },
+      transaction: { txData: { txParams: { data } = {}, origin } = {} },
       clearConfirmTransaction,
       getContractMethodData,
       paramsTransactionId,
@@ -124,8 +126,10 @@ export default class ConfirmTransaction extends Component {
       prevProps.paramsTransactionId !== paramsTransactionId
     ) {
       clearConfirmTransaction();
-      getContractMethodData(data);
       setTransactionToConfirm(paramsTransactionId);
+      if (origin !== 'metamask') {
+        getContractMethodData(data);
+      }
     } else if (
       prevProps.transactionId &&
       !transactionId &&