Skip to content

[pull] main from MetaMask:main #317

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
pull merged 2 commits into from
Nov 12, 2025
Merged

[pull] main from MetaMask:main #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
038133d
chore: bump network-enablement-controller cp-7.59.0 (#22492)
khanti42 Nov 12, 2025
af57390
fix: New Persistence Improvements based on Abuse testing cp-7.59.0 (#…
MarioAslau Nov 12, 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
16 changes: 16 additions & 0 deletions .yarn/patches/@metamask-network-enablement-controller-npm-3.1.0-1c0cfefdc3.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/dist/NetworkEnablementController.cjs b/dist/NetworkEnablementController.cjs
index d4a40bea9e4ed3c28e347d96e309efe1ff889e81..fab280760de6bd5cdfdbecf01495c2d5616b2e16 100644
--- a/dist/NetworkEnablementController.cjs
+++ b/dist/NetworkEnablementController.cjs
@@ -25,6 +25,11 @@ const getDefaultNetworkEnablementControllerState = () => ({
[controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.Mainnet]]: true,
[controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.LineaMainnet]]: true,
[controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.BaseMainnet]]: true,
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.ArbitrumOne]]: true,
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.BscMainnet]]: true,
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.OptimismMainnet]]: true,
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.PolygonMainnet]]: true,
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.SeiMainnet]]: true,
},
[utils_1.KnownCaipNamespace.Solana]: {
[keyring_api_1.SolScope.Mainnet]: true,
161 changes: 136 additions & 25 deletions app/components/Views/Login/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
TRUE,
} from '../../../constants/storage';
import { useMetrics } from '../../hooks/useMetrics';
import { setExistingUser } from '../../../actions/user';

const mockNavigate = jest.fn();
const mockReplace = jest.fn();
Expand Down Expand Up @@ -113,6 +114,13 @@ jest.mock('../../../actions/security', () => ({
},
}));

jest.mock('../../../actions/user', () => ({
setExistingUser: jest.fn((value) => ({
type: 'SET_EXISTING_USER',
existingUser: value,
})),
}));

