Skip to content

refactor(bridge): use MMDS HeaderStandard #29700

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
brianacnguyen merged 12 commits into from
May 14, 2026
Merged

refactor(bridge): use MMDS HeaderStandard #29700

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5c6b370
refactor(bridge): use MMDS HeaderStandard
brianacnguyen May 5, 2026
757eb10
Merge branch 'main' into refactor/headerstandard-titles-bridge
brianacnguyen May 5, 2026
5baf181
Merge branch 'main' into refactor/headerstandard-titles-bridge
brianacnguyen May 6, 2026
3d5eca1
Updated close accessibility label to use localized string
brianacnguyen May 6, 2026
e4a4e0d
t pull origin mainMerge branch 'refactor/headerstandard-titles-bridge…
brianacnguyen May 6, 2026
0174365
Merge branch 'main' of https://github.com/MetaMask/metamask-mobile in…
brianacnguyen May 6, 2026
98e4f7c
Merge branch 'main' into refactor/headerstandard-titles-bridge
brianacnguyen May 7, 2026
ceba33e
Merge branch 'main' into refactor/headerstandard-titles-bridge
brianacnguyen May 7, 2026
524f93e
Merge branch 'main' into refactor/headerstandard-titles-bridge
brianacnguyen May 7, 2026
0e873dd
Merge branch 'main' into refactor/headerstandard-titles-bridge
brianacnguyen May 8, 2026
076f0c1
Merge branch 'main' into refactor/headerstandard-titles-bridge
brianacnguyen May 13, 2026
566ed03
Merge branch 'main' into refactor/headerstandard-titles-bridge
brianacnguyen May 14, 2026
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
21 changes: 0 additions & 21 deletions app/components/UI/Bridge/components/SlippageModal/CustomSlippageModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,6 @@ jest.mock(
},
);

// Mock HeaderCompactStandard
jest.mock(
'../../../../../component-library/components-temp/HeaderCompactStandard',
() => {
const ReactNative = jest.requireActual('react-native');
const { View, Text, TouchableOpacity } = ReactNative;

return {
__esModule: true,
default: (props: { title: string; onClose: () => void }) => (
<View testID="header-center">
<Text>{props.title}</Text>
<TouchableOpacity onPress={props.onClose} accessibilityLabel="Close">
<Text>Close</Text>
</TouchableOpacity>
</View>
),
};
},
);

// Mock InputStepper
jest.mock('../InputStepper', () => ({
InputStepper: jest.fn(
Expand Down
5 changes: 3 additions & 2 deletions app/components/UI/Bridge/components/SlippageModal/CustomSlippageModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import React, { useCallback, useRef, useState } from 'react';
import BottomSheet, {
BottomSheetRef,
} from '../../../../../component-library/components/BottomSheets/BottomSheet';
import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
import { strings } from '../../../../../../locales/i18n';
import { View } from 'react-native';
import {
Button,
ButtonSize,
ButtonVariant,
HeaderStandard,
} from '@metamask/design-system-react-native';
import Keypad from '../../../../Base/Keypad';
import { InputStepper } from '../InputStepper';
Expand Down Expand Up @@ -97,9 +97,10 @@ export const CustomSlippageModal = () => {

return (
<BottomSheet ref={sheetRef}>
<HeaderCompactStandard
<HeaderStandard
title={strings('bridge.slippage')}
onClose={handleClose}
closeButtonProps={{ accessibilityLabel: 'Close' }}
Comment thread
brianacnguyen marked this conversation as resolved.
Outdated
/>
<View style={customSlippageModalStyles.stepperContainer}>
<InputStepper
Expand Down
21 changes: 0 additions & 21 deletions app/components/UI/Bridge/components/SlippageModal/DefaultSlippageModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,6 @@ jest.mock(
},
);

// Mock HeaderCompactStandard
jest.mock(
'../../../../../component-library/components-temp/HeaderCompactStandard',
() => {
const ReactNative = jest.requireActual('react-native');
const { View, Text, TouchableOpacity } = ReactNative;

return {
__esModule: true,
default: (props: { title: string; onClose: () => void }) => (
<View testID="header-center">
<Text>{props.title}</Text>
<TouchableOpacity onPress={props.onClose} accessibilityLabel="Close">
<Text>Close</Text>
</TouchableOpacity>
</View>
),
};
},
);

// Mock dependencies
jest.mock('./DefaultSlippageButtonGroup', () => ({
DefaultSlippageButtonGroup: jest.fn(({ options }) => {
Expand Down
5 changes: 3 additions & 2 deletions app/components/UI/Bridge/components/SlippageModal/DefaultSlippageModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useCallback, useRef, useState } from 'react';
import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
import BottomSheet, {
BottomSheetRef,
} from '../../../../../component-library/components/BottomSheets/BottomSheet';
Expand All @@ -9,6 +8,7 @@ import {
Button,
ButtonSize,
ButtonVariant,
HeaderStandard,
Text,
} from '@metamask/design-system-react-native';
import { DefaultSlippageButtonGroup } from './DefaultSlippageButtonGroup';
Expand Down Expand Up @@ -80,9 +80,10 @@ export const DefaultSlippageModal = () => {

return (
<BottomSheet ref={sheetRef}>
<HeaderCompactStandard
<HeaderStandard
title={strings('bridge.slippage')}
onClose={handleClose}
closeButtonProps={{ accessibilityLabel: 'Close' }}
/>
<View style={styles.descriptionContainer}>
<Text style={styles.descriptionText}>
Expand Down
Loading