Skip to content

fix: update export icons to use the colored versions #80311

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
JS00001 merged 7 commits into from
Jan 30, 2026
Merged

fix: update export icons to use the colored versions #80311

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
e89d75a
fix: update export icons to use the colored versions
daledah Jan 23, 2026
9568631
resolve comments
daledah Jan 26, 2026
af4be07
Merge branch 'main' into fix/80113
daledah Jan 27, 2026
347850b
Merge branch 'main' into fix/80113
daledah Jan 28, 2026
761f611
show colored icon in native
daledah Jan 28, 2026
dfc971e
Merge branch 'main' into fix/80113
daledah Jan 29, 2026
a326b0d
remove useless function
daledah Jan 29, 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
35 changes: 25 additions & 10 deletions src/components/MoneyReportHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import {
generateReportID,
getAddExpenseDropdownOptions,
getAllReportActionsErrorsAndReportActionThatRequiresAttention,
getIntegrationExportIcon,
getIntegrationIcon,
getIntegrationNameFromExportMessage as getIntegrationNameFromExportMessageUtils,
getNextApproverAccountID,
getNonHeldAndFullAmount,
Expand Down Expand Up @@ -241,10 +241,11 @@ function MoneyReportHeader({
'Info',
'Export',
'Document',
'XeroExport',
'QBOExport',
'NetSuiteExport',
'SageIntacctExport',
'XeroSquare',
'QBOSquare',
'NetSuiteSquare',
'IntacctSquare',
'QBDSquare',
'Feed',
'Close',
'Location',
Expand Down Expand Up @@ -908,9 +909,10 @@ function MoneyReportHeader({
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
text: translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegrationFallback!}),
icon: (() => {
const iconName = getIntegrationExportIcon(connectedIntegration ?? connectedIntegrationFallback);
return iconName ? expensifyIcons[iconName] : undefined;
return getIntegrationIcon(connectedIntegration ?? connectedIntegrationFallback, expensifyIcons);
})(),
displayInDefaultIconColor: true,
additionalIconStyles: styles.integrationIcon,
value: CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION,
sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.EXPORT_FILE,
onSelected: () => {
Expand All @@ -927,9 +929,10 @@ function MoneyReportHeader({
[CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED]: {
text: translate('workspace.common.markAsExported'),
icon: (() => {
const iconName = getIntegrationExportIcon(connectedIntegration ?? connectedIntegrationFallback);
return iconName ? expensifyIcons[iconName] : undefined;
return getIntegrationIcon(connectedIntegration ?? connectedIntegrationFallback, expensifyIcons);
})(),
additionalIconStyles: styles.integrationIcon,
displayInDefaultIconColor: true,
value: CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED,
sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.EXPORT_FILE,
onSelected: () => {
Expand Down Expand Up @@ -957,7 +960,19 @@ function MoneyReportHeader({
}

return options;
}, [translate, connectedIntegrationFallback, connectedIntegration, moneyRequestReport, isOffline, transactionIDs, isExported, beginExportWithTemplate, exportTemplates, expensifyIcons]);
}, [
translate,
expensifyIcons,
connectedIntegrationFallback,
styles.integrationIcon,
moneyRequestReport,
isOffline,
transactionIDs,
connectedIntegration,
isExported,
exportTemplates,
beginExportWithTemplate,
]);

const primaryActionsImplementation = {
[CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
Expand Down
18 changes: 0 additions & 18 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12316,23 +12316,6 @@ function getIntegrationIcon(connectionName?: ConnectionName, expensifyIcons?: Re
return undefined;
}

function getIntegrationExportIcon(connectionName?: ConnectionName): 'XeroExport' | 'QBOExport' | 'NetSuiteExport' | 'SageIntacctExport' | undefined {
if (connectionName === CONST.POLICY.CONNECTIONS.NAME.XERO) {
return 'XeroExport';
}
if (connectionName === CONST.POLICY.CONNECTIONS.NAME.QBO || connectionName === CONST.POLICY.CONNECTIONS.NAME.QBD) {
return 'QBOExport';
}
if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NETSUITE) {
return 'NetSuiteExport';
}
if (connectionName === CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT) {
return 'SageIntacctExport';
}

return undefined;
}

function canBeExported(report: OnyxEntry<Report>) {
if (!report?.statusNum) {
return false;
Expand Down Expand Up @@ -13312,7 +13295,6 @@ export {
getReportViolations,
findPolicyExpenseChatByPolicyID,
getIntegrationIcon,
getIntegrationExportIcon,
canBeExported,
isExported,
hasExportError,
Expand Down
Loading