Skip to content

Commit 30cb8b3

Browse files
committed
Merge branch 'dev' of https://github.com/happier-dev/happier into dev
2 parents 699784c + 0f24f3d commit 30cb8b3

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

apps/ui/sources/components/sessions/panes/SessionRightPanel.agentsTab.test.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ describe('SessionRightPanel (core tabs)', () => {
121121
expect(screen.findByTestId('session-rightpanel-tab:agents')).toBeTruthy();
122122
expect(screen.findByTestId('session-rightpanel-tab:terminal')).toBeNull();
123123

124-
expect(getStyleValue(findHostByTestId(screen, 'session-rightpanel-surface-git')?.props.style, 'visibility')).toBe('visible');
124+
const gitSurface = findHostByTestId(screen, 'session-rightpanel-surface-git');
125+
expect(gitSurface).not.toBeNull();
126+
expect(gitSurface?.props.pointerEvents).toBe('auto');
125127
expect(findHostByTestId(screen, 'session-rightpanel-surface-files')).toBeNull();
126128
expect(findHostByTestId(screen, 'session-rightpanel-surface-agents')).toBeNull();
127129
});
@@ -132,7 +134,9 @@ describe('SessionRightPanel (core tabs)', () => {
132134

133135
const screen = await renderScreen(<SessionRightPanel sessionId="s1" scopeId="session:s1" />);
134136

135-
expect(getStyleValue(findHostByTestId(screen, 'session-rightpanel-surface-agents')?.props.style, 'visibility')).toBe('visible');
137+
const agentsSurface = findHostByTestId(screen, 'session-rightpanel-surface-agents');
138+
expect(agentsSurface).not.toBeNull();
139+
expect(agentsSurface?.props.pointerEvents).toBe('auto');
136140
expect(findHostByTestId(screen, 'session-rightpanel-surface-git')).toBeNull();
137141
expect(findHostByTestId(screen, 'session-rightpanel-surface-files')).toBeNull();
138142
});

apps/ui/sources/components/sessions/panes/SessionRightPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ const RightTabSurface = React.memo((props: Readonly<{ isActive: boolean; testID?
238238
StyleSheet.absoluteFillObject,
239239
{
240240
opacity: active ? 1 : 0,
241-
visibility: Platform.OS === 'web' ? (active ? 'visible' : 'hidden') : 'visible',
241+
display: Platform.OS === 'web' ? (active ? 'flex' : 'none') : 'flex',
242242
},
243243
]}
244244
>

apps/ui/sources/components/sessions/panes/git/SessionRightPanelGitView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ const GitSubTabSurface = React.memo((props: Readonly<{ testID?: string; isActive
537537
{
538538
opacity: props.isActive ? 1 : 0,
539539
pointerEvents: props.isActive ? 'auto' : 'none',
540-
visibility: Platform.OS === 'web' ? (props.isActive ? 'visible' : 'hidden') : 'visible',
540+
display: Platform.OS === 'web' ? (props.isActive ? 'flex' : 'none') : 'flex',
541541
},
542542
]}
543543
testID={props.testID}

apps/ui/sources/components/settings/SettingsView.serversEntry.test.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ vi.mock('@expo/vector-icons', () => ({
104104
}));
105105

106106
vi.mock('@react-navigation/native', () => ({
107-
useFocusEffect: (cb: () => void) => cb(),
107+
useFocusEffect: (_cb: () => void) => {},
108108
}));
109109

110110
vi.mock('expo-constants', () => ({
@@ -222,9 +222,17 @@ vi.mock('@/hooks/server/useFeatureEnabled', () => ({
222222
useFeatureEnabled: () => false,
223223
}));
224224

225+
vi.mock('@/hooks/server/useFeatureDecision', () => ({
226+
useFeatureDecision: () => null,
227+
}));
228+
225229
vi.mock('@/sync/domains/server/serverProfiles', () => ({
226230
getActiveServerSnapshot: () => ({ serverId: 'server-1', serverUrl: 'https://local.example.test', generation: 0 }),
227231
listServerProfiles: () => [],
232+
subscribeActiveServer: (listener: any) => {
233+
listener({ serverId: 'server-1', serverUrl: 'https://local.example.test', generation: 0 });
234+
return () => {};
235+
},
228236
}));
229237

230238
vi.mock('@/utils/system/requestReview', () => ({

0 commit comments

Comments
 (0)