fix merge conflict

MetaMask · Oct 4, 2023 · 05294a5 · 05294a5
1 parent efe4d8c
commit 05294a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/ui/components/app/transaction-alerts/transaction-alerts.js b/ui/components/app/transaction-alerts/transaction-alerts.js
@@ -27,7 +27,6 @@ import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import { TransactionType } from '../../../../shared/constants/transaction';
 import { parseStandardTokenTransactionData } from '../../../../shared/modules/transaction.utils';
 import { getTokenValueParam } from '../../../../shared/lib/metamask-controller-utils';
-import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
   ///: BEGIN:ONLY_INCLUDE_IN(blockaid)
   MetaMetricsEventCategory,
@@ -38,9 +37,8 @@ import {
 const TransactionAlerts = ({
   userAcknowledgedGasMissing,
   setUserAcknowledgedGasMissing,
-  txData,
   tokenSymbol,
-  onClickBlockaidSupport,
+  txData,
 }) => {
   const { estimateUsed, hasSimulationError, supportsEIP1559, isNetworkBusy } =
     useGasFeeContext();
@@ -159,9 +157,8 @@ const TransactionAlerts = ({
 TransactionAlerts.propTypes = {
   userAcknowledgedGasMissing: PropTypes.bool,
   setUserAcknowledgedGasMissing: PropTypes.func,
-  txData: PropTypes.object,
   tokenSymbol: PropTypes.string,
-  onClickBlockaidSupport: PropTypes.func,
+  txData: PropTypes.object,
 };
 
 export default TransactionAlerts;
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -326,9 +326,6 @@ export default class ConfirmTransactionBase extends Component {
       isBuyableChain,
       useCurrencyRateCheck,
       tokenSymbol,
-      actionKey,
-      txData: { origin },
-      methodData = {},
     } = this.props;
 
     const { t } = this.context;
@@ -468,7 +465,6 @@ export default class ConfirmTransactionBase extends Component {
           type={txData.type}
           isBuyableChain={isBuyableChain}
           tokenSymbol={tokenSymbol}
-          onClickBlockaidSupport={onClickBlockaidSupport}
         />
         <TransactionDetail
           disabled={isDisabled()}