From 24a4a54214fefc1f14ff51b6d8fad9d3b26468fa Mon Sep 17 00:00:00 2001 From: Micaela Estabillo Date: Fri, 17 Oct 2025 18:01:17 -0700 Subject: [PATCH 1/7] chore: bump controllers --- package.json | 8 +++----- yarn.lock | 54 +++++++++++++++++++--------------------------------- 2 files changed, 23 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 659d2d9c006f..e17bd24a1b06 100644 --- a/package.json +++ b/package.json @@ -184,9 +184,7 @@ "@expo/fingerprint": "^0.15.0", "appwright@^0.1.45": "patch:appwright@npm%3A0.1.45#./.yarn/patches/appwright-npm-0.1.45-f282bc1c1b.patch", "@scure/bip32": "1.7.0", - "@metamask/snaps-sdk": "^10.0.0", - "@metamask/bridge-status-controller@^47.2.0": "patch:@metamask/bridge-status-controller@npm%3A47.2.0#./.yarn/patches/@metamask-bridge-status-controller-npm-47.2.0-1c8660e896.patch", - "@metamask/bridge-status-controller@^50.0.0": "patch:@metamask/bridge-status-controller@npm%3A50.1.0#./.yarn/patches/@metamask-bridge-status-controller-npm-50.1.0-308ed9262e.patch" + "@metamask/snaps-sdk": "^10.0.0" }, "dependencies": { "@config-plugins/detox": "^9.0.0", @@ -210,8 +208,8 @@ "@metamask/assets-controllers": "^81.0.1", "@metamask/base-controller": "^8.3.0", "@metamask/bitcoin-wallet-snap": "^1.3.0", - "@metamask/bridge-controller": "^50.0.0", - "@metamask/bridge-status-controller": "^50.0.0", + "@metamask/bridge-controller": "^53.0.0", + "@metamask/bridge-status-controller": "^52.0.0", "@metamask/chain-agnostic-permission": "^1.1.0", "@metamask/composable-controller": "^11.0.0", "@metamask/controller-utils": "^11.11.0", diff --git a/yarn.lock b/yarn.lock index 5e324592e771..44a6e7eb6b9e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7024,9 +7024,9 @@ __metadata: languageName: node linkType: hard -"@metamask/bridge-controller@npm:^50.0.0": - version: 50.0.0 - resolution: "@metamask/bridge-controller@npm:50.0.0" +"@metamask/bridge-controller@npm:^53.0.0": + version: 53.0.0 + resolution: "@metamask/bridge-controller@npm:53.0.0" dependencies: "@ethersproject/address": ^5.7.0 "@ethersproject/bignumber": ^5.7.0 @@ -7041,23 +7041,24 @@ __metadata: "@metamask/multichain-network-controller": ^1.0.1 "@metamask/polling-controller": ^14.0.1 "@metamask/utils": ^11.8.1 + "@microsoft/fetch-event-source": ^2.0.1 bignumber.js: ^9.1.2 reselect: ^5.1.1 uuid: ^8.3.2 peerDependencies: "@metamask/accounts-controller": ^33.0.0 - "@metamask/assets-controllers": ^80.0.0 + "@metamask/assets-controllers": ^81.0.0 "@metamask/network-controller": ^24.0.0 "@metamask/remote-feature-flag-controller": ^1.6.0 "@metamask/snaps-controllers": ^14.0.0 "@metamask/transaction-controller": ^60.0.0 - checksum: e0b114f4ba57e7f52906505d175ac55c3236e7b5821496bcc8ff5dbba17fce152a883670e89870e772deeeedecd5022fffa5de0e69d438d7d15b2076ccfdf9e4 + checksum: 37717d93250c9983716ce348ed72f3e38e072ac05f4532115ab7f1ab422b07c920bbafd3cf921aa6032af76a21a777cd27ae73eb4849d3b3be5c3e8abedf12e8 languageName: node linkType: hard -"@metamask/bridge-status-controller@npm:50.1.0": - version: 50.1.0 - resolution: "@metamask/bridge-status-controller@npm:50.1.0" +"@metamask/bridge-status-controller@npm:^52.0.0": + version: 52.0.0 + resolution: "@metamask/bridge-status-controller@npm:52.0.0" dependencies: "@metamask/base-controller": ^8.4.1 "@metamask/controller-utils": ^11.14.1 @@ -7068,34 +7069,12 @@ __metadata: uuid: ^8.3.2 peerDependencies: "@metamask/accounts-controller": ^33.0.0 - "@metamask/bridge-controller": ^51.0.0 + "@metamask/bridge-controller": ^53.0.0 "@metamask/gas-fee-controller": ^24.0.0 "@metamask/network-controller": ^24.0.0 "@metamask/snaps-controllers": ^14.0.0 "@metamask/transaction-controller": ^60.0.0 - checksum: a39547856c3fc0e4574eb75f882a96b3eb7c38a3cb80f68938b5bb994d7252dc98507b2ad7b7e495591627382ed0e4d9f1c44961b9fee52d23736f85f59020b5 - languageName: node - linkType: hard - -"@metamask/bridge-status-controller@patch:@metamask/bridge-status-controller@npm%3A50.1.0#./.yarn/patches/@metamask-bridge-status-controller-npm-50.1.0-308ed9262e.patch::locator=metamask%40workspace%3A.": - version: 50.1.0 - resolution: "@metamask/bridge-status-controller@patch:@metamask/bridge-status-controller@npm%3A50.1.0#./.yarn/patches/@metamask-bridge-status-controller-npm-50.1.0-308ed9262e.patch::version=50.1.0&hash=31ccdf&locator=metamask%40workspace%3A." - dependencies: - "@metamask/base-controller": ^8.4.1 - "@metamask/controller-utils": ^11.14.1 - "@metamask/polling-controller": ^14.0.1 - "@metamask/superstruct": ^3.1.0 - "@metamask/utils": ^11.8.1 - bignumber.js: ^9.1.2 - uuid: ^8.3.2 - peerDependencies: - "@metamask/accounts-controller": ^33.0.0 - "@metamask/bridge-controller": ^51.0.0 - "@metamask/gas-fee-controller": ^24.0.0 - "@metamask/network-controller": ^24.0.0 - "@metamask/snaps-controllers": ^14.0.0 - "@metamask/transaction-controller": ^60.0.0 - checksum: f33d27da587bf350d442aa55d61509e46f043db92da37cff8c08c5c078dd3812355c8abea3fc7745133c7bbf2a3885ad7f8aff359c7f199c50cde1f1060b33b4 + checksum: 3964bca0c03614187a10af8a9e3cf1fcc0a6b8af986a42bc0ee53c4660dc35677e29e4526f849187fa1cb347924c3114640fbb0dd45bdb04e6d3c3ef7b4a1252 languageName: node linkType: hard @@ -8921,6 +8900,13 @@ __metadata: languageName: node linkType: hard +"@microsoft/fetch-event-source@npm:^2.0.1": + version: 2.0.1 + resolution: "@microsoft/fetch-event-source@npm:2.0.1" + checksum: a50e1c0f33220206967266d0a4bbba0703e2793b079d9f6e6bfd48f71b2115964a803e14cf6e902c6fab321edc084f26022334f5eaacc2cec87f174715d41852 + languageName: node + linkType: hard + "@mobily/ts-belt@npm:^3.13.1": version: 3.13.1 resolution: "@mobily/ts-belt@npm:3.13.1" @@ -34075,8 +34061,8 @@ __metadata: "@metamask/assets-controllers": ^81.0.1 "@metamask/base-controller": ^8.3.0 "@metamask/bitcoin-wallet-snap": ^1.3.0 - "@metamask/bridge-controller": ^50.0.0 - "@metamask/bridge-status-controller": ^50.0.0 + "@metamask/bridge-controller": ^53.0.0 + "@metamask/bridge-status-controller": ^52.0.0 "@metamask/browser-passworder": ^5.0.0 "@metamask/build-utils": ^1.0.0 "@metamask/chain-agnostic-permission": ^1.1.0 From a56cad821f666ae26d9bb13c76dee0c3ce0a4d5e Mon Sep 17 00:00:00 2001 From: Micaela Estabillo Date: Mon, 20 Oct 2025 08:52:23 -0700 Subject: [PATCH 2/7] chore: remove patches --- ...ge-status-controller-npm-47.2.0-1c8660e896.patch | 13 ------------- ...ge-status-controller-npm-50.1.0-308ed9262e.patch | 13 ------------- 2 files changed, 26 deletions(-) delete mode 100644 .yarn/patches/@metamask-bridge-status-controller-npm-47.2.0-1c8660e896.patch delete mode 100644 .yarn/patches/@metamask-bridge-status-controller-npm-50.1.0-308ed9262e.patch diff --git a/.yarn/patches/@metamask-bridge-status-controller-npm-47.2.0-1c8660e896.patch b/.yarn/patches/@metamask-bridge-status-controller-npm-47.2.0-1c8660e896.patch deleted file mode 100644 index d17233ba90b6..000000000000 --- a/.yarn/patches/@metamask-bridge-status-controller-npm-47.2.0-1c8660e896.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dist/utils/swap-received-amount.cjs b/dist/utils/swap-received-amount.cjs -index 4c01024e3ebba952b0bbded0aa7bb7e2690629f1..4809ec09ab2b94fc0dbb5160d464da4dab61c57e 100644 ---- a/dist/utils/swap-received-amount.cjs -+++ b/dist/utils/swap-received-amount.cjs -@@ -28,7 +28,7 @@ const getReceivedERC20Amount = (historyItem, txMeta) => { - const TOKEN_TRANSFER_LOG_TOPIC_HASH = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef'; - const tokenTransferLog = txReceipt.logs.find((txReceiptLog) => { - const isTokenTransfer = txReceiptLog.topics && -- txReceiptLog.topics[0].startsWith(TOKEN_TRANSFER_LOG_TOPIC_HASH); -+ txReceiptLog.topics[0]?.startsWith(TOKEN_TRANSFER_LOG_TOPIC_HASH); - const isTransferFromGivenToken = txReceiptLog.address?.toLowerCase() === - quote.destAsset.address?.toLowerCase(); - const isTransferFromGivenAddress = txReceiptLog.topics && diff --git a/.yarn/patches/@metamask-bridge-status-controller-npm-50.1.0-308ed9262e.patch b/.yarn/patches/@metamask-bridge-status-controller-npm-50.1.0-308ed9262e.patch deleted file mode 100644 index d17233ba90b6..000000000000 --- a/.yarn/patches/@metamask-bridge-status-controller-npm-50.1.0-308ed9262e.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dist/utils/swap-received-amount.cjs b/dist/utils/swap-received-amount.cjs -index 4c01024e3ebba952b0bbded0aa7bb7e2690629f1..4809ec09ab2b94fc0dbb5160d464da4dab61c57e 100644 ---- a/dist/utils/swap-received-amount.cjs -+++ b/dist/utils/swap-received-amount.cjs -@@ -28,7 +28,7 @@ const getReceivedERC20Amount = (historyItem, txMeta) => { - const TOKEN_TRANSFER_LOG_TOPIC_HASH = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef'; - const tokenTransferLog = txReceipt.logs.find((txReceiptLog) => { - const isTokenTransfer = txReceiptLog.topics && -- txReceiptLog.topics[0].startsWith(TOKEN_TRANSFER_LOG_TOPIC_HASH); -+ txReceiptLog.topics[0]?.startsWith(TOKEN_TRANSFER_LOG_TOPIC_HASH); - const isTransferFromGivenToken = txReceiptLog.address?.toLowerCase() === - quote.destAsset.address?.toLowerCase(); - const isTransferFromGivenAddress = txReceiptLog.topics && From 71343b36e404b334f0718f12bf4ea6ed2f1ffbf7 Mon Sep 17 00:00:00 2001 From: Micaela Estabillo Date: Mon, 20 Oct 2025 14:28:44 -0700 Subject: [PATCH 3/7] chore: bump bridge-status-controller --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4c4cbe9dc4bd..a8394c873b3d 100644 --- a/package.json +++ b/package.json @@ -209,7 +209,7 @@ "@metamask/base-controller": "^8.3.0", "@metamask/bitcoin-wallet-snap": "^1.3.0", "@metamask/bridge-controller": "^53.0.0", - "@metamask/bridge-status-controller": "^52.0.0", + "@metamask/bridge-status-controller": "^52.1.0", "@metamask/chain-agnostic-permission": "^1.1.0", "@metamask/composable-controller": "^11.0.0", "@metamask/controller-utils": "^11.11.0", diff --git a/yarn.lock b/yarn.lock index 76883b4f1425..8e968ca0d6c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7056,9 +7056,9 @@ __metadata: languageName: node linkType: hard -"@metamask/bridge-status-controller@npm:^52.0.0": - version: 52.0.0 - resolution: "@metamask/bridge-status-controller@npm:52.0.0" +"@metamask/bridge-status-controller@npm:^52.1.0": + version: 52.1.0 + resolution: "@metamask/bridge-status-controller@npm:52.1.0" dependencies: "@metamask/base-controller": ^8.4.1 "@metamask/controller-utils": ^11.14.1 @@ -7074,7 +7074,7 @@ __metadata: "@metamask/network-controller": ^24.0.0 "@metamask/snaps-controllers": ^14.0.0 "@metamask/transaction-controller": ^60.0.0 - checksum: 3964bca0c03614187a10af8a9e3cf1fcc0a6b8af986a42bc0ee53c4660dc35677e29e4526f849187fa1cb347924c3114640fbb0dd45bdb04e6d3c3ef7b4a1252 + checksum: a427121a8c3c168bae1d2cc2babb875dc4bce3ba8b0c0d21a09fbc4c4865fdaa73a2df2686d0798431f652918f64c3ef456dd1ee85525092c2287de406e7b332 languageName: node linkType: hard @@ -34062,7 +34062,7 @@ __metadata: "@metamask/base-controller": ^8.3.0 "@metamask/bitcoin-wallet-snap": ^1.3.0 "@metamask/bridge-controller": ^53.0.0 - "@metamask/bridge-status-controller": ^52.0.0 + "@metamask/bridge-status-controller": ^52.1.0 "@metamask/browser-passworder": ^5.0.0 "@metamask/build-utils": ^3.0.0 "@metamask/chain-agnostic-permission": ^1.1.0 From 06d7f8fedfb41bc8387097a942cef06b7b3c9d06 Mon Sep 17 00:00:00 2001 From: Micaela Estabillo Date: Tue, 21 Oct 2025 11:28:18 -0700 Subject: [PATCH 4/7] chore: bump bridge controller --- package.json | 2 +- yarn.lock | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index ba4947a3a800..73b01d0a6a8c 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,7 @@ "@metamask/assets-controllers": "^81.0.1", "@metamask/base-controller": "^8.3.0", "@metamask/bitcoin-wallet-snap": "^1.3.0", - "@metamask/bridge-controller": "^53.0.0", + "@metamask/bridge-controller": "^53.1.0", "@metamask/bridge-status-controller": "^52.1.0", "@metamask/chain-agnostic-permission": "^1.1.0", "@metamask/composable-controller": "^11.0.0", diff --git a/yarn.lock b/yarn.lock index 7a7fd6d58f6e..e875396df921 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7024,9 +7024,9 @@ __metadata: languageName: node linkType: hard -"@metamask/bridge-controller@npm:^53.0.0": - version: 53.0.0 - resolution: "@metamask/bridge-controller@npm:53.0.0" +"@metamask/bridge-controller@npm:^53.1.0": + version: 53.1.0 + resolution: "@metamask/bridge-controller@npm:53.1.0" dependencies: "@ethersproject/address": ^5.7.0 "@ethersproject/bignumber": ^5.7.0 @@ -7041,7 +7041,6 @@ __metadata: "@metamask/multichain-network-controller": ^1.0.1 "@metamask/polling-controller": ^14.0.1 "@metamask/utils": ^11.8.1 - "@microsoft/fetch-event-source": ^2.0.1 bignumber.js: ^9.1.2 reselect: ^5.1.1 uuid: ^8.3.2 @@ -7052,7 +7051,7 @@ __metadata: "@metamask/remote-feature-flag-controller": ^1.6.0 "@metamask/snaps-controllers": ^14.0.0 "@metamask/transaction-controller": ^60.0.0 - checksum: 37717d93250c9983716ce348ed72f3e38e072ac05f4532115ab7f1ab422b07c920bbafd3cf921aa6032af76a21a777cd27ae73eb4849d3b3be5c3e8abedf12e8 + checksum: 527aa7d7996dc3d778d770e1abf777ac38ec7a31a0c537b4a670f6a49f3e5f68a341fbe8b923f2b3c1dd5f1b00be70462126563360bb2191d635d977c20d4b24 languageName: node linkType: hard @@ -8900,13 +8899,6 @@ __metadata: languageName: node linkType: hard -"@microsoft/fetch-event-source@npm:^2.0.1": - version: 2.0.1 - resolution: "@microsoft/fetch-event-source@npm:2.0.1" - checksum: a50e1c0f33220206967266d0a4bbba0703e2793b079d9f6e6bfd48f71b2115964a803e14cf6e902c6fab321edc084f26022334f5eaacc2cec87f174715d41852 - languageName: node - linkType: hard - "@mobily/ts-belt@npm:^3.13.1": version: 3.13.1 resolution: "@mobily/ts-belt@npm:3.13.1" @@ -34054,7 +34046,7 @@ __metadata: "@metamask/assets-controllers": ^81.0.1 "@metamask/base-controller": ^8.3.0 "@metamask/bitcoin-wallet-snap": ^1.3.0 - "@metamask/bridge-controller": ^53.0.0 + "@metamask/bridge-controller": ^53.1.0 "@metamask/bridge-status-controller": ^52.1.0 "@metamask/browser-passworder": ^5.0.0 "@metamask/build-utils": ^3.0.0 From 4e464e693a8398dcd1d4fc02cb92f534ee952adf Mon Sep 17 00:00:00 2001 From: Micaela Estabillo Date: Tue, 21 Oct 2025 11:35:34 -0700 Subject: [PATCH 5/7] chore: update yarn.lock --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4865e07fcfc2..542359d5d2a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7051,7 +7051,7 @@ __metadata: "@metamask/remote-feature-flag-controller": ^1.6.0 "@metamask/snaps-controllers": ^14.0.0 "@metamask/transaction-controller": ^60.0.0 - checksum: 10/527aa7d7996dc3d778d770e1abf777ac38ec7a31a0c537b4a670f6a49f3e5f68a341fbe8b923f2b3c1dd5f1b00be70462126563360bb2191d635d977c20d4b24 + checksum: 10/17ce073b19da5c7c58aaf177ca63d4fda615817612c88fb7d3c1e5ed2d14aee398e67cf808f5f9ecfe1af31c361684efddbf1cc51b73dd4964e1ffce15ff5316 languageName: node linkType: hard @@ -7073,7 +7073,7 @@ __metadata: "@metamask/network-controller": ^24.0.0 "@metamask/snaps-controllers": ^14.0.0 "@metamask/transaction-controller": ^60.0.0 - checksum: 10/a427121a8c3c168bae1d2cc2babb875dc4bce3ba8b0c0d21a09fbc4c4865fdaa73a2df2686d0798431f652918f64c3ef456dd1ee85525092c2287de406e7b332 + checksum: 10/4f7ba286ff38c94f814d507b973f66a023a3c85dd88c47d30a7ac559921fdd38332d6b2a88ca5b07b697332b4ab47bd12a5ab8e6b4616096b884a017ac70deea languageName: node linkType: hard From b06eb14085ac92790b5f23b63d699d00644c04f1 Mon Sep 17 00:00:00 2001 From: Micaela Estabillo Date: Tue, 21 Oct 2025 12:32:44 -0700 Subject: [PATCH 6/7] chore: bump bridge-status-controller and deprecate client QuoteResponse type --- .../Views/BridgeView/BridgeView.blockaid.test.tsx | 3 +-- app/components/UI/Bridge/types.ts | 9 --------- app/util/bridge/hooks/useSubmitBridgeTx.test.tsx | 3 +-- app/util/bridge/hooks/useSubmitBridgeTx.ts | 3 +-- app/util/bridge/hooks/useValidateBridgeTx.ts | 3 +-- package.json | 2 +- yarn.lock | 10 +++++----- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/app/components/UI/Bridge/Views/BridgeView/BridgeView.blockaid.test.tsx b/app/components/UI/Bridge/Views/BridgeView/BridgeView.blockaid.test.tsx index 630566553701..b052b66d0d09 100644 --- a/app/components/UI/Bridge/Views/BridgeView/BridgeView.blockaid.test.tsx +++ b/app/components/UI/Bridge/Views/BridgeView/BridgeView.blockaid.test.tsx @@ -1,6 +1,5 @@ import { act } from '@testing-library/react-hooks'; -import { QuoteResponse } from '../../types'; -import { QuoteMetadata } from '@metamask/bridge-controller'; +import { QuoteMetadata, QuoteResponse } from '@metamask/bridge-controller'; /** * Unit tests for the blockaid validation logic. diff --git a/app/components/UI/Bridge/types.ts b/app/components/UI/Bridge/types.ts index 783ea46b2d05..7e30490d4931 100644 --- a/app/components/UI/Bridge/types.ts +++ b/app/components/UI/Bridge/types.ts @@ -1,5 +1,4 @@ import { Asset } from '@metamask/assets-controllers'; -import { TxData, Quote } from '@metamask/bridge-controller'; import { Hex, CaipChainId } from '@metamask/utils'; // This is slightly different from the BridgeToken type in @metamask/bridge-controller @@ -20,14 +19,6 @@ export interface BridgeToken { accountType?: Asset['accountType']; } -// TODO: use type from @metamask/bridge-controller once "approval" is made optional -export interface QuoteResponse { - quote: Quote; - approval?: TxData | null; - trade: TxData; - estimatedProcessingTimeInSeconds: number; -} - export enum BridgeViewMode { Swap = 'Swap', Bridge = 'Bridge', diff --git a/app/util/bridge/hooks/useSubmitBridgeTx.test.tsx b/app/util/bridge/hooks/useSubmitBridgeTx.test.tsx index 560e632ab503..96d6fabebc4d 100644 --- a/app/util/bridge/hooks/useSubmitBridgeTx.test.tsx +++ b/app/util/bridge/hooks/useSubmitBridgeTx.test.tsx @@ -8,8 +8,7 @@ import { DummyQuotesNoApproval, DummyQuotesWithApproval, } from '../../../../e2e/api-mocking/mock-responses/bridge-api-quotes'; -import { QuoteResponse } from '../../../components/UI/Bridge/types'; -import { QuoteMetadata } from '@metamask/bridge-controller'; +import { QuoteMetadata, QuoteResponse } from '@metamask/bridge-controller'; import { backgroundState } from '../../test/initial-root-state'; import { TransactionMeta } from '@metamask/transaction-controller'; import { selectSourceWalletAddress } from '../../../selectors/bridge'; diff --git a/app/util/bridge/hooks/useSubmitBridgeTx.ts b/app/util/bridge/hooks/useSubmitBridgeTx.ts index dad9ddd4ffc0..c46062044154 100644 --- a/app/util/bridge/hooks/useSubmitBridgeTx.ts +++ b/app/util/bridge/hooks/useSubmitBridgeTx.ts @@ -1,6 +1,5 @@ -import { QuoteResponse } from '../../../components/UI/Bridge/types'; import Engine from '../../../core/Engine'; -import { QuoteMetadata } from '@metamask/bridge-controller'; +import { QuoteMetadata, QuoteResponse } from '@metamask/bridge-controller'; import { useSelector } from 'react-redux'; import { selectShouldUseSmartTransaction } from '../../../selectors/smartTransactionsController'; import { selectSourceWalletAddress } from '../../../selectors/bridge'; diff --git a/app/util/bridge/hooks/useValidateBridgeTx.ts b/app/util/bridge/hooks/useValidateBridgeTx.ts index 36b071cb50e0..e18fbd09c332 100644 --- a/app/util/bridge/hooks/useValidateBridgeTx.ts +++ b/app/util/bridge/hooks/useValidateBridgeTx.ts @@ -1,5 +1,4 @@ -import { QuoteResponse } from '../../../components/UI/Bridge/types'; -import { QuoteMetadata } from '@metamask/bridge-controller'; +import { QuoteMetadata, QuoteResponse } from '@metamask/bridge-controller'; import { useSelector } from 'react-redux'; import { SolMethod } from '@metamask/keyring-api'; import { selectSelectedInternalAccount } from '../../../selectors/accountsController'; diff --git a/package.json b/package.json index 324c1b74649d..23683e3e57cc 100644 --- a/package.json +++ b/package.json @@ -209,7 +209,7 @@ "@metamask/base-controller": "^8.3.0", "@metamask/bitcoin-wallet-snap": "^1.3.0", "@metamask/bridge-controller": "^53.1.0", - "@metamask/bridge-status-controller": "^52.1.0", + "@metamask/bridge-status-controller": "^53.0.0", "@metamask/chain-agnostic-permission": "^1.1.0", "@metamask/composable-controller": "^11.0.0", "@metamask/controller-utils": "^11.11.0", diff --git a/yarn.lock b/yarn.lock index 542359d5d2a7..442303216334 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7055,9 +7055,9 @@ __metadata: languageName: node linkType: hard -"@metamask/bridge-status-controller@npm:^52.1.0": - version: 52.1.0 - resolution: "@metamask/bridge-status-controller@npm:52.1.0" +"@metamask/bridge-status-controller@npm:^53.0.0": + version: 53.0.0 + resolution: "@metamask/bridge-status-controller@npm:53.0.0" dependencies: "@metamask/base-controller": "npm:^8.4.1" "@metamask/controller-utils": "npm:^11.14.1" @@ -7073,7 +7073,7 @@ __metadata: "@metamask/network-controller": ^24.0.0 "@metamask/snaps-controllers": ^14.0.0 "@metamask/transaction-controller": ^60.0.0 - checksum: 10/4f7ba286ff38c94f814d507b973f66a023a3c85dd88c47d30a7ac559921fdd38332d6b2a88ca5b07b697332b4ab47bd12a5ab8e6b4616096b884a017ac70deea + checksum: 10/8f66cdbd2283c802702072d1d6057e832f027fbcc022b1d3edfabb60877fdb079091a4f031576f5453cc7bf11f73347c454d4d7e7bb78f2792a25b9197763072 languageName: node linkType: hard @@ -34064,7 +34064,7 @@ __metadata: "@metamask/base-controller": "npm:^8.3.0" "@metamask/bitcoin-wallet-snap": "npm:^1.3.0" "@metamask/bridge-controller": "npm:^53.1.0" - "@metamask/bridge-status-controller": "npm:^52.1.0" + "@metamask/bridge-status-controller": "npm:^53.0.0" "@metamask/browser-passworder": "npm:^5.0.0" "@metamask/build-utils": "npm:^3.0.0" "@metamask/chain-agnostic-permission": "npm:^1.1.0" From aade4d326f49baa19a53a34df801d08d8e993497 Mon Sep 17 00:00:00 2001 From: Micaela Estabillo Date: Tue, 21 Oct 2025 12:36:08 -0700 Subject: [PATCH 7/7] fix: mm-pay trade type --- .../hooks/transactions/useTransactionConfirm.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts index 0c41c5ac9a3a..df6c9ac07f53 100644 --- a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts +++ b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts @@ -24,6 +24,7 @@ import { TransactionBridgeQuote } from '../../utils/bridge'; import { Hex, createProjectLogger } from '@metamask/utils'; import { toHex } from '@metamask/controller-utils'; import { useSelectedGasFeeToken } from '../gas/useGasFeeToken'; +import { type TxData } from '@metamask/bridge-controller'; const log = createProjectLogger('transaction-confirm'); @@ -188,7 +189,7 @@ function getQuoteBatchTransactions( } result.push({ - ...getQuoteBatchTransaction(quote.trade), + ...getQuoteBatchTransaction(quote.trade as TxData), type: TransactionType.swap, }); @@ -196,9 +197,7 @@ function getQuoteBatchTransactions( }); } -function getQuoteBatchTransaction( - transaction: TransactionBridgeQuote['trade'], -): BatchTransaction { +function getQuoteBatchTransaction(transaction: TxData): BatchTransaction { const data = transaction.data as Hex; const gas = transaction.gasLimit ? toHex(transaction.gasLimit) : undefined; const to = transaction.to as Hex;