Merge branch 'develop' into migrate-test-unit-global-to-jest

.github/scripts/add-team-label-to-pr.ts → .github/scripts/add-team-label.ts

@@ -16,11 +16,11 @@ async function main(): Promise<void> {
   // We can't use "GITHUB_TOKEN" here, as its permissions are scoped to the repository where the action is running.
   // "GITHUB_TOKEN" does not have access to other repositories, even when they belong to the same organization.
   // As we want to get files which are not necessarily located in the same repository,
-  // we need to create our own "RELEASE_LABEL_TOKEN" with "repo" permissions.
+  // we need to create our own "PERSONAL_ACCESS_TOKEN" with "repo" permissions.
   // Such a token allows to access other repositories of the MetaMask organisation.
-  const personalAccessToken = process.env.RELEASE_LABEL_TOKEN;
+  const personalAccessToken = process.env.PERSONAL_ACCESS_TOKEN;
   if (!personalAccessToken) {
-    core.setFailed('RELEASE_LABEL_TOKEN not found');
+    core.setFailed('PERSONAL_ACCESS_TOKEN not found');
     process.exit(1);
   }
 

.github/workflows/add-team-label.yml

@@ -1,4 +1,4 @@
-name: Add team label to PR when it is opened
+name: Add team label
 
 on:
   pull_request:
@@ -7,31 +7,6 @@ on:
 
 jobs:
   add-team-label:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/*'
-
-      - run: corepack enable
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-            fetch-depth: 0 # This is needed to checkout all branches
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn --immutable
-
-      - name: Add team label to PR
-        id: add-team-label-to-pr
-        env:
-          RELEASE_LABEL_TOKEN: ${{ secrets.RELEASE_LABEL_TOKEN }}
-        run: yarn run add-team-label-to-pr
+    uses: metamask/github-tools/.github/workflows/add-team-label.yml@main
+    secrets:
+      PERSONAL_ACCESS_TOKEN: ${{ secrets.RELEASE_LABEL_TOKEN }}

.github/workflows/run-integration-tests.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup environment
-        uses: ./.github/actions/setup-environment
+        uses: metamask/github-tools/.github/actions/setup-environment@main
 
       - name: test:integration:coverage
         run: yarn test:integration:coverage

.github/workflows/run-unit-tests.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup environment
-        uses: ./.github/actions/setup-environment
+        uses: metamask/github-tools/.github/actions/setup-environment@main
 
       - name: test:unit:coverage
         run: yarn test:unit:coverage --shard=${{ matrix.shard }}/${{ strategy.job-total }}

app/scripts/lib/accounts/BalancesController.test.ts

@@ -19,9 +19,7 @@ import { BalancesTracker } from './BalancesTracker';
 const mockBtcAccount = createMockInternalAccount({
   address: '',
   name: 'Btc Account',
-  // @ts-expect-error - account type may be btc or eth, mock file is not typed
   type: BtcAccountType.P2wpkh,
-  // @ts-expect-error - snap options is not typed and defaults to undefined
   snapOptions: {
     id: 'mock-btc-snap',
     name: 'mock-btc-snap',

app/scripts/lib/accounts/BalancesTracker.test.ts

@@ -8,9 +8,7 @@ const MOCK_TIMESTAMP = 1709983353;
 const mockBtcAccount = createMockInternalAccount({
   address: '',
   name: 'Btc Account',
-  // @ts-expect-error - account type may be btc or eth, mock file is not typed
   type: BtcAccountType.P2wpkh,
-  // @ts-expect-error - snap options is not typed and defaults to undefined
   snapOptions: {
     id: 'mock-btc-snap',
     name: 'mock-btc-snap',

package.json

@@ -109,7 +109,7 @@
     "generate-beta-commit": "node ./development/generate-beta-commit.js",
     "validate-branch-name": "validate-branch-name",
     "add-release-label-to-pr-and-linked-issues": "ts-node ./.github/scripts/add-release-label-to-pr-and-linked-issues.ts",
-    "add-team-label-to-pr": "ts-node ./.github/scripts/add-team-label-to-pr.ts",
+    "add-team-label": "ts-node ./.github/scripts/add-team-label.ts",
     "check-pr-has-required-labels": "ts-node ./.github/scripts/check-pr-has-required-labels.ts",
     "close-release-bug-report-issue": "ts-node ./.github/scripts/close-release-bug-report-issue.ts",
     "check-template-and-add-labels": "ts-node ./.github/scripts/check-template-and-add-labels.ts",

shared/constants/custody.ts

@@ -0,0 +1,8 @@
+export enum AccountType {
+  CUSTODY = 'custody',
+}
+
+export enum CustodyStatus {
+  CREATED = 'created',
+  ABORTED = 'aborted',
+}

test/e2e/flask/btc/btc-dapp-connection.spec.ts

@@ -1,4 +1,3 @@
-import { strict as assert } from 'assert';
 import { Suite } from 'mocha';
 import {
   withFixtures,
@@ -32,15 +31,9 @@ describe('BTC Account - Dapp Connection', function (this: Suite) {
         await driver.waitUntilXWindowHandles(3);
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
-        const account2 = await driver.waitForSelector(
+        await driver.assertElementNotPresent(
           '[data-testid="choose-account-list-1"]',
         );
-        assert((await account2.getText()).includes('Bitcoin Ac...'));
-        await account2.click();
-        const nextButton = await driver.waitForSelector(
-          '[data-testid="page-container-footer-next"]',
-        );
-        assert.equal(await nextButton.isEnabled(), false);
       },
     );
   });

test/jest/mocks.js → test/jest/mocks.ts

@@ -3,6 +3,7 @@ import {
   EthMethod,
   BtcMethod,
   BtcAccountType,
+  InternalAccount,
 } from '@metamask/keyring-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
 import { v4 as uuidv4 } from 'uuid';
@@ -11,6 +12,7 @@ import {
   draftTransactionInitialState,
   initialState,
 } from '../../ui/ducks/send';
+import { MetaMaskReduxState } from '../../ui/store/store';
 
 export const MOCK_DEFAULT_ADDRESS =
   '0xd5e099c71b797516c10ed0f0d895f429c2781111';
@@ -131,7 +133,9 @@ export const INITIAL_SEND_STATE_FOR_EXISTING_DRAFT = {
   },
 };
 
-export const getInitialSendStateWithExistingTxState = (draftTxState) => ({
+// TODO: Define the type of draftTxState
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const getInitialSendStateWithExistingTxState = (draftTxState: any) => ({
   ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
   draftTransactions: {
     'test-uuid': {
@@ -171,11 +175,21 @@ export const getInitialSendStateWithExistingTxState = (draftTxState) => ({
 });
 
 export function createMockInternalAccount({
+  name = 'Account 1',
   address = MOCK_DEFAULT_ADDRESS,
-  name,
   type = EthAccountType.Eoa,
   keyringType = KeyringTypes.hd,
   snapOptions = undefined,
+}: {
+  name?: string;
+  address?: string;
+  type?: string;
+  keyringType?: string;
+  snapOptions?: {
+    enabled: boolean;
+    name: string;
+    id: string;
+  };
 } = {}) {
   let methods;
 
@@ -221,7 +235,9 @@ export function createMockInternalAccount({
   };
 }
 
-export const getSelectedInternalAccountFromMockState = (state) => {
+export const getSelectedInternalAccountFromMockState = (
+  state: MetaMaskReduxState,
+): InternalAccount => {
   return state.metamask.internalAccounts.accounts[
     state.metamask.internalAccounts.selectedAccount
   ];

ui/components/app/modals/nickname-popovers/nickname-popovers.component.test.tsx

@@ -20,7 +20,6 @@ const mockAccount = createMockInternalAccount({
 const mockNonEvmAccount = createMockInternalAccount({
   name: 'Account 1',
   address: 'bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq',
-  // @ts-expect-error type not defined in js file
   type: BtcAccountType.P2wpkh,
 });
 

ui/components/app/selected-account/selected-account.component.js

@@ -9,6 +9,7 @@ import { SECOND } from '../../../../shared/constants/time';
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
+import { AccountType } from '../../../../shared/constants/custody';
 import CustodyLabels from '../../institutional/custody-labels/custody-labels';
 ///: END:ONLY_INCLUDE_IF
 import { Icon, IconName, IconSize, Text } from '../../component-library';
@@ -81,7 +82,7 @@ class SelectedAccount extends Component {
 
     const showCustodyLabels =
       getEnvironmentType() !== ENVIRONMENT_TYPE_POPUP &&
-      accountType === 'custody' &&
+      accountType === AccountType.CUSTODY &&
       custodyLabels;
 
     const tooltipText = this.state.copied

ui/components/app/transaction-status-label/transaction-status-label.js

@@ -5,6 +5,9 @@ import { TransactionStatus } from '@metamask/transaction-controller';
 import Tooltip from '../../ui/tooltip';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { TransactionGroupStatus } from '../../../../shared/constants/transaction';
+///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+import { CustodyStatus } from '../../../../shared/constants/custody';
+///: END:ONLY_INCLUDE_IF
 
 const QUEUED_PSEUDO_STATUS = 'queued';
 const SIGNING_PSUEDO_STATUS = 'signing';
@@ -84,7 +87,7 @@ export default function TransactionStatusLabel({
     if (error) {
       tooltipText = error.message;
       statusText =
-        custodyStatus === 'aborted'
+        custodyStatus === CustodyStatus.ABORTED
           ? custodyStatusDisplayText
           : t('snapResultError');
     } else {