Skip to content

Fix focus mode activating before values were loaded #68920

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
mountiny merged 1 commit into from
Aug 21, 2025
Merged

Fix focus mode activating before values were loaded #68920

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: 6 additions & 5 deletions src/components/PriorityModeController.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {isReportParticipant, isValidReport} from '@libs/ReportUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import SCREENS from '@src/SCREENS';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
import FocusModeNotification from './FocusModeNotification';

/**
Expand All @@ -25,13 +26,12 @@ import FocusModeNotification from './FocusModeNotification';
export default function PriorityModeController() {
const [accountID] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.accountID, canBeMissing: true});
const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA, {canBeMissing: true});
const [isInFocusMode] = useOnyx(ONYXKEYS.NVP_PRIORITY_MODE, {selector: (priorityMode) => priorityMode === CONST.PRIORITY_MODE.GSD, canBeMissing: true});
const [hasTriedFocusMode] = useOnyx(ONYXKEYS.NVP_TRY_FOCUS_MODE, {canBeMissing: true});
const [isInFocusMode, isInFocusModeMetadata] = useOnyx(ONYXKEYS.NVP_PRIORITY_MODE, {selector: (priorityMode) => priorityMode === CONST.PRIORITY_MODE.GSD, canBeMissing: true});
const [hasTriedFocusMode, hasTriedFocusModeMetadata] = useOnyx(ONYXKEYS.NVP_TRY_FOCUS_MODE, {canBeMissing: true});
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true});
const currentRouteName = useCurrentRouteName();
const [shouldShowModal, setShouldShowModal] = useState(false);
const closeModal = useCallback(() => setShouldShowModal(false), []);

const validReportCount = useMemo(() => {
let count = 0;
Object.values(allReports ?? {}).forEach((report) => {
Expand All @@ -50,10 +50,11 @@ export default function PriorityModeController() {
// Listen for state changes and trigger the #focus mode when appropriate
useEffect(() => {
// Wait for Onyx state to fully load
if (isLoadingReportData !== false || isInFocusMode === undefined || hasTriedFocusMode === undefined || !accountID) {
if (isLoadingReportData !== false || !accountID || isLoadingOnyxValue(isInFocusModeMetadata, hasTriedFocusModeMetadata)) {
return;
}

// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
if (hasSwitched.current || isInFocusMode || hasTriedFocusMode) {
return;
}
Expand All @@ -74,7 +75,7 @@ export default function PriorityModeController() {
updateChatPriorityMode(CONST.PRIORITY_MODE.GSD, true);
setShouldShowModal(true);
hasSwitched.current = true;
}, [accountID, currentRouteName, hasTriedFocusMode, isInFocusMode, isLoadingReportData, validReportCount]);
}, [accountID, currentRouteName, hasTriedFocusMode, hasTriedFocusModeMetadata, isInFocusMode, isInFocusModeMetadata, isLoadingReportData, validReportCount]);

return shouldShowModal ? <FocusModeNotification onClose={closeModal} /> : null;
}
Expand Down
Loading