From 0fdfdac505e2e4138bce3f8c02d5a109845ce3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Tavares?= Date: Fri, 10 May 2024 16:24:08 +0100 Subject: [PATCH] fix: desktop build (#24478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** REDESIGN_APPROVAL_TYPES and REDESIGN_TRANSACTION_TYPES should not be code fenced by blockaid. This is causing the desktop build to fail because it does not have the blockaid feature enable. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/24478?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/scripts/lib/createRPCMethodTrackingMiddleware.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js index cd8efcb49496..a175cf063aeb 100644 --- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js +++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js @@ -17,13 +17,12 @@ import { ///: BEGIN:ONLY_INCLUDE_IF(blockaid) import { SIGNING_METHODS } from '../../../shared/constants/transaction'; - +import { getBlockaidMetricsProps } from '../../../ui/helpers/utils/metrics'; +///: END:ONLY_INCLUDE_IF import { REDESIGN_APPROVAL_TYPES, REDESIGN_TRANSACTION_TYPES, } from '../../../ui/pages/confirmations/utils/confirm'; -import { getBlockaidMetricsProps } from '../../../ui/helpers/utils/metrics'; -///: END:ONLY_INCLUDE_IF import { getSnapAndHardwareInfoForMetrics } from './snap-keyring/metrics'; /**