fix (cherry-pick): Fix #24322 - Disable edits for all dapp initiated …

…transactions (#24334) (#24354) Cherry picks 4a1853c (#24322) to v11.14.5 Co-authored-by: David Walsh <[email protected]>
MetaMask · May 2, 2024 · 949e733 · 949e733
1 parent 2d9f5f7
commit 949e733
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 34 deletions.
diff --git a/test/e2e/tests/dapp-interactions/dapp-tx-edit.spec.js b/test/e2e/tests/dapp-interactions/dapp-tx-edit.spec.js
@@ -56,7 +56,7 @@ describe('Editing confirmations of dapp initiated contract interactions', functi
     );
   });
 
-  it('should show an edit button on a simple ETH send initiated by a dapp', async function () {
+  it('should NOT show an edit button on a simple ETH send initiated by a dapp', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -88,8 +88,8 @@ describe('Editing confirmations of dapp initiated contract interactions', functi
         );
         assert.equal(
           editTransactionButton,
-          true,
-          `Edit transaction button should be visible on a contract interaction created by a dapp`,
+          false,
+          `Edit transaction button should not be visible on a simple send transaction created by a dapp`,
         );
       },
     );

diff --git a/...m-page-container/confirm-page-container-header/confirm-page-container-header.component.js b/...m-page-container/confirm-page-container-header/confirm-page-container-header.component.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import {
   ENVIRONMENT_TYPE_POPUP,
   ENVIRONMENT_TYPE_NOTIFICATION,
+  ORIGIN_METAMASK,
 } from '../../../../../../shared/constants/app';
 import { getEnvironmentType } from '../../../../../../app/scripts/lib/util';
 import NetworkDisplay from '../../../../../components/app/network-display';
@@ -18,6 +19,7 @@ export default function ConfirmPageContainerHeader({
   accountAddress,
   showAccountInHeader,
   children,
+  origin,
 }) {
   const t = useI18nContext();
   const windowType = getEnvironmentType();
@@ -48,21 +50,23 @@ export default function ConfirmPageContainerHeader({
             <AccountMismatchWarning address={accountAddress} />
           </div>
         ) : (
-          <div
-            className="confirm-page-container-header__back-button-container"
-            style={{
-              visibility: showEdit ? 'initial' : 'hidden',
-            }}
-          >
-            <Icon name={IconName.ArrowLeft} />
-            <span
-              data-testid="confirm-page-back-edit-button"
-              className="confirm-page-container-header__back-button"
-              onClick={() => onEdit()}
+          origin === ORIGIN_METAMASK && (
+            <div
+              className="confirm-page-container-header__back-button-container"
+              style={{
+                visibility: showEdit ? 'initial' : 'hidden',
+              }}
             >
-              {t('edit')}
-            </span>
-          </div>
+              <Icon name={IconName.ArrowLeft} />
+              <span
+                data-testid="confirm-page-back-edit-button"
+                className="confirm-page-container-header__back-button"
+                onClick={() => onEdit()}
+              >
+                {t('edit')}
+              </span>
+            </div>
+          )
         )}
         {isFullScreen ? null : <NetworkDisplay />}
       </div>
@@ -77,4 +81,5 @@ ConfirmPageContainerHeader.propTypes = {
   showEdit: PropTypes.bool,
   onEdit: PropTypes.func,
   children: PropTypes.node,
+  origin: PropTypes.string,
 };
diff --git a/...e-container/confirm-page-container-header/confirm-page-container-header.component.test.js b/...e-container/confirm-page-container-header/confirm-page-container-header.component.test.js
@@ -2,6 +2,7 @@ import React from 'react';
 import configureStore from 'redux-mock-store';
 import { NetworkStatus } from '@metamask/network-controller';
 import { NetworkType } from '@metamask/controller-utils';
+import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
 import { getEnvironmentType } from '../../../../../../app/scripts/lib/util';
 import ConfirmPageContainerHeader from '.';
@@ -38,6 +39,7 @@ describe('Confirm Detail Row Component', () => {
       onEdit: jest.fn(),
       showAccountInHeader: false,
       accountAddress: '0xmockAccountAddress',
+      origin: ORIGIN_METAMASK,
     };
 
     const { container } = renderWithProvider(
@@ -56,6 +58,7 @@ describe('Confirm Detail Row Component', () => {
       onEdit: jest.fn(),
       showAccountInHeader: false,
       accountAddress: '0xmockAccountAddress',
+      origin: ORIGIN_METAMASK,
     };
 
     const { container } = renderWithProvider(

diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js
@@ -219,6 +219,7 @@ const ConfirmPageContainer = (props) => {
             onEdit={() => onEdit()}
             showAccountInHeader={showAccountInHeader}
             accountAddress={fromAddress}
+            origin={origin}
           >
             {hideSenderToRecipient ? null : (
               <SenderToRecipient

diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
@@ -78,23 +78,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
     >
       <div
         class="confirm-page-container-header__row"
-      >
-        <div
-          class="confirm-page-container-header__back-button-container"
-          style="visibility: initial;"
-        >
-          <span
-            class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
-            style="mask-image: url('./images/icons/arrow-left.svg');"
-          />
-          <span
-            class="confirm-page-container-header__back-button"
-            data-testid="confirm-page-back-edit-button"
-          >
-            Edit
-          </span>
-        </div>
-      </div>
+      />
       <div
         class="sender-to-recipient sender-to-recipient--default"
         data-testid="sender-to-recipient"