Skip to content

Remove unused hasShownConsent state #894

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
yujonglee merged 1 commit into from
May 29, 2025
Merged

Remove unused hasShownConsent state #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
136 changes: 15 additions & 121 deletions apps/desktop/src/components/editor-area/note-header/listen-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
import { Trans } from "@lingui/react/macro";
import { useMutation, UseMutationResult, useQuery } from "@tanstack/react-query";
import {
CheckIcon,
MicIcon,
MicOffIcon,
PauseIcon,
PlayIcon,
StopCircleIcon,
Volume2Icon,
VolumeOffIcon,
} from "lucide-react";
import { useEffect, useState } from "react";
import { useMutation, useQuery } from "@tanstack/react-query";
import { MicIcon, MicOffIcon, PauseIcon, PlayIcon, StopCircleIcon, Volume2Icon, VolumeOffIcon } from "lucide-react";
import { useState } from "react";

import SoundIndicator from "@/components/sound-indicator";
import { useHypr } from "@/contexts";
Expand Down Expand Up @@ -48,8 +39,6 @@ export default function ListenButton({ sessionId }: { sessionId: string }) {
pause: s.pause,
stop: s.stop,
loading: s.loading,
hasShownConsent: s.hasShownConsent,
setHasShownConsent: s.setHasShownConsent,
}));

const isEnhancePending = useEnhancePendingState(sessionId);
Expand All @@ -65,7 +54,7 @@ export default function ListenButton({ sessionId }: { sessionId: string }) {

analyticsCommands.event({
event: "onboarding_video_started",
distinct_id: userId,
distinct_id: isOnboarding ? "onboarding" : userId,
session_id: sessionId,
});
}
Expand Down Expand Up @@ -210,129 +199,49 @@ function WhenInactiveAndMeetingEndedOnboarding({ disabled, onClick }: { disabled
);
}

export function WhenActive() {
const [open, setOpen] = useState(true);
const { sessionId } = useOngoingSession((s) => ({ sessionId: s.sessionId }));
const { onboardingSessionId } = useHypr();
const isOnboarding = sessionId === onboardingSessionId;

function WhenActive() {
const ongoingSessionStore = useOngoingSession((s) => ({
pause: s.pause,
stop: s.stop,
loading: s.loading,
}));

const { showConsent, setHasShownConsent } = useConsentManagement(isOnboarding);
const audioControls = useAudioControls();

useEffect(() => {
if (showConsent) {
listenerCommands.setSpeakerMuted(true).then(() => {
audioControls.refetchSpeakerMuted();
});
}
}, [showConsent, audioControls.refetchSpeakerMuted]);

const handleConsentDecision = useMutation({
mutationFn: async (recordEveryone: boolean) => {
if (recordEveryone) {
await listenerCommands.setSpeakerMuted(false);
} else {
await listenerCommands.setSpeakerMuted(true);
await listenerCommands.setMicMuted(false);
}
setHasShownConsent(true);
},
onSuccess: () => {
audioControls.refetchSpeakerMuted();
audioControls.refetchMicMuted();
},
});
const [isPopoverOpen, setIsPopoverOpen] = useState(false);

const handlePauseSession = () => {
ongoingSessionStore.pause();
setOpen(false);
setIsPopoverOpen(false);
};

const handleStopSession = () => {
ongoingSessionStore.stop();
setOpen(false);
};

const handleOpenChange = (isOpen: boolean) => {
if (!isOpen && !showConsent) {
setOpen(false);
} else if (showConsent) {
setOpen(true);
} else {
setOpen(isOpen);
}
setIsPopoverOpen(false);
};

return (
<Popover open={open} onOpenChange={handleOpenChange}>
<Popover>
<PopoverTrigger asChild>
<button
className={cn([
open && "hover:scale-95",
isPopoverOpen && "hover:scale-95",
"w-14 h-9 rounded-full bg-red-100 border-2 transition-all border-red-400 cursor-pointer outline-none p-0 flex items-center justify-center",
"shadow-[0_0_0_2px_rgba(255,255,255,0.8)_inset]",
])}
>
<SoundIndicator color="#ef4444" size="long" />
</button>
</PopoverTrigger>

<PopoverContent className="w-64" align="end">
{showConsent ? <ConsentDialog onDecision={handleConsentDecision} /> : (
<RecordingControls
audioControls={audioControls}
onPause={handlePauseSession}
onStop={handleStopSession}
/>
)}
<RecordingControls
audioControls={audioControls}
onPause={handlePauseSession}
onStop={handleStopSession}
/>
</PopoverContent>
</Popover>
);
}

function ConsentDialog({
onDecision,
}: {
onDecision: UseMutationResult<void, Error, boolean, unknown>;
}) {
return (
<div className="flex flex-col gap-4">
<div>
<h4 className="font-medium text-sm mb-2">
<Trans>Recording Started</Trans>
</h4>
<p className="text-xs text-gray-500 mb-4">
<Trans>Did you get consent from everyone in the meeting?</Trans>
</p>
<div className="flex flex-col gap-2">
<Button
variant="default"
onClick={() => onDecision.mutate(true)}
className="w-full"
>
<CheckIcon size={16} className="mr-1" />
<Trans>Yes, activate speaker</Trans>
</Button>
<Button
variant="outline"
onClick={() => onDecision.mutate(false)}
className="w-full"
>
<MicIcon size={16} className="mr-1" />
<Trans>Record me only</Trans>
</Button>
</div>
</div>
</div>
);
}

function RecordingControls({
audioControls,
onPause,
Expand Down Expand Up @@ -412,21 +321,6 @@ function AudioControlButton({
);
}

function useConsentManagement(isOnboarding: boolean) {
const ongoingSessionStore = useOngoingSession((s) => ({
hasShownConsent: s.hasShownConsent,
setHasShownConsent: s.setHasShownConsent,
}));

const effectiveHasShownConsent = isOnboarding ? true : ongoingSessionStore.hasShownConsent;
const showConsent = !effectiveHasShownConsent && !isOnboarding;

return {
showConsent,
setHasShownConsent: ongoingSessionStore.setHasShownConsent,
};
}

function useAudioControls() {
const { data: isMicMuted, refetch: refetchMicMuted } = useQuery({
queryKey: ["mic-muted"],
Expand Down
10 changes: 0 additions & 10 deletions packages/utils/src/stores/ongoing-session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@ type State = {
status: "inactive" | "running_active" | "running_paused";
amplitude: { mic: number; speaker: number };
enhanceController: AbortController | null;
hasShownConsent: boolean;
};

type Actions = {
get: () => State & Actions;
cancelEnhance: () => void;
setEnhanceController: (controller: AbortController | null) => void;
setHasShownConsent: (hasShown: boolean) => void;
start: (sessionId: string) => void;
stop: () => void;
pause: () => void;
Expand All @@ -31,7 +29,6 @@ const initialState: State = {
loading: false,
amplitude: { mic: 0, speaker: 0 },
enhanceController: null,
hasShownConsent: false,
};

export type OngoingSessionStore = ReturnType<typeof createOngoingSessionStore>;
Expand All @@ -53,13 +50,6 @@ export const createOngoingSessionStore = (sessionsStore: ReturnType<typeof creat
})
);
},
setHasShownConsent: (hasShown: boolean) => {
set((state) =>
mutate(state, (draft) => {
draft.hasShownConsent = hasShown;
})
);
},
start: (sessionId: string) => {
set((state) =>
mutate(state, (draft) => {
Expand Down
Loading