diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js index 993a7eb738cd..be48015a56fc 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js @@ -60,30 +60,26 @@ export default class ConfirmPageContainerContent extends Component { }; renderContent() { - const { - detailsComponent, - dataComponent, - ///: BEGIN:ONLY_INCLUDE_IN(flask) - insightComponent, - ///: END:ONLY_INCLUDE_IN - } = this.props; + const { detailsComponent, dataComponent } = this.props; - if (detailsComponent && dataComponent) { + ///: BEGIN:ONLY_INCLUDE_IN(flask) + const { insightComponent } = this.props; + + if (insightComponent && (detailsComponent || dataComponent)) { return this.renderTabs(); } + ///: END:ONLY_INCLUDE_IN - ///: BEGIN:ONLY_INCLUDE_IN(flask) - if ((detailsComponent || dataComponent) && insightComponent) { + if (detailsComponent && dataComponent) { return this.renderTabs(); } - ///: END:ONLY_INCLUDE_IN return ( detailsComponent || - dataComponent || ///: BEGIN:ONLY_INCLUDE_IN(flask) - insightComponent + insightComponent || ///: END:ONLY_INCLUDE_IN + dataComponent ); } 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 a932cf41f730..39361bd7aebb 100644 --- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js +++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js @@ -49,7 +49,7 @@ import GasDetailsItem from '../../components/app/gas-details-item'; import GasTiming from '../../components/app/gas-timing/gas-timing.component'; import LedgerInstructionField from '../../components/app/ledger-instruction-field'; import MultiLayerFeeMessage from '../../components/app/multilayer-fee-message'; - +import Typography from '../../components/ui/typography/typography'; import { COLORS, FONT_STYLE, @@ -62,19 +62,19 @@ import { removePollingTokenFromAppState, } from '../../store/actions'; -import Typography from '../../components/ui/typography/typography'; import { MIN_GAS_LIMIT_DEC } from '../send/send.constants'; + +///: BEGIN:ONLY_INCLUDE_IN(flask) +import { SnapInsight } from '../../components/app/confirm-page-container/flask/snap-insight.component'; +import { DropdownTab, Tab } from '../../components/ui/tabs'; +///: END:ONLY_INCLUDE_IN + import { NETWORK_TO_NAME_MAP, ///: BEGIN:ONLY_INCLUDE_IN(flask) CHAIN_ID_TO_NETWORK_ID_MAP, ///: END:ONLY_INCLUDE_IN } from '../../../shared/constants/network'; -///: BEGIN:ONLY_INCLUDE_IN(flask) -import { SnapInsight } from '../../components/app/confirm-page-container/flask/snap-insight.component'; -import { DropdownTab, Tab } from '../../components/ui/tabs'; -///: END:ONLY_INCLUDE_IN - import TransactionAlerts from './transaction-alerts'; const renderHeartBeatIfNotInTest = () =>