process.env.IN_TEST ? null :
;
@@ -108,7 +110,6 @@ export default class ConfirmTransactionBase extends Component {
contentComponent: PropTypes.node,
dataComponent: PropTypes.node,
dataHexComponent: PropTypes.node,
- hideSubtitle: PropTypes.bool,
tokenAddress: PropTypes.string,
customTokenAmount: PropTypes.string,
dappProposedTokenAmount: PropTypes.string,
@@ -837,38 +838,24 @@ export default class ConfirmTransactionBase extends Component {
renderTitleComponent() {
const { title, hexTransactionAmount, txData } = this.props;
- // Title string passed in by props takes priority
- if (title) {
- return null;
- }
-
- const isContractInteraction =
- txData.type === TransactionType.contractInteraction;
-
return (
-
);
}
renderSubtitleComponent() {
- const { subtitleComponent, hexTransactionAmount } = this.props;
+ const { subtitleComponent, hexTransactionAmount, txData } = this.props;
return (
- subtitleComponent || (
-
- )
+
);
}
@@ -946,8 +933,6 @@ export default class ConfirmTransactionBase extends Component {
toEns,
toNickname,
methodData,
- title,
- hideSubtitle,
tokenAddress,
contentComponent,
onEdit,
@@ -1024,11 +1009,9 @@ export default class ConfirmTransactionBase extends Component {
toNickname={toNickname}
showEdit={!isContractInteractionFromDapp && Boolean(onEdit)}
action={functionType}
- title={title}
image={image}
titleComponent={this.renderTitleComponent()}
subtitleComponent={this.renderSubtitleComponent()}
- hideSubtitle={hideSubtitle}
detailsComponent={this.renderDetails()}
dataComponent={this.renderData(functionType)}
dataHexComponent={this.renderDataHex(functionType)}
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
index 12078cc87e7f..9abc1ee22fa4 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -63,7 +63,6 @@ import {
TransactionStatus,
TransactionType,
} from '../../../shared/constants/transaction';
-import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
import { getTokenAddressParam } from '../../helpers/utils/token-util';
import { calcGasTotal } from '../../../shared/lib/transactions-controller-utils';
import ConfirmTransactionBase from './confirm-transaction-base.component';
@@ -105,8 +104,6 @@ const mapStateToProps = (state, ownProps) => {
network,
unapprovedTxs,
nextNonce,
- allNftContracts,
- selectedAddress,
provider: { chainId },
} = metamask;
const { tokenData, txData, tokenProps, nonce } = confirmTransaction;
@@ -184,12 +181,6 @@ const mapStateToProps = (state, ownProps) => {
customTxParamsData,
);
- const isNftTransfer = Boolean(
- allNftContracts?.[selectedAddress]?.[chainId]?.find((contract) => {
- return isEqualCaseInsensitive(contract.address, fullTxData.txParams.to);
- }),
- );
-
customNonceValue = getCustomNonceValue(state);
const isEthGasPrice = getIsEthGasPriceFetched(state);
const noGasPrice = !supportsEIP1559 && getNoGasPriceFetched(state);
@@ -235,7 +226,6 @@ const mapStateToProps = (state, ownProps) => {
useNonceField: getUseNonceField(state),
customNonceValue,
insufficientBalance,
- hideSubtitle: !getShouldShowFiat(state) && !isNftTransfer,
hideFiatConversion: !getShouldShowFiat(state),
type,
nextNonce,
diff --git a/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap b/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
index 5bf39129d3db..c2776a7c728d 100644
--- a/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
+++ b/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
@@ -6,18 +6,18 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
class="box page-container box--padding-top-8 box--padding-right-4 box--padding-bottom-8 box--padding-left-4 box--gap-4 box--flex-direction-row"
>
Secret Recovery Phrase
The
provides
full access to your wallet and funds.
@@ -36,13 +36,13 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
MetaMask is a
Make sure no one is looking at your screen.
MetaMask Support will never request this.
@@ -80,7 +80,7 @@ exports[`Reveal Seed Page should match snapshot 1`] = `