Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/app/features/room-nav/RoomNavItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { getCanonicalAliasOrRoomId, isRoomAlias } from '$utils/matrix';
import { getViaServers } from '$plugins/via-servers';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { getSettings, settingsAtom } from '$state/settings';
import { useOpenRoomSettings } from '$state/hooks/roomSettings';
import { useSpaceOptionally } from '$hooks/useSpace';
import {
Expand Down Expand Up @@ -317,7 +317,7 @@ export function RoomNavItem({
const handleNavItemClick: MouseEventHandler<HTMLElement> = (evt) => {
if (room.isCallRoom()) {
if (!isMobile) {
if (!isActiveCall && !callEmbed) {
if (!isActiveCall && !callEmbed && getSettings().joinVoiceImmediately) {
startCall(
room,
new CallControlState(callPref.microphone, callPref.video, callPref.sound)
Expand Down
25 changes: 25 additions & 0 deletions src/app/features/settings/general/General.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,30 @@ function Messages() {
);
}

function Navigation() {
const [joinVoiceImmediately, setJoinVoiceImmediately] = useSetting(
settingsAtom,
'joinVoiceImmediately'
);
return (
<Box direction="Column" gap="100">
<Text size="L400">Navigation</Text>
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
<SettingTile
title="Join Calls Immediately When Switching to Channel"
after={
<Switch
variant="Primary"
value={joinVoiceImmediately}
onChange={setJoinVoiceImmediately}
/>
}
/>
</SequenceCard>
</Box>
);
}

export function Sync() {
const clientConfig = useClientConfig();
const sessions = useAtomValue(sessionsAtom);
Expand Down Expand Up @@ -1033,6 +1057,7 @@ export function General({ requestClose }: GeneralProps) {
<Gestures isMobile={mobileOrTablet()} />
<Editor isMobile={mobileOrTablet()} />
<Messages />
<Navigation />
</Box>
</PageContent>
</Scroll>
Expand Down
2 changes: 2 additions & 0 deletions src/app/state/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export interface Settings {
urlPreview: boolean;
encUrlPreview: boolean;
showHiddenEvents: boolean;
joinVoiceImmediately: boolean;
legacyUsernameColor: boolean;
allowPipVideos: boolean;

Expand Down Expand Up @@ -122,6 +123,7 @@ const defaultSettings: Settings = {
urlPreview: true,
encUrlPreview: false,
showHiddenEvents: false,
joinVoiceImmediately: true,
legacyUsernameColor: false,
allowPipVideos: false,

Expand Down
Loading