Skip to content

release(runway): cherry-pick fix: restore institutional snap entrypoint cp-13.5.0 #36573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 7, 2025
+61 −9
Merged

release(runway): cherry-pick fix: restore institutional snap entrypoint cp-13.5.0 #36573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fb77a4
release(runway): cherry-pick fix: restore institutional snap entrypoi…
shane-t Oct 3, 2025
947c6f1
release: dedupe, update LavaMoat policies, update attributions
metamaskbot Oct 3, 2025
21cebee
Merge branch 'release/13.5.0' into runway-cherry-pick-13.5.0-1759503429
gauthierpetetin Oct 7, 2025
65cbf2a
Merge branch 'release/13.5.0' into runway-cherry-pick-13.5.0-1759503429
gauthierpetetin Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 43 additions & 9 deletions ui/components/multichain-accounts/add-wallet-modal/add-wallet-modal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import { screen, fireEvent } from '@testing-library/react';
import { renderWithProvider } from '../../../../test/jest';
import { useSelector } from 'react-redux';
import { renderWithProvider } from '../../../../test/lib/render-helpers';
import {
ADD_WALLET_PAGE_ROUTE,
CONNECT_HARDWARE_ROUTE,
Expand All @@ -10,6 +11,7 @@ import { AddWalletModal } from './add-wallet-modal';

const mockHistoryPush = jest.fn();
const mockOpenExtensionInBrowser = jest.fn();
const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Mocking Issue with useSelector in Tests

The mockUseSelector variable is assigned to the original useSelector function before react-redux is mocked. As a result, mockUseSelector doesn't control the useSelector instance the component receives, leading to tests that rely on it not working as intended.

Fix in Cursor Fix in Web


jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
Expand All @@ -18,6 +20,15 @@ jest.mock('react-router-dom', () => ({
}),
}));

jest.mock('react-redux', () => ({
...jest.requireActual('react-redux'),
useSelector: jest.fn(),
}));

jest.mock('../../../hooks/useI18nContext', () => ({
useI18nContext: () => (key: string) => key,
}));