jest.mock('../../../store/storage-wrapper', () => ({
getItem: jest.fn().mockResolvedValue(null),
setItem: jest.fn(),
Expand Down Expand Up @@ -263,7 +271,7 @@ describe('Login', () => {
expect(toJSON()).toMatchSnapshot();
});

it('should call trace function for AuthenticateUser during non-OAuth login', async () => {
it('calls trace function for AuthenticateUser during non-OAuth login', async () => {
(StorageWrapper.getItem as jest.Mock).mockImplementation((key) => {
if (key === OPTIN_META_METRICS_UI_SEEN) return true;
return null;
Expand Down Expand Up @@ -296,11 +304,14 @@ describe('Login', () => {
});

describe('Forgot Password', () => {
it('show the forgot password modal', () => {
it('shows forgot password modal when reset wallet pressed', () => {
// Arrange
const { getByTestId } = renderWithProvider(<Login />);
expect(getByTestId(LoginViewSelectors.RESET_WALLET)).toBeTruthy();

// Act
fireEvent.press(getByTestId(LoginViewSelectors.RESET_WALLET));

// Assert
expect(mockNavigate).toHaveBeenCalledWith(Routes.MODAL.ROOT_MODAL_FLOW, {
screen: Routes.MODAL.DELETE_WALLET,
params: {
Expand All @@ -320,7 +331,7 @@ describe('Login', () => {
});
});

it('should navigate to opt-in metrics when UI not seen and metrics disabled', async () => {
it('navigates to opt-in metrics when UI not seen and metrics disabled', async () => {
// Arrange
(StorageWrapper.getItem as jest.Mock).mockImplementation((key) => {
if (key === OPTIN_META_METRICS_UI_SEEN) return Promise.resolve(null);
Expand Down Expand Up @@ -354,7 +365,6 @@ describe('Login', () => {
fireEvent.press(loginButton);
});

// Wait for async operations to complete
await act(async () => {
await new Promise((resolve) => setTimeout(resolve, 0));
});
Expand All @@ -375,7 +385,7 @@ describe('Login', () => {
});
});

it('should navigate to home when UI not seen but metrics enabled', async () => {
it('navigates to home when UI not seen but metrics enabled', async () => {
// Arrange
(StorageWrapper.getItem as jest.Mock).mockImplementation((key) => {
if (key === OPTIN_META_METRICS_UI_SEEN) return Promise.resolve(null);
Expand Down Expand Up @@ -418,7 +428,7 @@ describe('Login', () => {
expect(mockReplace).toHaveBeenCalledWith(Routes.ONBOARDING.HOME_NAV);
});

it('should navigate to home when UI seen and metrics disabled', async () => {
it('navigates to home when UI seen and metrics disabled', async () => {
// Arrange
(StorageWrapper.getItem as jest.Mock).mockImplementation((key) => {
if (key === OPTIN_META_METRICS_UI_SEEN)
Expand Down Expand Up @@ -462,7 +472,7 @@ describe('Login', () => {
expect(mockReplace).toHaveBeenCalledWith(Routes.ONBOARDING.HOME_NAV);
});

it('should navigate to home when UI seen and metrics enabled', async () => {
it('navigates to home when UI seen and metrics enabled', async () => {
// Arrange
(StorageWrapper.getItem as jest.Mock).mockImplementation((key) => {
if (key === OPTIN_META_METRICS_UI_SEEN)
Expand Down Expand Up @@ -726,7 +736,103 @@ describe('Login', () => {
fireEvent.changeText(passwordInput, 'testpassword123');

// Assert
expect(passwordInput).toBeTruthy();
expect(passwordInput).toBeOnTheScreen();
});
});

describe('Vault Recovery', () => {
beforeEach(() => {
jest.clearAllMocks();
});

it('dispatches setExistingUser after successful login from vault recovery', async () => {
// Arrange
mockRoute.mockReturnValue({
params: {
locked: false,
oauthLoginSuccess: false,
isVaultRecovery: true,
},
});

(StorageWrapper.getItem as jest.Mock).mockImplementation((key) => {
if (key === OPTIN_META_METRICS_UI_SEEN) return Promise.resolve('true');
return Promise.resolve(null);
});

(Authentication.userEntryAuth as jest.Mock).mockResolvedValueOnce(
undefined,
);
(
Authentication.componentAuthenticationType as jest.Mock
).mockResolvedValueOnce({
currentAuthType: 'password',
});

const { getByTestId } = renderWithProvider(<Login />);
const passwordInput = getByTestId(LoginViewSelectors.PASSWORD_INPUT);
const loginButton = getByTestId(LoginViewSelectors.LOGIN_BUTTON_ID);

// Act
await act(async () => {
fireEvent.changeText(passwordInput, 'validPassword123');
});

await act(async () => {
fireEvent.press(loginButton);
});

await act(async () => {
await new Promise((resolve) => setTimeout(resolve, 0));
});

// Assert
expect(setExistingUser).toHaveBeenCalledWith(true);
});

it('does not dispatch setExistingUser when not from vault recovery', async () => {
// Arrange
mockRoute.mockReturnValue({
params: {
locked: false,
oauthLoginSuccess: false,
isVaultRecovery: false,
},
});

(StorageWrapper.getItem as jest.Mock).mockImplementation((key) => {
if (key === OPTIN_META_METRICS_UI_SEEN) return Promise.resolve('true');
return Promise.resolve(null);
});

(Authentication.userEntryAuth as jest.Mock).mockResolvedValueOnce(
undefined,
);
(
Authentication.componentAuthenticationType as jest.Mock
).mockResolvedValueOnce({
currentAuthType: 'password',
});

const { getByTestId } = renderWithProvider(<Login />);
const passwordInput = getByTestId(LoginViewSelectors.PASSWORD_INPUT);
const loginButton = getByTestId(LoginViewSelectors.LOGIN_BUTTON_ID);

// Act
await act(async () => {
fireEvent.changeText(passwordInput, 'validPassword123');
});

await act(async () => {
fireEvent.press(loginButton);
});

await act(async () => {
await new Promise((resolve) => setTimeout(resolve, 0));
});

// Assert
expect(setExistingUser).not.toHaveBeenCalled();
});
});

Expand Down Expand Up @@ -795,7 +901,7 @@ describe('Login', () => {
});

// Should render biometric button when biometric is available
expect(getByTestId(LoginViewSelectors.BIOMETRY_BUTTON)).toBeTruthy();
expect(getByTestId(LoginViewSelectors.BIOMETRY_BUTTON)).toBeOnTheScreen();
});

it('biometric button is not shown when device is locked', async () => {
Expand Down Expand Up @@ -860,7 +966,8 @@ describe('Login', () => {
jest.clearAllMocks();
});

it('should handle WRONG_PASSWORD_ERROR', async () => {
it('displays invalid password error when decryption fails', async () => {
// Arrange
mockRoute.mockReturnValue({
params: {
locked: false,
Expand All @@ -880,15 +987,17 @@ describe('Login', () => {
const { getByTestId } = renderWithProvider(<Login />);
const passwordInput = getByTestId(LoginViewSelectors.PASSWORD_INPUT);

// Act
await act(async () => {
fireEvent.changeText(passwordInput, 'valid-password123');
});
await act(async () => {
fireEvent(passwordInput, 'submitEditing');
});

// Assert
const errorElement = getByTestId(LoginViewSelectors.PASSWORD_ERROR);
expect(errorElement).toBeTruthy();
expect(errorElement).toBeOnTheScreen();
expect(errorElement.props.children).toEqual(
strings('login.invalid_password'),
);
Expand All @@ -910,7 +1019,7 @@ describe('Login', () => {
expect(rehydrationCall).toBeDefined();
});

it('should handle WRONG_PASSWORD_ERROR_ANDROID', async () => {
it('displays invalid password error for Android BAD_DECRYPT error', async () => {
mockRoute.mockReturnValue({
params: {
locked: false,
Expand Down Expand Up @@ -940,7 +1049,7 @@ describe('Login', () => {
});

const errorElement = getByTestId(LoginViewSelectors.PASSWORD_ERROR);
expect(errorElement).toBeTruthy();
expect(errorElement).toBeOnTheScreen();
expect(errorElement.props.children).toEqual(
strings('login.invalid_password'),
);
Expand All @@ -962,7 +1071,7 @@ describe('Login', () => {
expect(rehydrationCall).toBeDefined();
});

it('should handle WRONG_PASSWORD_ERROR_ANDROID_2', async () => {
it('displays invalid password error for Android DoCipher error', async () => {
mockRoute.mockReturnValue({
params: {
locked: false,
Expand Down Expand Up @@ -990,7 +1099,7 @@ describe('Login', () => {
});

const errorElement = getByTestId(LoginViewSelectors.PASSWORD_ERROR);
expect(errorElement).toBeTruthy();
expect(errorElement).toBeOnTheScreen();
expect(errorElement.props.children).toEqual(
strings('login.invalid_password'),
);
Expand All @@ -1012,7 +1121,7 @@ describe('Login', () => {
expect(rehydrationCall).toBeDefined();
});

it('should handle PASSWORD_REQUIREMENTS_NOT_MET error', async () => {
it('displays invalid password error when password requirements not met', async () => {
mockRoute.mockReturnValue({
params: {
locked: false,
Expand Down Expand Up @@ -1040,7 +1149,7 @@ describe('Login', () => {
});

const errorElement = getByTestId(LoginViewSelectors.PASSWORD_ERROR);
expect(errorElement).toBeTruthy();
expect(errorElement).toBeOnTheScreen();
expect(errorElement.props.children).toEqual(
strings('login.invalid_password'),
);
Expand All @@ -1054,7 +1163,7 @@ describe('Login', () => {
expect(rehydrationCall).toBeUndefined();
});

it('should handle generic error (else case)', async () => {
it('displays generic error message for unexpected errors', async () => {
(Authentication.userEntryAuth as jest.Mock).mockRejectedValue(
new Error('Some unexpected error'),
);
Expand All @@ -1070,13 +1179,13 @@ describe('Login', () => {
});

const errorElement = getByTestId(LoginViewSelectors.PASSWORD_ERROR);
expect(errorElement).toBeTruthy();
expect(errorElement).toBeOnTheScreen();
expect(errorElement.props.children).toEqual(
'Error: Some unexpected error',
);
});

it('should handle OnboardingPasswordLoginError trace during onboarding flow', async () => {
it('traces OnboardingPasswordLoginError during onboarding flow', async () => {
mockRoute.mockReturnValue({
params: {
locked: false,
Expand All @@ -1100,7 +1209,7 @@ describe('Login', () => {
});

const errorElement = getByTestId(LoginViewSelectors.PASSWORD_ERROR);
expect(errorElement).toBeTruthy();
expect(errorElement).toBeOnTheScreen();
expect(errorElement.props.children).toEqual(
'Error: Some unexpected error',
);
Expand Down Expand Up @@ -1131,7 +1240,7 @@ describe('Login', () => {
jest.clearAllMocks();
});

it('should handle PASSCODE_NOT_SET_ERROR with alert', async () => {
it('displays alert when passcode not set', async () => {
const mockAlert = jest
.spyOn(Alert, 'alert')
.mockImplementation(() => undefined);
Expand Down Expand Up @@ -1220,7 +1329,8 @@ describe('Login', () => {
});
});

it('handle biometric authentication failure', async () => {
it('does not navigate when biometric authentication fails', async () => {
// Arrange
(passcodeType as jest.Mock).mockReturnValueOnce('device_passcode');
(Authentication.getType as jest.Mock).mockResolvedValueOnce({
currentAuthType: AUTHENTICATION_TYPE.PASSCODE,
Expand All @@ -1239,13 +1349,14 @@ describe('Login', () => {

const biometryButton = getByTestId(LoginViewSelectors.BIOMETRY_BUTTON);

// Act
await act(async () => {
fireEvent.press(biometryButton);
});

// Assert
expect(Authentication.appTriggeredAuth).toHaveBeenCalled();
expect(mockReplace).not.toHaveBeenCalled();
expect(biometryButton).toBeTruthy();
});
});

Expand Down
Loading
Loading