Merge branch 'main' into feat/tat-1662-trade-fee-does-not-adjust-for-market-or-limit-order-maker-or-taker

Author: Matt561

.github/scripts/package.json

@@ -25,7 +25,7 @@
     "ts-node": "^10.5.0",
     "typescript": "~5.4.5"
   },
-  "packageManager": "yarn@3.8.7",
+  "packageManager": "yarn@4.10.3",
   "lavamoat": {
     "allowScripts": {
       "@lavamoat/preinstall-always-fail": false,

.github/scripts/yarn.lock

@@ -46,7 +46,7 @@ jobs:
       - name: Enable Corepack and setup Yarn
         run: |
           corepack enable
-          corepack prepare yarn@3.8.7 --activate
+          corepack prepare yarn@4.10.3 --activate
 
       - name: Install JavaScript dependencies with retry
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2

.github/workflows/run-e2e-api-specs.yml

@@ -1,5 +1,38 @@
+diff --git a/dist/bridge-status-controller.cjs b/dist/bridge-status-controller.cjs
+index 6aabde7229d9c6ce349b148a16b5e8857f9670be..52f87a160c701c8e38dabf74b5043b9781fad9f5 100644
+--- a/dist/bridge-status-controller.cjs
++++ b/dist/bridge-status-controller.cjs
+@@ -334,6 +334,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
+                     }
+                     if (status.status === bridge_controller_1.StatusTypes.COMPLETE) {
+                         __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, bridgeTxMetaId);
++                        this.messagingSystem.publish('BridgeStatusController:destinationTransactionCompleted', historyItem.quote.destAsset.assetId);
+                     }
+                     if (status.status === bridge_controller_1.StatusTypes.FAILED) {
+                         __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, bridgeTxMetaId);
+diff --git a/dist/types.d.cts b/dist/types.d.cts
+index 047c064a382ba909ef1801aeb2b46fbbdc0991c0..287eb8459fa4e75744b7e575d2330547cf8c561a 100644
+--- a/dist/types.d.cts
++++ b/dist/types.d.cts
+@@ -176,7 +176,15 @@ export type BridgeStatusControllerRestartPollingForFailedAttemptsAction = Bridge
+ export type BridgeStatusControllerGetBridgeHistoryItemByTxMetaIdAction = BridgeStatusControllerAction<BridgeStatusAction.GET_BRIDGE_HISTORY_ITEM_BY_TX_META_ID>;
+ export type BridgeStatusControllerActions = BridgeStatusControllerStartPollingForBridgeTxStatusAction | BridgeStatusControllerWipeBridgeStatusAction | BridgeStatusControllerResetStateAction | BridgeStatusControllerGetStateAction | BridgeStatusControllerSubmitTxAction | BridgeStatusControllerRestartPollingForFailedAttemptsAction | BridgeStatusControllerGetBridgeHistoryItemByTxMetaIdAction;
+ export type BridgeStatusControllerStateChangeEvent = ControllerStateChangeEvent<typeof BRIDGE_STATUS_CONTROLLER_NAME, BridgeStatusControllerState>;
+-export type BridgeStatusControllerEvents = BridgeStatusControllerStateChangeEvent;
++/**
+++ * This event is published when the destination bridge transaction is completed
+++ * The payload is the asset received on the destination chain
+++ */
++export type BridgeStatusControllerDestinationTransactionCompletedEvent = {
++    type: 'BridgeStatusController:destinationTransactionCompleted';
++    payload: [CaipAssetType];
++};
++export type BridgeStatusControllerEvents = BridgeStatusControllerStateChangeEvent | BridgeStatusControllerDestinationTransactionCompletedEvent;
+ /**
+  * The external actions available to the BridgeStatusController.
+  */
 diff --git a/dist/utils/swap-received-amount.cjs b/dist/utils/swap-received-amount.cjs
-index 4c01024e3ebba952b0bbded0aa7bb7e2690629f1..4809ec09ab2b94fc0dbb5160d464da4dab61c57e 100644
+index 4c01024e3ebba952b0bbded0aa7bb7e2690629f1..4c41504ce0609d8b7be1f6b045d0ac3e66447646 100644
 --- a/dist/utils/swap-received-amount.cjs
 +++ b/dist/utils/swap-received-amount.cjs
 @@ -28,7 +28,7 @@ const getReceivedERC20Amount = (historyItem, txMeta) => {

.yarn/patches/@metamask-bridge-status-controller-npm-47.2.0-1c8660e896.patch

@@ -1,3 +1,7 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 enableScripts: false
 
 nodeLinker: node-modules
@@ -9,4 +13,4 @@ npmAuditIgnoreAdvisories:
   # The affected versions <6.0.6, is only present in wdio which is a dev dependency
   - 1104663
 
-yarnPath: .yarn/releases/yarn-3.8.7.cjs
+yarnPath: .yarn/releases/yarn-4.10.3.cjs

.yarn/patches/@metamask-bridge-status-controller-npm-50.1.0-308ed9262e.patch

@@ -29,7 +29,7 @@ import {
 import { createAccountGroupDetailsNavigationDetails } from '../../../../components/Views/MultichainAccounts/sheets/MultichainAccountActions/MultichainAccountActions';
 import { getNetworkImageSource } from '../../../../util/networks';
 import { formatChainIdToCaip } from '@metamask/bridge-controller';
-import { formatAddress } from '../../../../util/address';
+import { renderShortAddress } from '../../../../util/address';
 
 interface AccountCellProps {
   accountGroup: AccountGroupObject;
@@ -90,10 +90,7 @@ const AccountCell = ({
     const internalAccountFromAccountGroupForChainId =
       getInternalAccountByAccountGroupAndScope(caipChainId, accountGroup.id);
     networkAccountAddress = internalAccountFromAccountGroupForChainId?.address
-      ? formatAddress(
-          internalAccountFromAccountGroupForChainId.address,
-          'short',
-        )
+      ? renderShortAddress(internalAccountFromAccountGroupForChainId.address, 4)
       : undefined;
     networkImageSource = getNetworkImageSource({ chainId });
   }

.yarn/releases/yarn-3.8.7.cjs

@@ -814,7 +814,7 @@ describe('MultichainAccountSelectorList', () => {
 
       expect(queryByText('Account 2')).toBeTruthy();
     });
-    it('renders a far selected account in the initial viewport when provided as initial selection', () => {
+    it('renders a far selected account in the initial viewport when provided as initial selection', async () => {
       // Create many accounts so the selected one is far enough to require initialScrollIndex
       const total = 60;
       const accounts = Array.from({ length: total }, (_, i) =>
@@ -834,7 +834,14 @@ describe('MultichainAccountSelectorList', () => {
         { state: createMockState([wallet1], internalAccounts) },
       );
 
-      // Without initialScrollIndex, this would not be visible initially
+      // Wait for requestAnimationFrame to execute the scroll
+      await act(async () => {
+        await new Promise((resolve) =>
+          requestAnimationFrame(() => resolve(undefined)),
+        );
+      });
+
+      // After scroll, the selected account should be visible
       expect(queryByText(`Account ${selectedIdx + 1}`)).toBeTruthy();
       expect(queryByText('Account 1')).toBeFalsy();
     });