Skip to content

fix compact-view connection race #1106

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

Merged
j-chmielewski merged 1 commit into from
Aug 17, 2026
+12 −12
Merged

fix compact-view connection race #1106

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
11 changes: 11 additions & 0 deletions new-ui/src/shared/components/LocationCard/context/context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,17 @@ export const LocationCardProvider = ({
location.mfa_method ?? MfaMethod.Totp,
);

// Other location updates must not undo an optimistic connection transition.
// biome-ignore lint/correctness/useExhaustiveDependencies: synchronize only on active state
useEffect(() => {
if (location.active) {
setCurrentView(LocationCardViews.Connected);
} else {
setMfaMethod(location.mfa_method ?? MfaMethod.Totp);
setCurrentView(LocationCardViews.Default);
}
}, [location.active]);

const setView = useCallback(
(view: LocationCardViewsValue) => {
setPreviousView(currentView);
Expand Down
13 changes: 1 addition & 12 deletions new-ui/src/shared/components/LocationCard/views/ConnectedView/ConnectedView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
import { useEffect } from 'react';
import { MfaMethod } from '../../../../rust-api/types';
import { ThemeSpacing } from '../../../../types';
import { Divider } from '../../../Divider/Divider';
import { SizedBox } from '../../../SizedBox/SizedBox';
import { LocationCardConnectButton } from '../../components/LocationCardConnectButton';
import { LocationCardConnectionInfo } from '../../components/LocationCardConnectionInfo/LocationCardConnectionInfo';
import { LocationCardConnectionTiles } from '../../components/LocationCardConnectionTiles/LocationCardConnectionTiles';
import { useLocationCardContext } from '../../context/context';
import { LocationCardViews } from '../../context/types';

export const ConnectedView = () => {
const { location, setView, setMfaMethod } = useLocationCardContext();

// biome-ignore lint/correctness/useExhaustiveDependencies: side-effect
useEffect(() => {
if (!location.active) {
setMfaMethod(location.mfa_method ?? MfaMethod.Totp);
setView(LocationCardViews.Default);
}
}, [location.active]);
const { location } = useLocationCardContext();

return (
<div className="location-view-connected">
Expand Down
Loading