jest.mock('../../../../app/scripts/lib/util', () => ({
...jest.requireActual('../../../../app/scripts/lib/util'),
getEnvironmentType: () => 'popup',
Expand All @@ -31,6 +42,9 @@ describe('AddWalletModal', () => {
mockHistoryPush.mockClear();
mockOpenExtensionInBrowser.mockClear();

// Mock useSelector to return false for manageInstitutionalWallets by default
mockUseSelector.mockReturnValue(false);

// @ts-expect-error mocking platform
global.platform = {
openExtensionInBrowser: mockOpenExtensionInBrowser,
Expand All @@ -40,21 +54,21 @@ describe('AddWalletModal', () => {
it('renders the modal when isOpen is true', () => {
renderWithProvider(<AddWalletModal isOpen={true} onClose={mockOnClose} />);

expect(screen.getByText('Add wallet')).toBeInTheDocument();
expect(screen.getByText('addWallet')).toBeInTheDocument();
});

it('renders all wallet options', () => {
renderWithProvider(<AddWalletModal isOpen={true} onClose={mockOnClose} />);

expect(screen.getByText('Import a wallet')).toBeInTheDocument();
expect(screen.getByText('Import an account')).toBeInTheDocument();
expect(screen.getByText('Add a hardware wallet')).toBeInTheDocument();
expect(screen.getByText('importAWallet')).toBeInTheDocument();
expect(screen.getByText('importAnAccount')).toBeInTheDocument();
expect(screen.getByText('addAHardwareWallet')).toBeInTheDocument();
});

it('calls onClose and navigates when import wallet option is clicked', () => {
renderWithProvider(<AddWalletModal isOpen={true} onClose={mockOnClose} />);

fireEvent.click(screen.getByText('Import a wallet'));
fireEvent.click(screen.getByText('importAWallet'));

expect(mockOnClose).toHaveBeenCalledTimes(1);
expect(mockHistoryPush).toHaveBeenCalledWith(IMPORT_SRP_ROUTE);
Expand All @@ -63,7 +77,7 @@ describe('AddWalletModal', () => {
it('calls onClose and navigates when import account option is clicked', () => {
renderWithProvider(<AddWalletModal isOpen={true} onClose={mockOnClose} />);

fireEvent.click(screen.getByText('Import an account'));
fireEvent.click(screen.getByText('importAnAccount'));

expect(mockOnClose).toHaveBeenCalledTimes(1);
expect(mockHistoryPush).toHaveBeenCalledWith(ADD_WALLET_PAGE_ROUTE);
Expand All @@ -72,7 +86,7 @@ describe('AddWalletModal', () => {
it('calls onClose and opens hardware wallet route in expanded view', () => {
renderWithProvider(<AddWalletModal isOpen={true} onClose={mockOnClose} />);

fireEvent.click(screen.getByText('Add a hardware wallet'));
fireEvent.click(screen.getByText('addAHardwareWallet'));

expect(mockOnClose).toHaveBeenCalledTimes(1);
expect(mockOpenExtensionInBrowser).toHaveBeenCalledWith(
Expand All @@ -84,6 +98,26 @@ describe('AddWalletModal', () => {
it('does not render when isOpen is false', () => {
renderWithProvider(<AddWalletModal isOpen={false} onClose={mockOnClose} />);

expect(screen.queryByText('Add wallet')).not.toBeInTheDocument();
expect(screen.queryByText('addWallet')).not.toBeInTheDocument();
});

it('does not render the institutional wallet option if institutional wallets are disabled', () => {
// Mock useSelector to return false for manageInstitutionalWallets
mockUseSelector.mockReturnValue(false);

renderWithProvider(<AddWalletModal isOpen={true} onClose={mockOnClose} />);

expect(
screen.queryByText('manageInstitutionalWallets'),
).not.toBeInTheDocument();
});

it('renders the institutional wallet option if institutional wallets are enabled', () => {
// Mock useSelector to return true for manageInstitutionalWallets
mockUseSelector.mockReturnValue(true);

renderWithProvider(<AddWalletModal isOpen={true} onClose={mockOnClose} />);

expect(screen.getByText('manageInstitutionalWallets')).toBeInTheDocument();
});
});
18 changes: 18 additions & 0 deletions ui/components/multichain-accounts/add-wallet-modal/add-wallet-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
BoxBorderColor,
} from '@metamask/design-system-react';

import { useSelector } from 'react-redux';
import {
Modal,
ModalOverlay,
Expand All @@ -35,6 +36,8 @@ import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
// TODO: Remove restricted import
// eslint-disable-next-line import/no-restricted-paths
import { getEnvironmentType } from '../../../../app/scripts/lib/util';
import { getManageInstitutionalWallets } from '../../../selectors';
import { INSTITUTIONAL_WALLET_SNAP_ID } from '../../../../shared/lib/accounts';

export type AddWalletModalProps = Omit<
ModalProps,
Expand All @@ -58,6 +61,9 @@ export const AddWalletModal: React.FC<AddWalletModalProps> = ({
}) => {
const t = useI18nContext();
const history = useHistory();
const institutionalWalletsEnabled = useSelector(
getManageInstitutionalWallets,
);

const walletOptions: WalletOption[] = [
{
Expand All @@ -78,6 +84,18 @@ export const AddWalletModal: React.FC<AddWalletModalProps> = ({
iconName: IconName.Hardware,
route: CONNECT_HARDWARE_ROUTE,
},
...(institutionalWalletsEnabled
? [
{
id: 'institutional-wallet',
titleKey: 'manageInstitutionalWallets',
iconName: IconName.Add,
route: `/snaps/view/${encodeURIComponent(
INSTITUTIONAL_WALLET_SNAP_ID,
)}`,
},
]
: []),
];

const handleOptionClick = (option: WalletOption) => {
Expand Down
Loading