diff --git a/packages/bridge-status-controller/CHANGELOG.md b/packages/bridge-status-controller/CHANGELOG.md index 682c652f687..e119f391843 100644 --- a/packages/bridge-status-controller/CHANGELOG.md +++ b/packages/bridge-status-controller/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump `@metamask/bridge-controller` dependency to `^11.0.0` ([#5525](https://github.com/MetaMask/core/pull/5525)) +- **BREAKING:** Change controller to fetch multichain address instead of EVM ([#5554](https://github.com/MetaMask/core/pull/5540)) ## [10.0.0] diff --git a/packages/bridge-status-controller/src/bridge-status-controller.test.ts b/packages/bridge-status-controller/src/bridge-status-controller.test.ts index 7deece524bf..71c59da8fd2 100644 --- a/packages/bridge-status-controller/src/bridge-status-controller.test.ts +++ b/packages/bridge-status-controller/src/bridge-status-controller.test.ts @@ -377,7 +377,7 @@ const getMessengerMock = ({ } = {}) => ({ call: jest.fn((method: string) => { - if (method === 'AccountsController:getSelectedAccount') { + if (method === 'AccountsController:getSelectedMultichainAccount') { return { address: account }; } else if (method === 'NetworkController:findNetworkClientIdByChainId') { return 'networkClientId'; @@ -572,7 +572,7 @@ describe('BridgeStatusController', () => { const messengerMock = { call: jest.fn((method: string) => { - if (method === 'AccountsController:getSelectedAccount') { + if (method === 'AccountsController:getSelectedMultichainAccount') { return { address: '0xaccount1' }; } else if ( method === 'NetworkController:findNetworkClientIdByChainId' @@ -730,7 +730,7 @@ describe('BridgeStatusController', () => { const messengerMock = { call: jest.fn((method: string) => { - if (method === 'AccountsController:getSelectedAccount') { + if (method === 'AccountsController:getSelectedMultichainAccount') { return { address: '0xaccount1' }; } else if ( method === 'NetworkController:findNetworkClientIdByChainId' @@ -812,18 +812,18 @@ describe('BridgeStatusController', () => { // Setup jest.useFakeTimers(); - let getSelectedAccountCalledTimes = 0; + let getSelectedMultichainAccountCalledTimes = 0; const messengerMock = { call: jest.fn((method: string) => { - if (method === 'AccountsController:getSelectedAccount') { + if (method === 'AccountsController:getSelectedMultichainAccount') { let account; - if (getSelectedAccountCalledTimes === 0) { + if (getSelectedMultichainAccountCalledTimes === 0) { account = '0xaccount1'; } else { account = '0xaccount2'; } - getSelectedAccountCalledTimes += 1; + getSelectedMultichainAccountCalledTimes += 1; return { address: account }; } else if ( method === 'NetworkController:findNetworkClientIdByChainId' @@ -905,7 +905,7 @@ describe('BridgeStatusController', () => { jest.useFakeTimers(); const messengerMock = { call: jest.fn((method: string) => { - if (method === 'AccountsController:getSelectedAccount') { + if (method === 'AccountsController:getSelectedMultichainAccount') { return { address: '0xaccount1' }; } else if ( method === 'NetworkController:findNetworkClientIdByChainId' @@ -1001,7 +1001,7 @@ describe('BridgeStatusController', () => { jest.useFakeTimers(); const messengerMock = { call: jest.fn((method: string) => { - if (method === 'AccountsController:getSelectedAccount') { + if (method === 'AccountsController:getSelectedMultichainAccount') { return { address: '0xaccount1' }; } else if ( method === 'NetworkController:findNetworkClientIdByChainId' diff --git a/packages/bridge-status-controller/src/bridge-status-controller.ts b/packages/bridge-status-controller/src/bridge-status-controller.ts index 1b7ef7f94c8..3398b8b4a68 100644 --- a/packages/bridge-status-controller/src/bridge-status-controller.ts +++ b/packages/bridge-status-controller/src/bridge-status-controller.ts @@ -176,8 +176,7 @@ export class BridgeStatusController extends StaticIntervalPollingController