Skip to content

[NO QA] Reduce re-renders & remove global reports subscription in FloatingActionButtonAndPopover #83057

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

Open
JS00001 wants to merge 7 commits into
base: main
Choose a base branch
from
+16 −3
Open

[NO QA] Reduce re-renders & remove global reports subscription in FloatingActionButtonAndPopover #83057

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c3c647d
add selector
JS00001 Feb 20, 2026
b436b02
use selctor
JS00001 Feb 20, 2026
c24ffea
apply the selector
JS00001 Feb 20, 2026
2aa516a
fix types
JS00001 Feb 20, 2026
c8a3262
fix types
JS00001 Feb 20, 2026
6af5002
add deps
JS00001 Feb 20, 2026
5fc2fba
add back can be missing
JS00001 Feb 20, 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
19 changes: 16 additions & 3 deletions src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import {isTrackingSelector} from '@src/selectors/GPSDraftDetails';
import type * as OnyxTypes from '@src/types/onyx';
import type {QuickActionName} from '@src/types/onyx/QuickAction';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import getEmptyArray from '@src/types/utils/getEmptyArray';

type PolicySelector = Pick<OnyxTypes.Policy, 'type' | 'role' | 'isPolicyExpenseChatEnabled' | 'pendingAction' | 'avatarURL' | 'name' | 'id' | 'areInvoicesEnabled'>;

Expand Down Expand Up @@ -138,18 +139,30 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, ref
const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, {canBeMissing: true});
const [quickActionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${quickAction?.chatReportID}`, {canBeMissing: true});
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true});
const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {canBeMissing: true});
const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, {canBeMissing: true});
const {isRestrictedToPreferredPolicy, isRestrictedPolicyCreation} = usePreferredPolicy();

const workspaceChatsSelector = useCallback(
(reports: OnyxCollection<OnyxTypes.Report>) => {
return getWorkspaceChats(activePolicyID, [session?.accountID ?? CONST.DEFAULT_NUMBER_ID], reports);
},
[activePolicyID, session?.accountID],
);
Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can move this selector in selectors folder
And then let's create a test for this selector!

Copy link
Contributor Author

@JS00001 JS00001 Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method isn't used anywhere else, so I think it'd be better to keep it inline

Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Feb 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, we use the same logic in BaseFloatingCameraButton also

Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But no
Almost the same😅

Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

App/src/components/FloatingCameraButton/BaseFloatingCameraButton.tsx

Lines 42 to 51 in b164fa3

const policyChatForActivePolicySelector = useCallback(
(reports: OnyxCollection<OnyxTypes.Report>) => {
if (isEmptyObject(activePolicy) || !activePolicy?.isPolicyExpenseChatEnabled) {
return undefined;
}
const policyChatsForActivePolicy = getWorkspaceChats(activePolicyID, [session?.accountID ?? CONST.DEFAULT_NUMBER_ID], reports);
return policyChatsForActivePolicy.at(0);
},
[activePolicy, activePolicyID, session?.accountID],
);

Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should reuse this selector in 2 places?

Copy link
Contributor Author

@JS00001 JS00001 Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still dont think there would be a benefit to reusing this, especially since the selector relies on view-specific params. We would need to create a method inline using useCallback just to call the selector with the params as well.

Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Feb 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But in both places, we are trying to get policyChatForActivePolicy, but using different approaches
So why not make the approach the same in both places?

But I don't mind leaving everything as it is 😅


const [policyChatsForActivePolicy = getEmptyArray<OnyxTypes.Report>()] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true, selector: workspaceChatsSelector}, [
activePolicyID,
session?.accountID,
]);

const policyChatForActivePolicy = useMemo(() => {
if (isEmptyObject(activePolicy) || !activePolicy?.isPolicyExpenseChatEnabled) {
return {} as OnyxTypes.Report;
}
const policyChatsForActivePolicy = getWorkspaceChats(activePolicyID, [session?.accountID ?? CONST.DEFAULT_NUMBER_ID], allReports);
return policyChatsForActivePolicy.length > 0 ? policyChatsForActivePolicy.at(0) : ({} as OnyxTypes.Report);
}, [activePolicy, activePolicyID, session?.accountID, allReports]);
}, [activePolicy, policyChatsForActivePolicy]);

const quickActionPolicyID = quickAction?.action === CONST.QUICK_ACTIONS.TRACK_PER_DIEM && quickAction?.perDiemPolicyID ? quickAction?.perDiemPolicyID : quickActionReport?.policyID;
const [quickActionPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${quickActionPolicyID}`, {canBeMissing: true});
const [allPolicies] = useMappedPolicies(policyMapper);
Expand Down
Loading