Skip to content

Remove newDotPDFExport beta #60348

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
dangrous merged 6 commits into from
Apr 28, 2025
Merged

Remove newDotPDFExport beta #60348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ea608e
remove newDotPDFExport beta
Gonals Apr 16, 2025
3f02b85
remove usePermissions
Gonals Apr 16, 2025
10a7b13
Merge branch 'main' into alberto-removeBeta2
Gonals Apr 22, 2025
c98736a
Merge branch 'main' into alberto-removeBeta2
Gonals Apr 24, 2025
06e82b7
Merge branch 'main' into alberto-removeBeta2
Gonals Apr 24, 2025
880868b
conflicts
Gonals Apr 24, 2025
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
1 change: 0 additions & 1 deletion src/CONST.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,6 @@ const CONST = {
PER_DIEM: 'newDotPerDiem',
NEWDOT_MERGE_ACCOUNTS: 'newDotMergeAccounts',
NEWDOT_MANAGER_MCTEST: 'newDotManagerMcTest',
NEWDOT_PDF_EXPORT: 'newDotPDFExport',
NEW_DOT_TALK_TO_AI_SALES: 'newDotTalkToAISales',
CUSTOM_RULES: 'customRules',
TABLE_REPORT_VIEW: 'tableReportView',
Expand Down
5 changes: 0 additions & 5 deletions src/libs/Permissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ function canUseMergeAccounts(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.NEWDOT_MERGE_ACCOUNTS) || canUseAllBetas(betas);
}

function canUsePDFExport(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.NEWDOT_PDF_EXPORT) || canUseAllBetas(betas);
}

function canUseManagerMcTest(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.NEWDOT_MANAGER_MCTEST) || canUseAllBetas(betas);
}
Expand Down Expand Up @@ -76,7 +72,6 @@ export default {
canUseSpotnanaTravel,
isBlockedFromSpotnanaTravel,
canUseNetSuiteUSATax,
canUsePDFExport,
canUseMergeAccounts,
canUseManagerMcTest,
canUseCustomRules,
Expand Down
34 changes: 15 additions & 19 deletions src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import useDelegateUserDetails from '@hooks/useDelegateUserDetails';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
import usePermissions from '@hooks/usePermissions';

@dangrous dangrous Apr 28, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Aw shoot - we need this still, I missed it.

@dangrous dangrous Apr 28, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

#60965

import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
Expand Down Expand Up @@ -164,7 +163,7 @@ type CaseID = ValueOf<typeof CASES>;
function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDetailsPageProps) {
const {translate} = useLocalize();
const {isOffline} = useNetwork();
const {canUsePDFExport, canUseTableReportView} = usePermissions();
const {canUseTableReportView} = usePermissions();
const theme = useTheme();
const styles = useThemeStyles();
const backTo = route.params.backTo;
Expand Down Expand Up @@ -574,22 +573,19 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
});
},
});

if (canUsePDFExport) {
items.push({
key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_PDF,
translationKey: 'common.downloadAsPDF',
icon: Expensicons.Document,
isAnonymousAction: false,
action: () => {
if (isOffline) {
setOfflineModalVisible(true);
} else {
beginPDFExport();
}
},
});
}
items.push({
key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_PDF,
translationKey: 'common.downloadAsPDF',
icon: Expensicons.Document,
isAnonymousAction: false,
action: () => {
if (isOffline) {
setOfflineModalVisible(true);
} else {
beginPDFExport();
}
},
});
}

if (policy && connectedIntegration && isPolicyAdmin && !isSingleTransactionView && isExpenseReport) {
Expand Down Expand Up @@ -660,6 +656,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta

return items;
}, [
beginPDFExport,

@dangrous dangrous Apr 25, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is adding this intentional or is it a merge conflict issue?

@Gonals Gonals Apr 28, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It seems needed there, so all good 👍

@dangrous dangrous Apr 28, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is here twice, argh - #60964

isSelfDM,
isArchivedRoom,
isGroupChat,
Expand Down Expand Up @@ -698,7 +695,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
session,
canModifyTask,
canActionTask,
canUsePDFExport,
isOffline,
transactionIDList,
beginPDFExport,
Expand Down