Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update flaky settings page

Leendert de Borst861c472ccb47
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
index 2b25c2e3a..377544a84 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
@@ -3,7 +3,7 @@ import { MasterPasswordService } from '@aliasvault/client/auth/MasterPasswordSer
import { canAdministerGroup, describeMemberAccess, familySharingText, holdsManifestKey, ownUserIdIn, roleLabel, sharingErrorMessage } from '@aliasvault/client/sharing/FamilySharingView';
import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestRendering';
import { SharingService } from '@aliasvault/client/sharing/SharingService';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
@@ -61,7 +61,7 @@ const FamilySharingSettings: React.FC = () => {
const [notice, setNotice] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
const [pendingVaultCreate, setPendingVaultCreate] = useState<GroupInfo | null>(null);
- const [vaultNames, setVaultNames] = useState<Record<string, string>>({});
+ const vaultNames = useMemo<Record<string, string>>(() => (sqliteClient ? multiManifestRendering.displayNames(sqliteClient) : {}), [sqliteClient]);
const [pendingRemoval, setPendingRemoval] = useState<PendingRemoval | null>(null);
const [pendingVaultDelete, setPendingVaultDelete] = useState<PendingVaultDelete | null>(null);
const [expandedRosters, setExpandedRosters] = useState<Record<string, boolean>>({});
@@ -74,14 +74,13 @@ const FamilySharingSettings: React.FC = () => {
const loaded = await SharingService.getOverview(webApi);
setOverview(loaded);
setInvitationNames(await SharingService.openInvitationNames(loaded.receivedInvitations));
- setVaultNames(sqliteClient ? multiManifestRendering.displayNames(sqliteClient) : {});
setError(null);
} catch {
setError(familySharingText.errors.loadFailed);
} finally {
setIsInitialLoading(false);
}
- }, [webApi, sqliteClient, setIsInitialLoading]);
+ }, [webApi, setIsInitialLoading]);
useEffect(() => {
loadOverview().then(() => {
diff --git a/apps/web/src/pages/settings/FamilySharing.tsx b/apps/web/src/pages/settings/FamilySharing.tsx
index 189965116..478a1303f 100644
--- a/apps/web/src/pages/settings/FamilySharing.tsx
+++ b/apps/web/src/pages/settings/FamilySharing.tsx
@@ -4,7 +4,7 @@ import { MasterPasswordService } from '@aliasvault/client/auth/MasterPasswordSer
import { canAdministerGroup, describeMemberAccess, familySharingText, holdsManifestKey, MAX_SHARED_VAULT_NAME_LENGTH, ownUserIdIn, roleLabel, sharingErrorMessage } from '@aliasvault/client/sharing/FamilySharingView';
import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestRendering';
import { SharingService } from '@aliasvault/client/sharing/SharingService';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
@@ -91,7 +91,7 @@ const FamilySharing: React.FC = () => {
const [notice, setNotice] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
const [newVaultNames, setNewVaultNames] = useState<Record<string, string>>({});
- const [vaultNames, setVaultNames] = useState<Record<string, string>>({});
+ const vaultNames = useMemo<Record<string, string>>(() => (sqliteClient ? multiManifestRendering.displayNames(sqliteClient) : {}), [sqliteClient]);
const [invitationNames, setInvitationNames] = useState<Record<string, string>>({});
const [openVaultMenuId, setOpenVaultMenuId] = useState<string | null>(null);
const [pendingVaultRename, setPendingVaultRename] = useState<ManifestTarget | null>(null);
@@ -103,14 +103,13 @@ const FamilySharing: React.FC = () => {
const loaded = await SharingService.getOverview(webApi);
setOverview(loaded);
setInvitationNames(await SharingService.openInvitationNames(loaded.receivedInvitations));
- setVaultNames(sqliteClient ? multiManifestRendering.displayNames(sqliteClient) : {});
setError(null);
} catch {
setError(familySharingText.errors.loadFailed);
} finally {
setIsLoading(false);
}
- }, [webApi, sqliteClient, setIsLoading]);
+ }, [webApi, setIsLoading]);
useEffect(() => {
void loadOverview();