feat(settings): new settings pages, collapsed pickers, privacy choice, grouped calls (#453 phase 2) #466

Merged
jared merged 3 commits from feat/settings-pages into lotus 2026-10-25 12:45:41 -04:00
24 changed files with 1041 additions and 766 deletions

No files matched your search

@@ -1,22 +1,31 @@
- navigation "Settings sections": - navigation "Settings sections":
- button "General" [pressed]: - button "Account" [pressed]:
- img
- paragraph: General
- button "Account":
- img - img
- paragraph: Account - paragraph: Account
- button "Appearance":
- img
- paragraph: Appearance
- button "Messages":
- img
- paragraph: Messages
- button "Notifications": - button "Notifications":
- img - img
- paragraph: Notifications - paragraph: Notifications
- button "Devices": - button "Calls & audio":
- img - img
- paragraph: Devices - paragraph: Calls & audio
- button "Emojis & Stickers": - button "Privacy & security":
- img - img
- paragraph: Emojis & Stickers - paragraph: Privacy & security
- button "Developer Tools": - button "Data & storage":
- img - img
- paragraph: Developer Tools - paragraph: Data & storage
- button "Emojis & stickers":
- img
- paragraph: Emojis & stickers
- button "Advanced":
- img
- paragraph: Advanced
- button "About": - button "About":
- img - img
- paragraph: About - paragraph: About
+1 -1
View File
@@ -31,7 +31,7 @@ test.describe('key upload recovery (#201)', () => {
expect(rejected).toBeGreaterThanOrEqual(3); expect(rejected).toBeGreaterThanOrEqual(3);
await banner.getByRole('button', { name: 'Details' }).click(); await banner.getByRole('button', { name: 'Details' }).click();
await expect(banner).toContainText('Settings → Devices'); await expect(banner).toContainText('Settings → Privacy & security');
await expect(banner).toContainText('already exists'); await expect(banner).toContainText('already exists');
await banner.getByRole('button', { name: /Fix: sign out/ }).click(); await banner.getByRole('button', { name: /Fix: sign out/ }).click();
+3 -1
View File
@@ -75,7 +75,9 @@ test.describe('security nudge (#110, #123)', () => {
await expect(strip(page)).toHaveCount(0); await expect(strip(page)).toHaveCount(0);
}); });
test('no key backup: "Set up key backup" opens Settings → Devices', async ({ page }) => { test('no key backup: "Set up key backup" opens Settings → Privacy & security', async ({
page,
}) => {
test.setTimeout(150_000); test.setTimeout(150_000);
await loginUI(page, user); await loginUI(page, user);
await pastGrace(page); await pastGrace(page);
+1 -1
View File
@@ -39,7 +39,7 @@ test.describe('your data (#114)', () => {
.catch(() => undefined); .catch(() => undefined);
const openGeneral = async () => { const openGeneral = async () => {
await page.getByRole('button', { name: 'User Settings' }).click(); await page.getByRole('button', { name: 'User Settings' }).click();
await page.getByRole('dialog').getByText('General', { exact: true }).first().click(); await page.getByRole('dialog').getByText('Data & storage', { exact: true }).first().click();
await page await page
.getByRole('dialog') .getByRole('dialog')
.getByText('Your data', { exact: true }) .getByText('Your data', { exact: true })
+2 -2
View File
@@ -19,7 +19,7 @@ import { useModalStyle } from '../hooks/useModalStyle';
* cinny-desktop #5: the first time the window is closed, ask whether Lotus Chat * cinny-desktop #5: the first time the window is closed, ask whether Lotus Chat
* should keep running in the tray (calls, messages, notifications) or quit — * should keep running in the tray (calls, messages, notifications) or quit —
* and, in the same moment, whether it should start when you sign in. Asked * and, in the same moment, whether it should start when you sign in. Asked
* once; changeable in Settings → General. The native side sends * once; changeable in Settings → Desktop. The native side sends
* `lotus-close-requested` only while the choice is still "ask", and never * `lotus-close-requested` only while the choice is still "ask", and never
* during a call (a call always goes to the tray). * during a call (a call always goes to the tray).
*/ */
@@ -149,7 +149,7 @@ export function CloseBehaviorPrompt() {
)} )}
</Box> </Box>
<Text size="T200" priority="300"> <Text size="T200" priority="300">
You can change this in Settings → General. You can change this in Settings → Desktop.
</Text> </Text>
</Box> </Box>
</Dialog> </Dialog>
@@ -48,7 +48,7 @@ export function RoomRetention({ permissions }: RoomRetentionProps) {
> >
<SettingTile <SettingTile
title="Message Retention" title="Message Retention"
description="Messages older than this window disappear from the timeline. Each member can opt in to permanently delete their own expired messages in Settings → General; full server-side deletion also requires homeserver retention to be configured." description="Messages older than this window disappear from the timeline. Each member can opt in to permanently delete their own expired messages in Settings → Messages; full server-side deletion also requires homeserver retention to be configured."
> >
<Box gap="200" alignItems="Center" style={{ flexWrap: 'wrap' }}> <Box gap="200" alignItems="Center" style={{ flexWrap: 'wrap' }}>
{RETENTION_PRESETS.map((preset) => { {RETENTION_PRESETS.map((preset) => {
+52 -43
View File
@@ -15,7 +15,16 @@ import {
Text, Text,
} from 'folds'; } from 'folds';
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import { General } from './general'; import {
AdvancedDisplayOptions,
AppearancePage,
CallsPage,
DataStoragePage,
DesktopPage,
MessagesPage,
Privacy,
} from './general';
import { isTauri as isTauriEnv } from '../../hooks/useTauri';
import { PageNav, PageNavContent, PageNavHeader, PageRoot } from '../../components/page'; import { PageNav, PageNavContent, PageNavHeader, PageRoot } from '../../components/page';
import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize'; import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
import { Account } from './account'; import { Account } from './account';
@@ -45,43 +54,23 @@ type SettingsMenuItem = {
const useSettingsMenuItems = (): SettingsMenuItem[] => const useSettingsMenuItems = (): SettingsMenuItem[] =>
useMemo( useMemo(
() => [ () =>
{ [
page: SettingsPages.GeneralPage, { page: SettingsPages.AccountPage, name: 'Account', icon: Icons.User },
name: 'General', { page: SettingsPages.AppearancePage, name: 'Appearance', icon: Icons.Sun },
icon: Icons.Setting, { page: SettingsPages.MessagesPage, name: 'Messages', icon: Icons.Message },
}, { page: SettingsPages.NotificationPage, name: 'Notifications', icon: Icons.Bell },
{ { page: SettingsPages.CallsPage, name: 'Calls & audio', icon: Icons.Phone },
page: SettingsPages.AccountPage, { page: SettingsPages.DevicesPage, name: 'Privacy & security', icon: Icons.ShieldUser },
name: 'Account', { page: SettingsPages.DataStoragePage, name: 'Data & storage', icon: Icons.Download },
icon: Icons.User, // [Gitea #459] Desktop-only options: nothing to show in a browser.
}, ...(isTauriEnv()
{ ? [{ page: SettingsPages.DesktopPage, name: 'Desktop', icon: Icons.Monitor }]
page: SettingsPages.NotificationPage, : []),
name: 'Notifications', { page: SettingsPages.EmojisStickersPage, name: 'Emojis & stickers', icon: Icons.Smile },
icon: Icons.Bell, { page: SettingsPages.DeveloperToolsPage, name: 'Advanced', icon: Icons.Terminal },
}, { page: SettingsPages.AboutPage, name: 'About', icon: Icons.Info },
{ ] as SettingsMenuItem[],
page: SettingsPages.DevicesPage,
name: 'Devices',
icon: Icons.Monitor,
},
{
page: SettingsPages.EmojisStickersPage,
name: 'Emojis & Stickers',
icon: Icons.Smile,
},
{
page: SettingsPages.DeveloperToolsPage,
name: 'Developer Tools',
icon: Icons.Terminal,
},
{
page: SettingsPages.AboutPage,
name: 'About',
icon: Icons.Info,
},
],
[], [],
); );
@@ -102,7 +91,7 @@ export function Settings({ initialPage, requestClose }: SettingsProps) {
const screenSize = useScreenSizeContext(); const screenSize = useScreenSizeContext();
const [activePage, setActivePage] = useState<SettingsPages | undefined>(() => { const [activePage, setActivePage] = useState<SettingsPages | undefined>(() => {
if (initialPage) return initialPage; if (initialPage) return initialPage;
return screenSize === ScreenSize.Mobile ? undefined : SettingsPages.GeneralPage; return screenSize === ScreenSize.Mobile ? undefined : SettingsPages.AccountPage;
}); });
const menuItems = useSettingsMenuItems(); const menuItems = useSettingsMenuItems();
@@ -207,8 +196,20 @@ export function Settings({ initialPage, requestClose }: SettingsProps) {
) )
} }
> >
{activePage === SettingsPages.GeneralPage && ( {activePage === SettingsPages.AppearancePage && (
<General requestClose={handlePageRequestClose} /> <AppearancePage requestClose={handlePageRequestClose} />
)}
{activePage === SettingsPages.MessagesPage && (
<MessagesPage requestClose={handlePageRequestClose} />
)}
{activePage === SettingsPages.CallsPage && (
<CallsPage requestClose={handlePageRequestClose} />
)}
{activePage === SettingsPages.DataStoragePage && (
<DataStoragePage requestClose={handlePageRequestClose} />
)}
{activePage === SettingsPages.DesktopPage && (
<DesktopPage requestClose={handlePageRequestClose} />
)} )}
{activePage === SettingsPages.AccountPage && ( {activePage === SettingsPages.AccountPage && (
<Account requestClose={handlePageRequestClose} /> <Account requestClose={handlePageRequestClose} />
@@ -217,13 +218,21 @@ export function Settings({ initialPage, requestClose }: SettingsProps) {
<Notifications requestClose={handlePageRequestClose} /> <Notifications requestClose={handlePageRequestClose} />
)} )}
{activePage === SettingsPages.DevicesPage && ( {activePage === SettingsPages.DevicesPage && (
<Devices requestClose={handlePageRequestClose} /> <Devices
title="Privacy & security"
before={<Privacy />}
requestClose={handlePageRequestClose}
/>
)} )}
{activePage === SettingsPages.EmojisStickersPage && ( {activePage === SettingsPages.EmojisStickersPage && (
<EmojisStickers requestClose={handlePageRequestClose} /> <EmojisStickers requestClose={handlePageRequestClose} />
)} )}
{activePage === SettingsPages.DeveloperToolsPage && ( {activePage === SettingsPages.DeveloperToolsPage && (
<DeveloperTools requestClose={handlePageRequestClose} /> <DeveloperTools
title="Advanced"
before={<AdvancedDisplayOptions />}
requestClose={handlePageRequestClose}
/>
)} )}
{activePage === SettingsPages.AboutPage && <About requestClose={handlePageRequestClose} />} {activePage === SettingsPages.AboutPage && <About requestClose={handlePageRequestClose} />}
</PageRoot> </PageRoot>
@@ -313,7 +313,7 @@ function ProfileDisplayName({ profile, userId }: ProfileProps) {
<SettingTile <SettingTile
title={ title={
<Text as="span" size="L400"> <Text as="span" size="L400">
Display Name Display name
</Text> </Text>
} }
> >
@@ -576,7 +576,7 @@ function ProfileStatus() {
<SettingTile <SettingTile
title={ title={
<Text as="span" size="L400"> <Text as="span" size="L400">
Status Message Status message
</Text> </Text>
} }
description={ description={
@@ -102,6 +102,8 @@ export function ProfileDecoration() {
const [current, setCurrent] = useState<string | null>(null); const [current, setCurrent] = useState<string | null>(null);
const [selected, setSelected] = useState<string | null>(null); const [selected, setSelected] = useState<string | null>(null);
// [Gitea #460] The catalog stays closed until "Change"; it was always open.
const [browsing, setBrowsing] = useState(false);
// Distinguish "confirmed no decoration" from "failed to load": a fetch // Distinguish "confirmed no decoration" from "failed to load": a fetch
// failure must not be shown as (and saved over) "None". // failure must not be shown as (and saved over) "None".
const [loadError, setLoadError] = useState(false); const [loadError, setLoadError] = useState(false);
@@ -199,7 +201,7 @@ export function ProfileDecoration() {
<SettingTile <SettingTile
title={ title={
<Text as="span" size="L400"> <Text as="span" size="L400">
Avatar Decoration Avatar decoration
</Text> </Text>
} }
description={ description={
@@ -282,6 +284,20 @@ export function ProfileDecoration() {
</Button> </Button>
)} )}
</Box> </Box>
{!loadError && (
<Button
type="button"
size="300"
radii="300"
variant="Secondary"
fill="Soft"
outlined
aria-expanded={browsing}
onClick={() => setBrowsing((b) => !b)}
>
<Text size="B300">{browsing ? 'Done' : 'Change'}</Text>
</Button>
)}
{hasChanges && !loadError && ( {hasChanges && !loadError && (
<Button <Button
type="button" type="button"
@@ -324,73 +340,77 @@ export function ProfileDecoration() {
</Text> </Text>
)} )}
{/* Search + category tabs. Only one category (or the search results) {browsing && (
<>
{/* Search + category tabs. Only one category (or the search results)
is mounted at a time so the picker never loads the whole catalog. */} is mounted at a time so the picker never loads the whole catalog. */}
<Input <Input
aria-label="Search decorations" aria-label="Search decorations"
placeholder="Search decorations" placeholder="Search decorations"
value={search} value={search}
onChange={(e: ChangeEvent<HTMLInputElement>) => setSearch(e.target.value)} onChange={(e: ChangeEvent<HTMLInputElement>) => setSearch(e.target.value)}
variant="Secondary" variant="Secondary"
size="400" size="400"
radii="300" radii="300"
before={<Icon size="100" src={Icons.Search} />} before={<Icon size="100" src={Icons.Search} />}
/> />
{!query && ( {!query && (
<Box gap="100" wrap="Wrap" role="tablist" aria-label="Decoration categories"> <Box gap="100" wrap="Wrap" role="tablist" aria-label="Decoration categories">
{DECORATION_CATEGORIES.map((category) => ( {DECORATION_CATEGORIES.map((category) => (
<Chip <Chip
key={category.id} key={category.id}
type="button" type="button"
role="tab" role="tab"
aria-selected={category.id === activeCategory} aria-selected={category.id === activeCategory}
variant={category.id === activeCategory ? 'Primary' : 'Secondary'} variant={category.id === activeCategory ? 'Primary' : 'Secondary'}
fill="Soft" fill="Soft"
outlined={category.id === activeCategory} outlined={category.id === activeCategory}
radii="Pill" radii="Pill"
onClick={() => setActiveCategory(category.id)} onClick={() => setActiveCategory(category.id)}
> >
<Text as="span" size="B300"> <Text as="span" size="B300">
{category.label} {category.label}
</Text> </Text>
</Chip> </Chip>
))} ))}
</Box> </Box>
)} )}
<div
role={query ? undefined : 'tabpanel'}
style={{
maxHeight: 360,
overflowY: 'auto',
overflowX: 'hidden',
paddingRight: 4,
}}
>
{visible.length === 0 ? (
<Text size="T300" priority="300">
No decorations match “{search.trim()}”.
</Text>
) : (
<div <div
role={query ? undefined : 'tabpanel'}
style={{ style={{
display: 'grid', maxHeight: 360,
gridTemplateColumns: `repeat(auto-fill, ${CELL_SIZE}px)`, overflowY: 'auto',
gap: 20, overflowX: 'hidden',
padding: 2, paddingRight: 4,
}} }}
> >
{visible.map((d) => ( {visible.length === 0 ? (
<DecorationPreviewCell <Text size="T300" priority="300">
key={d.slug} No decorations match “{search.trim()}”.
slug={d.slug} </Text>
name={d.name} ) : (
selected={selected === d.slug} <div
onSelect={handleSelect} style={{
/> display: 'grid',
))} gridTemplateColumns: `repeat(auto-fill, ${CELL_SIZE}px)`,
gap: 20,
padding: 2,
}}
>
{visible.map((d) => (
<DecorationPreviewCell
key={d.slug}
slug={d.slug}
name={d.name}
selected={selected === d.slug}
onSelect={handleSelect}
/>
))}
</div>
)}
</div> </div>
)} </>
</div> )}
</Box> </Box>
</SettingTile> </SettingTile>
); );
@@ -1,4 +1,4 @@
import React, { useCallback, useState } from 'react'; import React, { useCallback, useState, ReactNode } from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll, Switch, Button } from 'folds'; import { Box, Text, IconButton, Icon, Icons, Scroll, Switch, Button } from 'folds';
import { Page, PageContent, PageHeader } from '../../../components/page'; import { Page, PageContent, PageHeader } from '../../../components/page';
import { SequenceCard } from '../../../components/sequence-card'; import { SequenceCard } from '../../../components/sequence-card';
@@ -18,8 +18,12 @@ import { CryptoDiagnostics } from '../developer/CryptoDiagnostics';
type DeveloperToolsProps = { type DeveloperToolsProps = {
requestClose: () => void; requestClose: () => void;
/** [Gitea #459] Shown as the page title (the menu entry's name). */
title?: string;
/** [Gitea #459] Sections shown above this page's own. */
before?: ReactNode;
}; };
export function DeveloperTools({ requestClose }: DeveloperToolsProps) { export function DeveloperTools({ requestClose, title, before }: DeveloperToolsProps) {
const mx = useMatrixClient(); const mx = useMatrixClient();
const [developerTools, setDeveloperTools] = useSetting(settingsAtom, 'developerTools'); const [developerTools, setDeveloperTools] = useSetting(settingsAtom, 'developerTools');
const [expand, setExpend] = useState(false); const [expand, setExpend] = useState(false);
@@ -49,7 +53,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
<Box grow="Yes" gap="200"> <Box grow="Yes" gap="200">
<Box grow="Yes" alignItems="Center" gap="200"> <Box grow="Yes" alignItems="Center" gap="200">
<Text size="H3" truncate> <Text size="H3" truncate>
Developer Tools {title ?? 'Developer Tools'}
</Text> </Text>
</Box> </Box>
<Box shrink="No"> <Box shrink="No">
@@ -63,6 +67,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
<Scroll hideTrack visibility="Hover"> <Scroll hideTrack visibility="Hover">
<PageContent> <PageContent>
<Box direction="Column" gap="700"> <Box direction="Column" gap="700">
{before}
<Box direction="Column" gap="100"> <Box direction="Column" gap="100">
<Text size="L400">Options</Text> <Text size="L400">Options</Text>
<SequenceCard <SequenceCard
@@ -137,7 +137,7 @@ function DeviceRename({ device, onCancel, onRename, refreshDeviceList }: DeviceR
return ( return (
<Box as="form" onSubmit={handleSubmit} direction="Column" gap="100"> <Box as="form" onSubmit={handleSubmit} direction="Column" gap="100">
<Text size="L400">Device Name</Text> <Text size="L400">Device name</Text>
<Box gap="200"> <Box gap="200">
<Box grow="Yes" direction="Column"> <Box grow="Yes" direction="Column">
<Input <Input
@@ -1,4 +1,4 @@
import React from 'react'; import React, { ReactNode } from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds'; import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '../../../components/page'; import { Page, PageContent, PageHeader } from '../../../components/page';
import { SequenceCard } from '../../../components/sequence-card'; import { SequenceCard } from '../../../components/sequence-card';
@@ -38,8 +38,12 @@ function DevicesPlaceholder() {
type DevicesProps = { type DevicesProps = {
requestClose: () => void; requestClose: () => void;
/** [Gitea #459] Shown as the page title (the menu entry's name). */
title?: string;
/** [Gitea #459] Sections shown above this page's own. */
before?: ReactNode;
}; };
export function Devices({ requestClose }: DevicesProps) { export function Devices({ requestClose, title, before }: DevicesProps) {
const mx = useMatrixClient(); const mx = useMatrixClient();
const crypto = mx.getCrypto(); const crypto = mx.getCrypto();
const crossSigningActive = useCrossSigningActive(); const crossSigningActive = useCrossSigningActive();
@@ -70,7 +74,7 @@ export function Devices({ requestClose }: DevicesProps) {
<Box grow="Yes" gap="200"> <Box grow="Yes" gap="200">
<Box grow="Yes" alignItems="Center" gap="200"> <Box grow="Yes" alignItems="Center" gap="200">
<Text size="H3" truncate> <Text size="H3" truncate>
Devices {title ?? 'Devices'}
</Text> </Text>
</Box> </Box>
<Box shrink="No"> <Box shrink="No">
@@ -84,6 +88,7 @@ export function Devices({ requestClose }: DevicesProps) {
<Scroll hideTrack visibility="Hover"> <Scroll hideTrack visibility="Hover">
<PageContent> <PageContent>
<Box direction="Column" gap="700"> <Box direction="Column" gap="700">
{before}
<Box direction="Column" gap="100"> <Box direction="Column" gap="100">
<Text size="L400">Security</Text> <Text size="L400">Security</Text>
<SequenceCard <SequenceCard
@@ -67,7 +67,7 @@ function ExportKeys() {
{(match, doMatch, passRef, confPassRef) => ( {(match, doMatch, passRef, confPassRef) => (
<> <>
<Box grow="Yes" direction="Column" gap="100"> <Box grow="Yes" direction="Column" gap="100">
<Text size="L400">New Password</Text> <Text size="L400">New password</Text>
<PasswordInput <PasswordInput
ref={passRef} ref={passRef}
name="passwordInput" name="passwordInput"
@@ -82,7 +82,7 @@ function ExportKeys() {
/> />
</Box> </Box>
<Box grow="Yes" direction="Column" gap="100"> <Box grow="Yes" direction="Column" gap="100">
<Text size="L400">Confirm Password</Text> <Text size="L400">Confirm password</Text>
<PasswordInput <PasswordInput
ref={confPassRef} ref={confPassRef}
style={{ color: match ? undefined : color.Critical.Main }} style={{ color: match ? undefined : color.Critical.Main }}
File diff suppressed because it is too large. Load diff
@@ -1,7 +1,7 @@
import React, { useCallback, useRef, useState } from 'react'; import React, { useCallback, useRef, useState } from 'react';
import { useAtom } from 'jotai'; import { useAtom } from 'jotai';
import { Method } from 'matrix-js-sdk'; import { Method } from 'matrix-js-sdk';
import { Box, Button, Text, color } from 'folds'; import { Box, Button, RadioButton, Text, color } from 'folds';
import { SequenceCard } from '../../../components/sequence-card'; import { SequenceCard } from '../../../components/sequence-card';
import { SequenceCardStyle } from '../styles.css'; import { SequenceCardStyle } from '../styles.css';
import { SettingTile } from '../../../components/setting-tile'; import { SettingTile } from '../../../components/setting-tile';
@@ -224,22 +224,24 @@ export function YourDataSection() {
here: here:
</Text> </Text>
<label> <label>
<input <RadioButton
type="radio"
name="your-data-conflicts" name="your-data-conflicts"
variant="Primary"
size="300"
checked={!preferFile} checked={!preferFile}
onChange={() => setPreferFile(false)} onClick={() => setPreferFile(false)}
/>{' '} />{' '}
<Text as="span" size="T200"> <Text as="span" size="T200">
Keep mine Keep mine
</Text> </Text>
</label> </label>
<label> <label>
<input <RadioButton
type="radio"
name="your-data-conflicts" name="your-data-conflicts"
variant="Primary"
size="300"
checked={preferFile} checked={preferFile}
onChange={() => setPreferFile(true)} onClick={() => setPreferFile(true)}
/>{' '} />{' '}
<Text as="span" size="T200"> <Text as="span" size="T200">
Use the file&apos;s Use the file&apos;s
@@ -334,6 +334,11 @@ export function PushRuleEditor() {
return ( return (
<Box direction="Column" gap="100"> <Box direction="Column" gap="100">
<Text size="L400">Advanced push rules</Text> <Text size="L400">Advanced push rules</Text>
{/* [Gitea #459] Matrix terms kept, with one line on what they are. */}
<Text size="T200" priority="300">
The raw Matrix notification rules behind the options above, checked in this order: override,
room, sender, then underride. You rarely need to change these.
</Text>
<RuleSection title="Override rules" kind={PushRuleKind.Override} rules={overrideRules} /> <RuleSection title="Override rules" kind={PushRuleKind.Override} rules={overrideRules} />
<RuleSection <RuleSection
title="Room rules" title="Room rules"
+9 -1
View File
@@ -1,11 +1,19 @@
/** Settings dialog pages. Kept apart from Settings.tsx so callers can name a /** Settings dialog pages. Kept apart from Settings.tsx so callers can name a
* page without pulling the dialog into the entry chunk. */ * page without pulling the dialog into the entry chunk. */
export enum SettingsPages { export enum SettingsPages {
GeneralPage,
AccountPage, AccountPage,
// [Gitea #459] These replace the old catch-all General page.
AppearancePage,
MessagesPage,
NotificationPage, NotificationPage,
CallsPage,
/** "Privacy & security": privacy options plus devices and encryption. */
DevicesPage, DevicesPage,
DataStoragePage,
/** Desktop app only. */
DesktopPage,
EmojisStickersPage, EmojisStickersPage,
/** "Advanced": developer tools and display plumbing. */
DeveloperToolsPage, DeveloperToolsPage,
AboutPage, AboutPage,
} }
+1 -1
View File
@@ -140,7 +140,7 @@ export function useSettingsSync(): void {
} }
/** /**
* Manual actions for Settings → General → Sync. `pushNow` stamps a fresh * Manual actions for Settings → Data & storage → Sync. `pushNow` stamps a fresh
* snapshot of THIS device so it wins on every other device; `clearRemote` * snapshot of THIS device so it wins on every other device; `clearRemote`
* blanks the account-data event (other devices ignore the invalid content and * blanks the account-data event (other devices ignore the invalid content and
* keep their local settings until someone pushes again). * keep their local settings until someone pushes again).
+3 -3
View File
@@ -1015,13 +1015,13 @@ function TauriUpdateFeature() {
dismissToast(UPDATE_PROGRESS_TOAST); dismissToast(UPDATE_PROGRESS_TOAST);
if (!failure) return; if (!failure) return;
// Short on purpose; the full explanation and a Download installer button // Short on purpose; the full explanation and a Download installer button
// are in Settings → General → App updates. // are in Settings → Desktop → App updates.
const busy = failure.phase !== 'install' && isNetworkUpdateError(failure.message); const busy = failure.phase !== 'install' && isNetworkUpdateError(failure.message);
setToast({ setToast({
id: UPDATE_FAILED_TOAST, id: UPDATE_FAILED_TOAST,
iconSrc: Icons.Warning, iconSrc: Icons.Warning,
displayName: 'Update didn’t install', displayName: 'Update didn’t install',
body: `${busy ? 'The update server seems busy. ' : ''}Click to try again, or get the installer in Settings → General → App updates.`, body: `${busy ? 'The update server seems busy. ' : ''}Click to try again, or get the installer in Settings → Desktop → App updates.`,
roomName: 'System', roomName: 'System',
roomId: '', roomId: '',
sticky: true, sticky: true,
@@ -1062,7 +1062,7 @@ function TauriUpdateFeature() {
roomName: 'System', roomName: 'System',
roomId: '', roomId: '',
onClick: () => { onClick: () => {
if (viaPackage) requestSettings('general'); if (viaPackage) requestSettings('desktop');
else installFromToast(); else installFromToast();
}, },
sticky: true, sticky: true,
+1 -1
View File
@@ -61,7 +61,7 @@ import { AutoDiscovery } from './AutoDiscovery';
// Capture-only E2EE diagnostics ring buffer (KE-1→4 signatures) — installed at // Capture-only E2EE diagnostics ring buffer (KE-1→4 signatures) — installed at
// module load so it sees crypto warnings from the very first sync. Idempotent; // module load so it sees crypto warnings from the very first sync. Idempotent;
// report download lives in Settings → Developer Tools → Crypto Diagnostics. // report download lives in Settings → Advanced → Crypto diagnostics.
installCryptoDiagLog(); installCryptoDiagLog();
function ClientRootLoading() { function ClientRootLoading() {
+2 -2
View File
@@ -72,8 +72,8 @@ export function KeyUploadBanner() {
rejects every new upload and other people can&apos;t start fresh encrypted sessions rejects every new upload and other people can&apos;t start fresh encrypted sessions
with you. This usually happens after the browser cleared this site&apos;s storage with you. This usually happens after the browser cleared this site&apos;s storage
while you stayed signed in. Before signing out, make sure this device is verified or while you stayed signed in. Before signing out, make sure this device is verified or
key backup is on (Settings → Devices), so your message history comes back when you key backup is on (Settings → Privacy & security), so your message history comes back
sign in again. when you sign in again.
</Text> </Text>
{lastError && ( {lastError && (
<Text size="T200" align="Center" priority="300" style={{ wordBreak: 'break-word' }}> <Text size="T200" align="Center" priority="300" style={{ wordBreak: 'break-word' }}>
+4 -1
View File
@@ -180,7 +180,10 @@ export function SettingsTab() {
useEffect(() => { useEffect(() => {
if (!settingsRequest) return; if (!settingsRequest) return;
const page = { const page = {
general: SettingsPages.GeneralPage, // [Gitea #459] General is gone; its old deep links land on Appearance.
general: SettingsPages.AppearancePage,
appearance: SettingsPages.AppearancePage,
desktop: SettingsPages.DesktopPage,
account: SettingsPages.AccountPage, account: SettingsPages.AccountPage,
notifications: SettingsPages.NotificationPage, notifications: SettingsPages.NotificationPage,
devices: SettingsPages.DevicesPage, devices: SettingsPages.DevicesPage,
+7 -1
View File
@@ -1,6 +1,12 @@
import { atom } from 'jotai'; import { atom } from 'jotai';
export type SettingsRequestPage = 'general' | 'account' | 'notifications' | 'devices'; export type SettingsRequestPage =
| 'general'
| 'account'
| 'notifications'
| 'devices'
| 'desktop'
| 'appearance';
/** /**
* Ask the sidebar to open User Settings at a page from anywhere in the app * Ask the sidebar to open User Settings at a page from anywhere in the app
+1 -1
View File
@@ -10,7 +10,7 @@
* cross-signing: the setup flow does both). * cross-signing: the setup flow does both).
* *
* - stale-sessions (#113, lowest priority): sessions of this account not used * - stale-sessions (#113, lowest priority): sessions of this account not used
* for 90+ days; Review opens Settings → Devices with them ticked to sign out. * for 90+ days; Review opens Settings → Privacy & security with them ticked to sign out.
* *
* Anything not yet known (crypto still loading) → no nudge. Timing: not in * Anything not yet known (crypto still loading) → no nudge. Timing: not in
* the first 24 h on a device (onboarding), "Not now" snoozes 7 days, three * the first 24 h on a device (onboarding), "Not now" snoozes 7 days, three