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
9 changes: 5 additions & 4 deletions src/app/(auth)/connect/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,17 @@ export default function ConnectPage() {
return;
}

addToast("Wallet connected successfully!", "success");
try {
const { getProfile } = await import("@/lib/api/auth");
const { useAuthStore } = await import("@/store/auth-store");
const jwt = useAuthStore.getState().jwt;
const profile = jwt ? await getProfile(jwt) : null;
addToast("Wallet connected successfully!", "success");
router.replace(profile?.displayName ? "/dashboard" : "/onboarding");
} catch {
addToast("Wallet connected, but your profile could not be loaded. Continue setup to get started.", "error");
router.replace("/onboarding");
} catch (err) {
connectingFromPage.current = false;
const errorMessage = err instanceof Error ? err.message : "Failed to fetch profile";
addToast(`Error: ${errorMessage}`, "error");
}
};

Expand Down
2 changes: 2 additions & 0 deletions src/app/settings/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export default function SettingsPage() {
setBackground(profile.background ?? "");
setLearningGoals((profile.learningGoals ?? []).join(", "));
setPace(profile.preferredPace ?? "moderate");
setLanguage(profile.language ?? "English");
})
.catch(() => {
addToast("Failed to load profile", "error");
Expand All @@ -86,6 +87,7 @@ export default function SettingsPage() {
.map((g) => g.trim())
.filter(Boolean),
preferredPace: pace,
language,
});
addToast("Profile updated successfully", "success");
} catch {
Expand Down
9 changes: 8 additions & 1 deletion src/components/shared/confirm-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,15 @@ export function ConfirmDialog({
destructive = false,
icon,
}: ConfirmDialogProps) {
const handleOpenChange = (newOpen: boolean) => {
if (loading && !newOpen) {
return;
}
onOpenChange(newOpen);
};

return (
<Dialog open={open} onOpenChange={onOpenChange}>
<Dialog open={open} onOpenChange={handleOpenChange}>
<DialogContent>
<DialogHeader className="sm:text-center">
<div className={cn(
Expand Down
17 changes: 9 additions & 8 deletions src/lib/hooks/use-sessions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function useSessions() {
const [error, setError] = useState<string | null>(null);
const [revokingId, setRevokingId] = useState<string | null>(null);

const fetchSessions = useCallback(async () => {
const fetchSessions = useCallback(async (controller?: AbortController) => {
if (!jwt) {
setLoading(false);
return;
Expand All @@ -26,14 +26,14 @@ export function useSessions() {
setLoading(true);
setError(null);

const controller = new AbortController();
const signal = controller?.signal;

try {
const data = await getSessions(jwt, controller.signal);
const data = await getSessions(jwt, signal);
setSessions(data || []);
} catch (err) {
if (isAbortError(err)) return;

// Fallback to current session if endpoint is not available
const fallbackSession: UserSession = {
id: "current-session",
Expand All @@ -44,14 +44,12 @@ export function useSessions() {
createdAt: new Date().toISOString(),
isCurrent: true,
};

setSessions([fallbackSession]);
setError(err instanceof Error ? err.message : "Failed to fetch sessions");
} finally {
setLoading(false);
}

return () => controller.abort();
}, [jwt]);

const revoke = useCallback(
Expand All @@ -77,7 +75,10 @@ export function useSessions() {
);

useEffect(() => {
fetchSessions();
const controller = new AbortController();
fetchSessions(controller);

return () => controller.abort();
}, [fetchSessions]);

return {
Expand Down