Skip to content

fix(settings): replace the language toast instead of stacking another #2073

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

Open
claude wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(settings): replace the language toast instead of stacking another #2073

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
18 changes: 18 additions & 0 deletions packages/app/src/renderer/features/settings/SettingsPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ vi.mock('../../shell/theme-snapshot', () => ({
currentThemeSnapshot: () => ({ snapshot: true }),
}));

import { toastQueue } from '../../../ui';
import { openSettingsSection } from './sections';
import { SettingsPage } from './SettingsPage';

Expand Down Expand Up @@ -269,6 +270,23 @@ describe('General settings', () => {
expect(mocks.showToast).toHaveBeenCalledTimes(1);
});

it('replaces the language toast instead of stacking another', async () => {
const close = vi.spyOn(toastQueue, 'close');
mocks.showToast.mockReturnValueOnce('de-toast').mockReturnValueOnce('en-toast');
render(<SettingsPage />);
pickLanguage();
await act(async () => {});
act(() => mocks.i18n.switchTo('de'));
fireEvent.click(screen.getByRole('button', { name: /^(?!reset).*locale\.title/ }));
fireEvent.click(screen.getByRole('option', { name: 'English' }));
await act(async () => {});
act(() => mocks.i18n.switchTo('en'));
expect(mocks.showToast).toHaveBeenCalledTimes(2);
expect(close).toHaveBeenCalledWith('de-toast');
expect(close).not.toHaveBeenCalledWith('en-toast');
close.mockRestore();
});

it('does not offer the relaunch when main rejects the language', async () => {
mocks.settingsApi.SetSetting.mockRejectedValue(new Error('nope'));
render(<SettingsPage />);
Expand Down
6 changes: 5 additions & 1 deletion packages/app/src/renderer/features/settings/SettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
showToast,
SideNav,
TextField,
toastQueue,
type IconName,
type SelectOption,
} from '../../../ui';
Expand Down Expand Up @@ -227,6 +228,8 @@ function languageName(code: string): string {

/** The listener of the last language change that is waiting for its toast, so a choice that switches nothing can't leave one behind. */
let stopWaitingForLanguage: (() => void) | undefined;
/** The language toast showing, so the next language change replaces it instead of stacking another. */
let languageToast: string | undefined;

function GeneralSection() {
const { t, i18n } = useTranslation('settings');
Expand Down Expand Up @@ -254,7 +257,8 @@ function GeneralSection() {
stop();
// The editor's own strings and Chromium's follow after a relaunch.
const tNew = i18n.getFixedT(language, 'settings');
showToast({
if (languageToast) toastQueue.close(languageToast);
languageToast = showToast({
title: tNew('locale.relaunchTitle'),
description: tNew('locale.relaunchDescription'),
actionLabel: tNew('locale.relaunch'),
Expand Down
Loading