Skip to content

fix: back arrow perps home should always navigate to wallet home cp-7.59.0 #22288

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 2 commits into from
Nov 7, 2025
+9 −5
Merged

fix: back arrow perps home should always navigate to wallet home cp-7.59.0 #22288

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
8fcdae0
fix: back arrow perps home should always navigate to wallet home
gambinish Nov 6, 2025
3695aa8
Merge branch 'main' into perps/tat-1984-perps-home-back-arrow
gambinish Nov 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
9 changes: 6 additions & 3 deletions app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jest.mock(

// Mock hooks (consolidated to avoid conflicts)
const mockNavigateBack = jest.fn();
const mockNavigateToWallet = jest.fn();
const mockNavigateToMarketList = jest.fn();
jest.mock('../../hooks', () => ({
usePerpsHomeData: jest.fn(),
Expand All @@ -49,6 +50,7 @@ jest.mock('../../hooks', () => ({
navigateTo: jest.fn(),
navigateToMarketDetails: jest.fn(),
navigateToMarketList: mockNavigateToMarketList,
navigateToWallet: mockNavigateToWallet,
navigateBack: mockNavigateBack,
goBack: jest.fn(),
})),
Expand Down Expand Up @@ -392,6 +394,7 @@ describe('PerpsHomeView', () => {
beforeEach(() => {
jest.clearAllMocks();
mockNavigateBack.mockClear();
mockNavigateToWallet.mockClear();
mockNavigateToMarketList.mockClear();
mockUsePerpsHomeData.mockReturnValue(mockDefaultData);
});
Expand Down Expand Up @@ -537,15 +540,15 @@ describe('PerpsHomeView', () => {
expect(queryByText('perps.home.orders')).toBeNull();
});

it('handles back button press', () => {
it('navigates to wallet home when back button is pressed', () => {
// Arrange
const { getByTestId } = render(<PerpsHomeView />);

// Act
fireEvent.press(getByTestId('back-button'));

// Assert
expect(mockNavigateBack).toHaveBeenCalled();
// Assert - Always navigates to wallet home to avoid loops (e.g., from tutorial)
expect(mockNavigateToWallet).toHaveBeenCalled();
});

it('navigates to close all modal when close all is pressed', () => {
Expand Down
5 changes: 3 additions & 2 deletions app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,9 @@ const PerpsHomeView = () => {
setShowCancelAllSheet(false);
}, []);

// Back button handler - now uses navigation hook
const handleBackPress = perpsNavigation.navigateBack;
// Back button handler - always navigate to wallet home to avoid loops
// (e.g., when coming from tutorial/onboarding flow)
const handleBackPress = perpsNavigation.navigateToWallet;

return (
<SafeAreaView style={styles.container}>
Expand Down
Loading