From 7054dd669428592caf870292dd489cf7dc56b183 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 14 Sep 2022 13:02:04 -0230
Subject: [PATCH] Ensure approval warning for setApprovalForAll is not shown
 when revoking (#15806)

Co-authored-by: ryanml <ryanlanese@gmail.com>
---
 .../confirm-page-container.component.js                       | 4 +++-
 ui/pages/confirm-approve/confirm-approve.js                   | 1 +
 .../confirm-transaction-base.component.js                     | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js
index 8816d2e90..1da48f396 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js
@@ -97,6 +97,7 @@ export default class ConfirmPageContainer extends Component {
     nativeCurrency: PropTypes.string,
     showBuyModal: PropTypes.func,
     isBuyableChain: PropTypes.bool,
+    setApproveForAllArg: PropTypes.bool,
   };
 
   render() {
@@ -153,6 +154,7 @@ export default class ConfirmPageContainer extends Component {
       showBuyModal,
       isBuyableChain,
       networkIdentifier,
+      setApproveForAllArg,
     } = this.props;
 
     const showAddToAddressDialog =
@@ -306,7 +308,7 @@ export default class ConfirmPageContainer extends Component {
               <ErrorMessage errorKey={errorKey} />
             </div>
           )}
-          {isSetApproveForAll && (
+          {isSetApproveForAll && !setApproveForAllArg && (
             <Dialog type="error" className="confirm-page-container__dialog">
               {t('confirmPageDialogSetApprovalForAll')}
             </Dialog>
diff --git a/ui/pages/confirm-approve/confirm-approve.js b/ui/pages/confirm-approve/confirm-approve.js
index 1933d1b4f..59bac6bc1 100644
--- a/ui/pages/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirm-approve/confirm-approve.js
@@ -172,6 +172,7 @@ export default function ConfirmApprove({
           customTokenAmount={String(customPermissionAmount)}
           dappProposedTokenAmount={tokenAmount}
           currentTokenBalance={tokenBalance}
+          setApproveForAllArg={setApproveForAllArg}
           contentComponent={
             <TransactionModalContextProvider>
               <ConfirmApproveContent
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 acc2c0b54..c76d5ba11 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -151,6 +151,7 @@ export default class ConfirmTransactionBase extends Component {
     eip1559V2Enabled: PropTypes.bool,
     showBuyModal: PropTypes.func,
     isBuyableChain: PropTypes.bool,
+    setApproveForAllArg: PropTypes.bool,
   };
 
   state = {
@@ -1048,6 +1049,7 @@ export default class ConfirmTransactionBase extends Component {
       nativeCurrency,
       hardwareWalletRequiresConnection,
       image,
+      setApproveForAllArg,
     } = this.props;
     const {
       submitting,
@@ -1148,6 +1150,7 @@ export default class ConfirmTransactionBase extends Component {
           currentTransaction={txData}
           supportsEIP1559V2={this.supportsEIP1559V2}
           nativeCurrency={nativeCurrency}
+          setApproveForAllArg={setApproveForAllArg}
         />
       </TransactionModalContextProvider>
     );