Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { Button } from "@hypr/ui/components/ui/button";
import PushableButton from "@hypr/ui/components/ui/pushable-button";
import { Spinner } from "@hypr/ui/components/ui/spinner";
import { cn } from "@hypr/ui/lib/utils";
import { message } from "@tauri-apps/plugin-dialog";
import { relaunch } from "@tauri-apps/plugin-process";

interface PermissionItemProps {
icon: React.ReactNode;
Expand Down Expand Up @@ -98,7 +100,7 @@ export function AudioPermissionsView({ onContinue }: AudioPermissionsViewProps)
const micPermissionStatus = useQuery({
queryKey: ["micPermission"],
queryFn: () => listenerCommands.checkMicrophoneAccess(),
refetchInterval: 1000, // ← Faster polling
refetchInterval: 1000,
});

const systemAudioPermissionStatus = useQuery({
Expand All @@ -110,7 +112,6 @@ export function AudioPermissionsView({ onContinue }: AudioPermissionsViewProps)
const micPermission = useMutation({
mutationFn: () => listenerCommands.requestMicrophoneAccess(),
onSuccess: () => {
// Give TCC time to update (2-5 seconds)
setTimeout(() => {
micPermissionStatus.refetch();
}, 3000);
Expand All @@ -121,10 +122,10 @@ export function AudioPermissionsView({ onContinue }: AudioPermissionsViewProps)
const capturePermission = useMutation({
mutationFn: () => listenerCommands.requestSystemAudioAccess(),
onSuccess: () => {
// Give TCC time to update (2-5 seconds)
message("The app will now restart to apply the changes", { kind: "info", title: "System Audio Status Changed" });
setTimeout(() => {
systemAudioPermissionStatus.refetch();
}, 3000);
relaunch();
}, 4000);
},
onError: console.error,
});
Expand All @@ -138,7 +139,7 @@ export function AudioPermissionsView({ onContinue }: AudioPermissionsViewProps)
</h2>

<p className="text-center text-sm text-muted-foreground mb-8">
<Trans>Grant access to audio so Hyprnote can transcribe your meetings</Trans>
<Trans>After you grant system audio access, app will restart to apply the changes</Trans>
</p>

<div className="w-full max-w-[30rem] space-y-3 mb-8">
Expand Down
8 changes: 4 additions & 4 deletions apps/desktop/src/components/welcome-modal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,14 @@ export function WelcomeModal({ isOpen, onClose }: WelcomeModalProps) {

useEffect(() => {
if (isOpen) {
commands.setOnboardingNeeded(false);
sfxCommands.play("BGM");
} else {
sfxCommands.stop("BGM");
}
}, [isOpen]);

const handleStartLocal = () => {
setCurrentStep("model-selection");
setCurrentStep("audio-permissions");
};

const handleModelSelected = (model: SupportedModel) => {
Expand All @@ -102,11 +101,11 @@ export function WelcomeModal({ isOpen, onClose }: WelcomeModalProps) {

const handleDownloadProgressContinue = () => {
setWentThroughDownloads(true);
setCurrentStep("audio-permissions");
setCurrentStep("language-selection");
};

const handleAudioPermissionsContinue = () => {
setCurrentStep("language-selection");
setCurrentStep("model-selection");
};

const handleLanguageSelectionContinue = async (languages: string[]) => {
Expand All @@ -128,6 +127,7 @@ export function WelcomeModal({ isOpen, onClose }: WelcomeModalProps) {
};

const handleCalendarPermissionsContinue = () => {
commands.setOnboardingNeeded(false);
onClose();
};

Expand Down
30 changes: 17 additions & 13 deletions apps/desktop/src/locales/en/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ msgid "Access granted"
msgstr "Access granted"

#: src/components/welcome-modal/calendar-permissions-view.tsx:50
#: src/components/welcome-modal/audio-permissions-view.tsx:53
#: src/components/welcome-modal/audio-permissions-view.tsx:55
#: src/components/settings/views/sound.tsx:39
msgid "Access Granted"
msgstr "Access Granted"
Expand Down Expand Up @@ -340,6 +340,10 @@ msgstr "Add specific terms or jargon for improved transcription accuracy"
msgid "Admin"
msgstr "Admin"

#: src/components/welcome-modal/audio-permissions-view.tsx:142
msgid "After you grant system audio access, app will restart to apply the changes"
msgstr "After you grant system audio access, app will restart to apply the changes"

#: src/routes/app.settings.tsx:67
msgid "AI"
msgstr "AI"
Expand Down Expand Up @@ -395,7 +399,7 @@ msgstr "Ask questions about past meetings"
#~ msgid "Assistant:"
#~ msgstr "Assistant:"

#: src/components/welcome-modal/audio-permissions-view.tsx:137
#: src/components/welcome-modal/audio-permissions-view.tsx:138
msgid "Audio Permissions"
msgstr "Audio Permissions"

Expand Down Expand Up @@ -550,7 +554,7 @@ msgstr "Contacts Access"
#: src/components/welcome-modal/language-selection-view.tsx:180
#: src/components/welcome-modal/download-progress-view.tsx:248
#: src/components/welcome-modal/calendar-permissions-view.tsx:153
#: src/components/welcome-modal/audio-permissions-view.tsx:169
#: src/components/welcome-modal/audio-permissions-view.tsx:170
msgid "Continue"
msgstr "Continue"

Expand Down Expand Up @@ -671,7 +675,7 @@ msgid "Emoji"
msgstr "Emoji"

#: src/components/welcome-modal/calendar-permissions-view.tsx:65
#: src/components/welcome-modal/audio-permissions-view.tsx:77
#: src/components/welcome-modal/audio-permissions-view.tsx:79
#: src/components/settings/views/sound.tsx:59
msgid "Enable"
msgstr "Enable"
Expand Down Expand Up @@ -775,10 +779,10 @@ msgid "Grant Access"
msgstr "Grant Access"

#: src/components/welcome-modal/audio-permissions-view.tsx:141
msgid "Grant access to audio so Hyprnote can transcribe your meetings"
msgstr "Grant access to audio so Hyprnote can transcribe your meetings"
#~ msgid "Grant access to audio so Hyprnote can transcribe your meetings"
#~ msgstr "Grant access to audio so Hyprnote can transcribe your meetings"

#: src/components/welcome-modal/audio-permissions-view.tsx:174
#: src/components/welcome-modal/audio-permissions-view.tsx:175
msgid "Grant both permissions to continue"
msgstr "Grant both permissions to continue"

Expand Down Expand Up @@ -911,7 +915,7 @@ msgstr "Member"
msgid "Members"
msgstr "Members"

#: src/components/welcome-modal/audio-permissions-view.tsx:147
#: src/components/welcome-modal/audio-permissions-view.tsx:148
#: src/components/settings/views/sound.tsx:97
msgid "Microphone Access"
msgstr "Microphone Access"
Expand Down Expand Up @@ -1065,7 +1069,7 @@ msgstr "people"
msgid "Performance difference between languages"
msgstr "Performance difference between languages"

#: src/components/welcome-modal/audio-permissions-view.tsx:179
#: src/components/welcome-modal/audio-permissions-view.tsx:180
msgid "Permission granted! Detecting changes..."
msgstr "Permission granted! Detecting changes..."

Expand Down Expand Up @@ -1109,13 +1113,13 @@ msgstr "Recent Notes"
#~ msgid "Remove {0} from list"
#~ msgstr "Remove {0} from list"

#: src/components/welcome-modal/audio-permissions-view.tsx:74
#: src/components/welcome-modal/audio-permissions-view.tsx:76
#: src/components/settings/views/sound.tsx:56
msgid "Requesting..."
msgstr "Requesting..."

#: src/components/welcome-modal/audio-permissions-view.tsx:148
#: src/components/welcome-modal/audio-permissions-view.tsx:157
#: src/components/welcome-modal/audio-permissions-view.tsx:149
#: src/components/welcome-modal/audio-permissions-view.tsx:158
msgid "Required for meeting transcription"
msgstr "Required for meeting transcription"

Expand Down Expand Up @@ -1265,7 +1269,7 @@ msgstr "Summarize meeting"
msgid "Synchronization across multiple devices"
msgstr "Synchronization across multiple devices"

#: src/components/welcome-modal/audio-permissions-view.tsx:156
#: src/components/welcome-modal/audio-permissions-view.tsx:157
#: src/components/settings/views/sound.tsx:106
msgid "System Audio Access"
msgstr "System Audio Access"
Expand Down
30 changes: 17 additions & 13 deletions apps/desktop/src/locales/ko/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ msgid "Access granted"
msgstr ""

#: src/components/welcome-modal/calendar-permissions-view.tsx:50
#: src/components/welcome-modal/audio-permissions-view.tsx:53
#: src/components/welcome-modal/audio-permissions-view.tsx:55
#: src/components/settings/views/sound.tsx:39
msgid "Access Granted"
msgstr ""
Expand Down Expand Up @@ -340,6 +340,10 @@ msgstr ""
msgid "Admin"
msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:142
msgid "After you grant system audio access, app will restart to apply the changes"
msgstr ""

#: src/routes/app.settings.tsx:67
msgid "AI"
msgstr ""
Expand Down Expand Up @@ -395,7 +399,7 @@ msgstr ""
#~ msgid "Assistant:"
#~ msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:137
#: src/components/welcome-modal/audio-permissions-view.tsx:138
msgid "Audio Permissions"
msgstr ""

Expand Down Expand Up @@ -550,7 +554,7 @@ msgstr ""
#: src/components/welcome-modal/language-selection-view.tsx:180
#: src/components/welcome-modal/download-progress-view.tsx:248
#: src/components/welcome-modal/calendar-permissions-view.tsx:153
#: src/components/welcome-modal/audio-permissions-view.tsx:169
#: src/components/welcome-modal/audio-permissions-view.tsx:170
msgid "Continue"
msgstr ""

Expand Down Expand Up @@ -671,7 +675,7 @@ msgid "Emoji"
msgstr ""

#: src/components/welcome-modal/calendar-permissions-view.tsx:65
#: src/components/welcome-modal/audio-permissions-view.tsx:77
#: src/components/welcome-modal/audio-permissions-view.tsx:79
#: src/components/settings/views/sound.tsx:59
msgid "Enable"
msgstr ""
Expand Down Expand Up @@ -775,10 +779,10 @@ msgid "Grant Access"
msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:141
msgid "Grant access to audio so Hyprnote can transcribe your meetings"
msgstr ""
#~ msgid "Grant access to audio so Hyprnote can transcribe your meetings"
#~ msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:174
#: src/components/welcome-modal/audio-permissions-view.tsx:175
msgid "Grant both permissions to continue"
msgstr ""

Expand Down Expand Up @@ -911,7 +915,7 @@ msgstr ""
msgid "Members"
msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:147
#: src/components/welcome-modal/audio-permissions-view.tsx:148
#: src/components/settings/views/sound.tsx:97
msgid "Microphone Access"
msgstr ""
Expand Down Expand Up @@ -1065,7 +1069,7 @@ msgstr ""
msgid "Performance difference between languages"
msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:179
#: src/components/welcome-modal/audio-permissions-view.tsx:180
msgid "Permission granted! Detecting changes..."
msgstr ""

Expand Down Expand Up @@ -1109,13 +1113,13 @@ msgstr ""
#~ msgid "Remove {0} from list"
#~ msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:74
#: src/components/welcome-modal/audio-permissions-view.tsx:76
#: src/components/settings/views/sound.tsx:56
msgid "Requesting..."
msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:148
#: src/components/welcome-modal/audio-permissions-view.tsx:157
#: src/components/welcome-modal/audio-permissions-view.tsx:149
#: src/components/welcome-modal/audio-permissions-view.tsx:158
msgid "Required for meeting transcription"
msgstr ""

Expand Down Expand Up @@ -1265,7 +1269,7 @@ msgstr ""
msgid "Synchronization across multiple devices"
msgstr ""

#: src/components/welcome-modal/audio-permissions-view.tsx:156
#: src/components/welcome-modal/audio-permissions-view.tsx:157
#: src/components/settings/views/sound.tsx:106
msgid "System Audio Access"
msgstr ""
Expand Down
1 change: 0 additions & 1 deletion apps/desktop/src/routes/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ function Component() {
<WelcomeModal
isOpen={shouldShowWelcomeModal}
onClose={() => {
commands.setOnboardingNeeded(false);
setOnboardingCompletedThisSession(true);

// Navigate to thank you session if it exists
Expand Down
Loading