From 074c2934fec63f7670cc0e2e81a3890b01c5c72e Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 16 Dec 2022 13:37:18 -0330
Subject: [PATCH] remove warning on revoke approval for all nfts (#16953)

Co-authored-by: EresDev <eresdev@hotmail.com>
---
 test/e2e/tests/collectibles.spec.js                       | 1 -
 .../confirm-page-container.component.js                   | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/e2e/tests/collectibles.spec.js b/test/e2e/tests/collectibles.spec.js
index b00ee7100..c8e5484fb 100644
--- a/test/e2e/tests/collectibles.spec.js
+++ b/test/e2e/tests/collectibles.spec.js
@@ -260,7 +260,6 @@ describe('Collectibles', function () {
 
         // Confirm disabling set approval for all
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement({ text: 'Approve', tag: 'button' });
 
         await driver.waitUntilXWindowHandles(2);
         await driver.switchToWindow(extension);
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 bf04534e1..3827b68f8 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
@@ -109,6 +109,7 @@ export default class ConfirmPageContainer extends Component {
     supportsEIP1559: PropTypes.bool,
     nativeCurrency: PropTypes.string,
     isBuyableChain: PropTypes.bool,
+    isApprovalOrRejection: PropTypes.bool,
   };
 
   async componentDidMount() {
@@ -186,6 +187,7 @@ export default class ConfirmPageContainer extends Component {
       ///: END:ONLY_INCLUDE_IN
       accountBalance,
       assetStandard,
+      isApprovalOrRejection,
     } = this.props;
 
     const shouldDisplayWarning =
@@ -354,7 +356,11 @@ export default class ConfirmPageContainer extends Component {
             <PageContainerFooter
               onCancel={onCancel}
               cancelText={t('reject')}
-              onSubmit={isSetApproveForAll ? onSetApprovalForAll : onSubmit}
+              onSubmit={
+                isSetApproveForAll && isApprovalOrRejection
+                  ? onSetApprovalForAll
+                  : onSubmit
+              }
               submitText={t('confirm')}
               submitButtonType={
                 isSetApproveForAll ? 'danger-primary' : 'primary'