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
11 changes: 6 additions & 5 deletions src/components/LanguageProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import gu from '../../translations/gu.json';
import kn from '../../translations/kn.json';
import ml from '../../translations/ml.json';
import as_ from '../../translations/as.json';
import { DEFAULT_LANGUAGE, LANGUAGES, type LanguageCode } from './screens-component/chat-screen/config';
import { DEFAULT_LANGUAGE } from './screens-component/chat-screen/config';

type LanguageCode = 'hi' | 'en' | 'bn' | 'te' | 'mr' | 'ta' | 'gu' | 'kn' | 'ml' | 'as';

interface LanguageContextType {
language: LanguageCode;
Expand All @@ -28,13 +30,12 @@ const LanguageContext = createContext<LanguageContextType | undefined>(undefined
export const LanguageProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
const [language, setLanguageState] = useState<LanguageCode>(() => {
const saved = localStorage.getItem('app_language');
return saved && saved in LANGUAGES ? (saved as LanguageCode) : DEFAULT_LANGUAGE;
return (saved as LanguageCode) || DEFAULT_LANGUAGE;
});

const setLanguage = (lang: LanguageCode) => {
const nextLanguage = lang in LANGUAGES ? lang : DEFAULT_LANGUAGE;
setLanguageState(nextLanguage);
localStorage.setItem('app_language', nextLanguage);
setLanguageState(lang);
localStorage.setItem('app_language', lang);
};

const t = useCallback((key: string, params?: Record<string, string>): string | string[] => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import { useState } from "react";
import { cn } from "@/lib/utils";
import {
Popover,
Expand All @@ -7,6 +7,7 @@ import {
} from "@/components/ui/popover";
import { LANGUAGES } from "../config";
import { useLanguage } from "@/components/LanguageProvider";
import { useChatStore } from "@/hooks/store/chat";

type LanguageSelectionDropdownProps = {
children: React.ReactNode;
Expand All @@ -15,19 +16,20 @@ type LanguageSelectionDropdownProps = {
export function LanguageSelectionDropdown({
children
}: LanguageSelectionDropdownProps) {
const { language: selectedLanguage } = useLanguage();
const { language: selectedLanguage, setLanguage } = useLanguage();
const fetchNotifications = useChatStore((state) => state.fetchNotifications);
const [open, setOpen] = useState(false);

const disabledTrigger = React.isValidElement(children)
? React.cloneElement(children as React.ReactElement<any>, {
disabled: true,
"aria-disabled": true
})
: children;
const handleLanguageSelect = (code: keyof typeof LANGUAGES) => {
setLanguage(code);
setOpen(false);
void fetchNotifications();
};

return (
<Popover open={false}>
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
{disabledTrigger}
{children}
</PopoverTrigger>
<PopoverContent
className="w-[200px] p-0 rounded-2xl border border-gray-100 dark:border-transparent overflow-hidden shadow-xl"
Expand All @@ -40,12 +42,12 @@ export function LanguageSelectionDropdown({
return (
<button
key={language.code}
disabled
onClick={() => handleLanguageSelect(language.code)}
className={cn(
"w-full flex items-center px-5 py-3.5 transition-colors text-left cursor-not-allowed",
"w-full flex items-center px-5 py-3.5 transition-colors text-left cursor-pointer",
isActive
? "bg-[#FEF2B2] dark:bg-[#EFC300] text-gray-900 font-bold"
: "bg-white dark:bg-[#5D5D5D] text-gray-800 dark:text-white font-medium opacity-70"
: "bg-white dark:bg-[#5D5D5D] text-gray-800 dark:text-white font-medium hover:bg-gray-50 dark:hover:brightness-110"
)}
>
<span className="text-sm font-medium">
Expand Down
18 changes: 3 additions & 15 deletions src/hooks/store/chat/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type {
ChatMessage,
TextMessage
} from "@/components/screens-component/chat-screen/components/bubbles/chat-types";
import { DEFAULT_LANGUAGE, LANGUAGES, type LanguageCode } from "@/components/screens-component/chat-screen/config";
import { LANGUAGES, type LanguageCode } from "@/components/screens-component/chat-screen/config";

import {
fetchSuggestions,
Expand Down Expand Up @@ -99,12 +99,7 @@ type ChatStore = {
sessionId: string | null;
initializeSession: (user: any) => Promise<void>;
sendText: (text: string, language: string, t?: any) => Promise<void>;
sendAudio: (
blob: Blob,
sessionId: string,
language: string,
onLanguageDetected?: (language: LanguageCode) => void
) => Promise<void>;
sendAudio: (blob: Blob, sessionId: string, language: string) => Promise<void>;
sendImage: (imageFile: File, language: string, t?: any) => Promise<void>;
sendQuickAction: (id: string, language: string, t?: any) => void;
sendQuickReply: (payload: string, language: string, t?: any) => void;
Expand Down Expand Up @@ -290,11 +285,6 @@ function getResponseLanguage(language: string): LanguageCode | undefined {
return language in LANGUAGES ? (language as LanguageCode) : undefined;
}

function getTranscriptionLanguage(status?: string, langCode?: string): LanguageCode {
if (status !== "success" || !langCode) return DEFAULT_LANGUAGE;
return getResponseLanguage(langCode) ?? DEFAULT_LANGUAGE;
}

function makeImageMessage(imageUrl: string, caption?: string): ChatMessage {
return {
id: crypto.randomUUID(),
Expand Down Expand Up @@ -849,7 +839,7 @@ export const useChatStore = create<ChatStore>((set, get) => ({
}
},

sendAudio: async (blob, sessionId, language, onLanguageDetected) => {
sendAudio: async (blob, sessionId, language) => {
if (!blob) return;

set({ isTranscribing: true });
Expand Down Expand Up @@ -922,7 +912,6 @@ export const useChatStore = create<ChatStore>((set, get) => ({
sessionId,
language
);
onLanguageDetected?.(getTranscriptionLanguage(transcription?.status, transcription?.lang_code));

if (transcription && transcription.text) {
set((state) => ({
Expand All @@ -935,7 +924,6 @@ export const useChatStore = create<ChatStore>((set, get) => ({
}
} catch (error) {
console.error("Transcription error:", error);
onLanguageDetected?.(DEFAULT_LANGUAGE);
set({ isAssistantTyping: false, isTranscribing: false });
set({ toast: { message: "Transcription failed. Please try again.", type: "error" } });
throw error;
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/chat-layout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function ChatLayout() {
const setToast = useChatStore((s) => s.setToast);
const fetchLocation = useChatStore((s) => s.fetchLocation);

const { language, setLanguage, t } = useLanguage();
const { language, t } = useLanguage();
const [settingsOpen, setSettingsOpen] = useState(false);
const [showLocationPrompt, setShowLocationPrompt] = useState(false);

Expand Down Expand Up @@ -131,7 +131,7 @@ function ChatLayout() {
sendText(text, language, t);
} else if (voice) {
try {
await sendAudio(voice, sessionId || '', language, setLanguage);
await sendAudio(voice, sessionId || '', language);
} catch (error) {
console.error(error);
}
Expand Down
Loading