Skip to content

fix: Keep connecting label on header while logging in #6920

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
Rohit3523 merged 3 commits into from
Jan 16, 2026
Merged

fix: Keep connecting label on header while logging in #6920

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df7b3d3
keep connecting label
Rohit3523 Jan 15, 2026
a296910
chore: format code and fix lint issues [skip ci]
Rohit3523 Jan 15, 2026
e524d44
Merge branch 'develop' into header-status-change
Rohit3523 Jan 16, 2026
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
3 changes: 2 additions & 1 deletion app/views/RoomsListView/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const RoomsListHeaderView = ({ search, searchEnabled }: { search: (text: string)

const connecting = useAppSelector(state => state.meteor.connecting || state.server.loading);
const connected = useAppSelector(state => state.meteor.connected);
const isLoggingIn = useAppSelector(state => state.login.isFetching);
const isFetching = useAppSelector(state => state.rooms.isFetching);
const serverName = useAppSelector(state => state.settings.Site_Name as string);
const server = useAppSelector(state => state.server.server);
Expand All @@ -55,7 +56,7 @@ const RoomsListHeaderView = ({ search, searchEnabled }: { search: (text: string)
let subtitle;
if (supportedVersionsStatus === 'expired') {
subtitle = 'Cannot connect';
} else if (connecting) {
} else if (connecting || isLoggingIn) {
subtitle = I18n.t('Connecting');
} else if (isFetching) {
subtitle = I18n.t('Updating');
Expand Down
Loading