diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js
index 89c855a71..aec9b8ca2 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js
@@ -39,7 +39,6 @@ describe('Confirm Page Container Content', () => {
action: ' Withdraw Stake',
errorMessage: null,
errorKey: null,
- hasSimulationError: true,
onCancelAll: mockOnCancelAll,
onCancel: mockOnCancel,
cancelText: 'Reject',
@@ -52,38 +51,7 @@ describe('Confirm Page Container Content', () => {
};
});
- it('render ConfirmPageContainer component with simulation error', async () => {
- const { queryByText, getByText } = renderWithProvider(
-
,
- store,
- );
-
- expect(
- queryByText('Transaction Error. Exception thrown in contract code.'),
- ).not.toBeInTheDocument();
- expect(
- queryByText(
- 'This transaction is expected to fail. Trying to execute it is expected to be expensive but fail, and is not recommended.',
- ),
- ).toBeInTheDocument();
- expect(queryByText('I will try anyway')).toBeInTheDocument();
-
- const confirmButton = getByText('Confirm');
- expect(getByText('Confirm').closest('button')).toBeDisabled();
- fireEvent.click(confirmButton);
- expect(props.onSubmit).toHaveBeenCalledTimes(0);
-
- const iWillTryButton = getByText('I will try anyway');
- fireEvent.click(iWillTryButton);
- expect(props.setUserAcknowledgedGasMissing).toHaveBeenCalledTimes(1);
-
- const cancelButton = getByText('Reject');
- fireEvent.click(cancelButton);
- expect(props.onCancel).toHaveBeenCalledTimes(1);
- });
-
it('render ConfirmPageContainer component with another error', async () => {
- props.hasSimulationError = false;
props.disabled = true;
props.errorKey = TRANSACTION_ERROR_KEY;
props.currentTransaction = {
@@ -96,10 +64,10 @@ describe('Confirm Page Container Content', () => {
expect(
queryByText(
- 'This transaction is expected to fail. Trying to execute it is expected to be expensive but fail, and is not recommended.',
+ 'We were not able to estimate gas. There might be an error in the contract and this transaction may fail.',
),
).not.toBeInTheDocument();
- expect(queryByText('I will try anyway')).not.toBeInTheDocument();
+ expect(queryByText('I want to proceed anyway')).not.toBeInTheDocument();
expect(getByText('Confirm').closest('button')).toBeDisabled();
expect(
getByText('Transaction Error. Exception thrown in contract code.'),
@@ -111,7 +79,6 @@ describe('Confirm Page Container Content', () => {
});
it('render ConfirmPageContainer component with no errors', async () => {
- props.hasSimulationError = false;
props.disabled = false;
const { queryByText, getByText } = renderWithProvider(
,
@@ -120,13 +87,13 @@ describe('Confirm Page Container Content', () => {
expect(
queryByText(
- 'This transaction is expected to fail. Trying to execute it is expected to be expensive but fail, and is not recommended.',
+ 'We were not able to estimate gas. There might be an error in the contract and this transaction may fail.',
),
).not.toBeInTheDocument();
expect(
queryByText('Transaction Error. Exception thrown in contract code.'),
).not.toBeInTheDocument();
- expect(queryByText('I will try anyway')).not.toBeInTheDocument();
+ expect(queryByText('I want to proceed anyway')).not.toBeInTheDocument();
const confirmButton = getByText('Confirm');
fireEvent.click(confirmButton);
@@ -138,7 +105,6 @@ describe('Confirm Page Container Content', () => {
});
it('render contract address name from addressBook in title for contract', async () => {
- props.hasSimulationError = false;
props.disabled = false;
props.toAddress = '0x06195827297c7A80a443b6894d3BDB8824b43896';
props.transactionType = TRANSACTION_TYPES.CONTRACT_INTERACTION;
@@ -151,7 +117,6 @@ describe('Confirm Page Container Content', () => {
});
it('render simple title without address name for simple send', async () => {
- props.hasSimulationError = false;
props.disabled = false;
props.toAddress = '0x06195827297c7A80a443b6894d3BDB8824b43896';
props.transactionType = TRANSACTION_TYPES.SIMPLE_SEND;
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 097aa7f25..c008bc8cc 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -560,13 +560,18 @@ export default class ConfirmTransactionBase extends Component {
const simulationFailureWarning = () => (
this.setUserAcknowledgedGasMissing(),
- }}
- message={this.context.t('simulationErrorMessage')}
- roundedButtons
+ primaryActionV2={
+ userAcknowledgedGasMissing === true
+ ? undefined
+ : {
+ label: t('proceedWithTransaction'),
+ onClick: () => this.setUserAcknowledgedGasMissing(),
+ }
+ }
/>
);
@@ -593,7 +598,9 @@ export default class ConfirmTransactionBase extends Component {
: () => this.handleEditGas()
}
rows={[
- renderSimulationFailureWarning && simulationFailureWarning(),
+ renderSimulationFailureWarning &&
+ !this.supportsEIP1559V2 &&
+ simulationFailureWarning(),
!renderSimulationFailureWarning &&
!isMultiLayerFeeNetwork &&
renderGasDetailsItem(),
@@ -1034,10 +1041,6 @@ export default class ConfirmTransactionBase extends Component {
requestsWaitingText,
} = this.getNavigateTxData();
- const isDisabled = () => {
- return userAcknowledgedGasMissing ? false : !valid;
- };
-
let functionType;
if (txData.type === TRANSACTION_TYPES.CONTRACT_INTERACTION) {
functionType = getMethodName(name);
@@ -1089,7 +1092,6 @@ export default class ConfirmTransactionBase extends Component {
lastTx={lastTx}
ofText={ofText}
requestsWaitingText={requestsWaitingText}
- hideUserAcknowledgedGasMissing={!isDisabled()}
disabled={
renderSimulationFailureWarning ||
!valid ||
@@ -1101,7 +1103,6 @@ export default class ConfirmTransactionBase extends Component {
onCancelAll={() => this.handleCancelAll()}
onCancel={() => this.handleCancel()}
onSubmit={() => this.handleSubmit()}
- setUserAcknowledgedGasMissing={this.setUserAcknowledgedGasMissing}
hideSenderToRecipient={hideSenderToRecipient}
origin={txData.origin}
ethGasPriceWarning={ethGasPriceWarning}