Skip to content

refactor(perps): use MMDS HeaderStandard #29703

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 4 commits into from
May 7, 2026
Merged

refactor(perps): use MMDS HeaderStandard #29703

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
ed03b88
refactor(perps): use MMDS HeaderStandard
brianacnguyen May 5, 2026
9fe955f
Merge branch 'main' into refactor/headerstandard-titles-perps
brianacnguyen May 5, 2026
ffcd659
Updated ListHeaderWithSearch to use HeaderStandard
brianacnguyen May 5, 2026
5e55753
Merge branch 'main' into refactor/headerstandard-titles-perps
brianacnguyen May 6, 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
4 changes: 2 additions & 2 deletions app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import React, {
useMemo,
useCallback,
} from 'react';
import { HeaderStandard } from '@metamask/design-system-react-native';
import { View, Animated } from 'react-native';
import { useStyles } from '../../../../../component-library/hooks';
import Icon, {
IconName,
IconSize,
} from '../../../../../component-library/components/Icons/Icon';
import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
import TextFieldSearch from '../../../../../component-library/components/Form/TextFieldSearch/TextFieldSearch';
import { strings } from '../../../../../../locales/i18n';
import Text, {
Expand Down Expand Up @@ -317,7 +317,7 @@ const PerpsMarketListView = ({

return (
<SafeAreaView style={styles.container}>
<HeaderCompactStandard
<HeaderStandard
title={title || strings('perps.home.markets')}
onBack={handleBackPressed}
backButtonProps={{
Expand Down
9 changes: 3 additions & 6 deletions app/components/UI/Perps/Views/PerpsTransactionsView/PerpsFundingTransactionView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
Button,
ButtonVariant,
ButtonSize,
HeaderStandard,
} from '@metamask/design-system-react-native';
import Text, {
TextColor,
Expand All @@ -17,7 +18,6 @@ import Text, {
import { useStyles } from '../../../../../component-library/hooks';
import { selectSelectedInternalAccountByScope } from '../../../../../selectors/multichainAccounts/accounts';
import ScreenView from '../../../../Base/ScreenView';
import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
import PerpsTransactionDetailAssetHero from '../../components/PerpsTransactionDetailAssetHero';
import { usePerpsBlockExplorerUrl } from '../../hooks';
import {
Expand Down Expand Up @@ -54,10 +54,7 @@ const PerpsFundingTransactionView: React.FC = () => {
if (!transaction) {
return (
<ScreenView>
<HeaderCompactStandard
includesTopInset
onBack={() => navigation.goBack()}
/>
<HeaderStandard includesTopInset onBack={() => navigation.goBack()} />
<View style={styles.content}>
<Text>{strings('perps.transactions.not_found')}</Text>
</View>
Expand Down Expand Up @@ -109,7 +106,7 @@ const PerpsFundingTransactionView: React.FC = () => {

return (
<ScreenView>
<HeaderCompactStandard
<HeaderStandard
includesTopInset
title={transaction.title}
onBack={() => navigation.goBack()}
Expand Down
9 changes: 3 additions & 6 deletions app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import {
Button,
ButtonVariant,
ButtonSize,
HeaderStandard,
} from '@metamask/design-system-react-native';
import { useStyles } from '../../../../../component-library/hooks';
import { selectSelectedInternalAccountByScope } from '../../../../../selectors/multichainAccounts/accounts';
import ScreenView from '../../../../Base/ScreenView';
import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
import PerpsTransactionDetailAssetHero from '../../components/PerpsTransactionDetailAssetHero';
import { usePerpsBlockExplorerUrl, usePerpsOrderFees } from '../../hooks';
import { PerpsOrderTransactionRouteProp } from '../../types/transactionHistory';
Expand Down Expand Up @@ -54,10 +54,7 @@ const PerpsOrderTransactionView: React.FC = () => {
if (!transaction) {
return (
<ScreenView>
<HeaderCompactStandard
includesTopInset
onBack={() => navigation.goBack()}
/>
<HeaderStandard includesTopInset onBack={() => navigation.goBack()} />
<View style={styles.content}>
<Text>{strings('perps.transactions.not_found')}</Text>
</View>
Expand Down Expand Up @@ -127,7 +124,7 @@ const PerpsOrderTransactionView: React.FC = () => {

return (
<ScreenView>
<HeaderCompactStandard
<HeaderStandard
includesTopInset
title={transaction.title}
onBack={() => navigation.goBack()}
Expand Down
9 changes: 3 additions & 6 deletions app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import {
Button,
ButtonVariant,
ButtonSize,
HeaderStandard,
} from '@metamask/design-system-react-native';
import { useStyles } from '../../../../../component-library/hooks';
import { selectSelectedInternalAccountByScope } from '../../../../../selectors/multichainAccounts/accounts';
import Routes from '../../../../../constants/navigation/Routes';
import ScreenView from '../../../../Base/ScreenView';
import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
import PerpsTransactionDetailAssetHero from '../../components/PerpsTransactionDetailAssetHero';
import { usePerpsBlockExplorerUrl } from '../../hooks';
import {
Expand Down Expand Up @@ -69,10 +69,7 @@ const PerpsPositionTransactionView: React.FC = () => {
// Handle missing transaction data
return (
<ScreenView>
<HeaderCompactStandard
includesTopInset
onBack={() => navigation.goBack()}
/>
<HeaderStandard includesTopInset onBack={() => navigation.goBack()} />
<View style={styles.content}>
<Text>{strings('perps.transactions.not_found')}</Text>
</View>
Expand Down Expand Up @@ -174,7 +171,7 @@ const PerpsPositionTransactionView: React.FC = () => {

return (
<ScreenView>
<HeaderCompactStandard
<HeaderStandard
title={transaction?.fill?.shortTitle || ''}
onBack={() => navigation.goBack()}
includesTopInset
Expand Down
4 changes: 2 additions & 2 deletions app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
Button,
ButtonVariant,
ButtonSize,
HeaderStandard,
} from '@metamask/design-system-react-native';
import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
import { useTailwind } from '@metamask/design-system-twrnc-preset';
import { PerpsWithdrawViewSelectorsIDs } from '../../Perps.testIds';
import { strings } from '../../../../../../locales/i18n';
Expand Down Expand Up @@ -371,7 +371,7 @@ const PerpsWithdrawView: React.FC = () => {
<SafeAreaView style={tw.style('flex-1 bg-default')}>
<Box twClassName="flex-1 bg-default">
{/* Header */}
<HeaderCompactStandard
<HeaderStandard
title={strings('perps.withdrawal.title')}
onBack={handleBack}
backButtonProps={{
Expand Down
4 changes: 2 additions & 2 deletions app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable jsdoc/check-indentation */
import React, { useRef, useCallback, useMemo } from 'react';
import { HeaderStandard } from '@metamask/design-system-react-native';
import { View } from 'react-native';
import BottomSheet, {
BottomSheetRef,
} from '../../../../../component-library/components/BottomSheets/BottomSheet';
import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
import BottomSheetFooter, {
ButtonsAlignment,
} from '../../../../../component-library/components/BottomSheets/BottomSheetFooter';
Expand Down Expand Up @@ -147,7 +147,7 @@ const PerpsBottomSheetTooltip = React.memo<PerpsBottomSheetTooltipProps>(
testID={testID}
>
{!hasCustomHeader && (
<HeaderCompactStandard
<HeaderStandard
title={title}
testID={PerpsBottomSheetTooltipSelectorsIDs.TITLE}
onClose={handleClose}
Expand Down
51 changes: 2 additions & 49 deletions app/components/UI/Perps/components/PerpsMarketListHeader/PerpsMarketListHeader.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ jest.mock('../../../../../../locales/i18n', () => ({
}));

jest.mock('@metamask/design-system-react-native', () => {
const actual = jest.requireActual('@metamask/design-system-react-native');
const { View, Text: RNText } = jest.requireActual('react-native');
return {
...actual,
Comment thread
cursor[bot] marked this conversation as resolved.
Box: View,
Text: RNText,
BoxFlexDirection: { Row: 'row' },
Expand Down Expand Up @@ -89,55 +91,6 @@ jest.mock('../../../../../component-library/hooks', () => ({
}),
}));

jest.mock(
'../../../../../component-library/components-temp/HeaderCompactStandard',
() => {
const { View, Text, TouchableOpacity } = jest.requireActual('react-native');
return {
__esModule: true,
default: ({
title,
onBack,
endButtonIconProps,
testID,
}: {
title: string;
onBack: () => void;
endButtonIconProps?: {
iconName: string;
onPress: () => void;
testID?: string;
}[];
testID?: string;
}) => (
<View testID={testID}>
<TouchableOpacity
testID={testID ? `${testID}-back-button` : undefined}
onPress={onBack}
>
<Text>Back</Text>
</TouchableOpacity>
<Text>{title}</Text>
{endButtonIconProps?.map(
(
props: { iconName: string; onPress: () => void; testID?: string },
index: number,
) => (
<TouchableOpacity
key={index}
testID={props.testID}
onPress={props.onPress}
>
<Text>{props.iconName}</Text>
</TouchableOpacity>
),
)}
</View>
),
};
},
);

describe('PerpsMarketListHeader', () => {
const mockGoBack = jest.fn();
const mockCanGoBack = jest.fn();
Expand Down
4 changes: 2 additions & 2 deletions app/components/UI/shared/ListHeaderWithSearch/ListHeaderWithSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
BoxFlexDirection,
BoxAlignItems,
IconName as DSIconName,
HeaderStandard,
} from '@metamask/design-system-react-native';
import { useTailwind } from '@metamask/design-system-twrnc-preset';
import Icon, {
Expand All @@ -25,7 +26,6 @@ import Text, {
TextVariant,
TextColor,
} from '../../../../component-library/components/Texts/Text';
import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
import { useTheme } from '../../../../util/theme';
import type { ListHeaderWithSearchProps } from './ListHeaderWithSearch.types';
import styleSheet from './ListHeaderWithSearch.styles';
Expand Down Expand Up @@ -140,7 +140,7 @@ const ListHeaderWithSearch: React.FC<ListHeaderWithSearchProps> = ({
}

return (
<HeaderCompactStandard
<HeaderStandard
title={title || defaultTitle}
onBack={handleBack}
backButtonProps={{
Expand Down
Loading