Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Tweak loading animations
Leendert de Borst30c8671ae320
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsxindex 493f79703..17d7e0864 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx@@ -49,7 +49,7 @@ const FamilySharingSettings: React.FC = () => {const app = useApp();const webApi = useWebApi();const { sqliteClient, loadStoredDatabase } = useDb();- const { setIsInitialLoading } = useLoading();+ const { setIsInitialLoading, showLoading, hideLoading } = useLoading();const [isLoading, setIsLoading] = useState(true);const hasLoadedRef = useRef(false);@@ -241,6 +241,7 @@ const FamilySharingSettings: React.FC = () => {return;}+ showLoading();try {await SharingService.deleteSharedManifest(webApi, target.group.groupId, target.manifest.manifestId, async challenge => (await MasterPasswordService.answerSrpChallenge(challenge, password)).proof);} catch (deleteError) {@@ -249,6 +250,8 @@ const FamilySharingSettings: React.FC = () => {}throw new Error(apiErrorMessage(deleteError, familySharingText.errors.deleteVaultFailed));+ } finally {+ hideLoading();}setPendingVaultDelete(null);diff --git a/apps/web/src/pages/settings/FamilySharing.tsx b/apps/web/src/pages/settings/FamilySharing.tsxindex 2ea807f73..2b5b74e74 100644--- a/apps/web/src/pages/settings/FamilySharing.tsx+++ b/apps/web/src/pages/settings/FamilySharing.tsx@@ -24,6 +24,7 @@ import SmallButton from '@/components/shared/SmallButton';import { useAuth } from '@/context/AuthContext';import { useConfirmModal } from '@/context/ConfirmModalContext';import { useDb } from '@/context/DbContext';+import { useLoading } from '@/context/LoadingContext';import { useWebApi } from '@/context/WebApiContext';import { usePageTitle } from '@/hooks/usePageTitle';import { useVaultSync } from '@/hooks/useVaultSync';@@ -75,6 +76,7 @@ const InvitationCard: React.FC<InvitationCardProps> = ({ vaultName, inviterUsernconst FamilySharing: React.FC = () => {const { t } = useTranslation();const webApi = useWebApi();+ const { showLoading, hideLoading } = useLoading();const { username } = useAuth();const { sqliteClient, loadStoredDatabase } = useDb();const { syncVault } = useVaultSync();@@ -304,12 +306,15 @@ const FamilySharing: React.FC = () => {}setBusy(true);+ showLoading();try {await SharingService.deleteSharedManifest(webApi, target.group.groupId, target.manifest.manifestId, async challenge => (await MasterPasswordService.answerSrpChallenge(challenge, password)).proof);} catch (deleteError) {setDeletePasswordError(apiErrorCodeOf(deleteError) === 'PASSWORD_MISMATCH' ? t('common.errors.wrongPassword') : apiErrorMessage(deleteError, familySharingText.errors.deleteVaultFailed));setBusy(false);return;+ } finally {+ hideLoading();}setPendingVaultDelete(null);