Skip to content

#2 - Get the billing grace end period collection with useOnyx #83033

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
tgolen merged 7 commits into from
Feb 27, 2026
Merged

#2 - Get the billing grace end period collection with useOnyx #83033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed39347
pass billing grace end period data from useOnyx
bernhardoj Feb 20, 2026
d4beddc
Merge branch 'main' into chore/66456-remove-onyx-connect-shared-billi…
bernhardoj Feb 23, 2026
259bd34
remove canBeMissing
bernhardoj Feb 23, 2026
f5b4596
Merge branch 'main' into chore/66456-remove-onyx-connect-shared-billi…
bernhardoj Feb 26, 2026
7d0e9dd
rename
bernhardoj Feb 26, 2026
a5da51c
Merge branch 'main' into chore/66456-remove-onyx-connect-shared-billi…
bernhardoj Feb 27, 2026
6b5b75e
prettier
bernhardoj Feb 27, 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 src/components/FloatingCameraButton/BaseFloatingCameraButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function BaseFloatingCameraButton({icon}: BaseFloatingCameraButtonProps) {
const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`);
const [session] = useOnyx(ONYXKEYS.SESSION, {selector: sessionSelector});
const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT);
const [userBillingGraceEndPeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
const reportID = useMemo(() => generateReportID(), []);

const policyChatForActivePolicySelector = useCallback(
Expand All @@ -53,7 +54,7 @@ function BaseFloatingCameraButton({icon}: BaseFloatingCameraButtonProps) {

const onPress = () => {
interceptAnonymousUser(() => {
if (policyChatForActivePolicy?.policyID && shouldRestrictUserBillableActions(policyChatForActivePolicy.policyID)) {
if (policyChatForActivePolicy?.policyID && shouldRestrictUserBillableActions(policyChatForActivePolicy.policyID, userBillingGraceEndPeriods)) {
Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policyChatForActivePolicy.policyID));
return;
}
Expand Down
5 changes: 3 additions & 2 deletions src/components/SettlementButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ function SettlementButton({
const [lastPaymentMethods, lastPaymentMethodResult] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD);
const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID);
const [betas] = useOnyx(ONYXKEYS.BETAS);
const [userBillingGraceEndPeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);

const lastPaymentMethod = useMemo(() => {
if (!iouReport?.type) {
Expand Down Expand Up @@ -215,13 +216,13 @@ function SettlementButton({
return true;
}

if (policy && shouldRestrictUserBillableActions(policy.id)) {
if (policy && shouldRestrictUserBillableActions(policy.id, userBillingGraceEndPeriods)) {
Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
return true;
}

return false;
}, [policy, isAccountLocked, isUserValidated, chatReportID, reportID, showLockedAccountModal, isDelegateAccessRestricted, showDelegateNoAccessModal]);
}, [policy, isAccountLocked, isUserValidated, chatReportID, reportID, showLockedAccountModal, isDelegateAccessRestricted, showDelegateNoAccessModal, userBillingGraceEndPeriods]);

const getPaymentSubItems = useCallback(
(payAsBusiness: boolean) => {
Expand Down
3 changes: 2 additions & 1 deletion src/hooks/useReceiptScanDrop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function useReceiptScanDrop() {
const isAnonymousUser = useIsAnonymousUser();
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const selfDMReport = useSelfDMReport();
const [userBillingGraceEndPeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const [currentDate] = useOnyx(ONYXKEYS.CURRENT_DATE);
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
Expand Down Expand Up @@ -77,7 +78,7 @@ function useReceiptScanDrop() {
setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
}

if (isPaidGroupPolicy(activePolicy) && activePolicy?.isPolicyExpenseChatEnabled && !shouldRestrictUserBillableActions(activePolicy.id)) {
if (isPaidGroupPolicy(activePolicy) && activePolicy?.isPolicyExpenseChatEnabled && !shouldRestrictUserBillableActions(activePolicy.id, userBillingGraceEndPeriods)) {
const shouldAutoReport = !!activePolicy?.autoReporting || !!personalPolicy?.autoReporting;
const report = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, activePolicy?.id) : selfDMReport;
const transactionReportID = isSelfDM(report) ? CONST.REPORT.UNREPORTED_REPORT_ID : report?.reportID;
Expand Down
Loading