Skip to content

[Wave Collect][Xero] Tracking categories fixes #42347

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
lakchote merged 4 commits into from
May 20, 2024
Merged

[Wave Collect][Xero] Tracking categories fixes #42347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d71b0e
fix: change selected text
mananjadhav May 17, 2024
4115f7e
fix: added padding
mananjadhav May 17, 2024
73524a9
fix: default selection
mananjadhav May 17, 2024
f74e05f
Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App …
mananjadhav May 17, 2024
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
2 changes: 1 addition & 1 deletion src/pages/workspace/accounting/xero/XeroImportPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function XeroImportPage({policy}: WithPolicyProps) {
description: translate('workspace.xero.trackingCategories'),
action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES.getRoute(policyID)),
hasError: !!errorFields?.importTrackingCategories,
title: importTrackingCategories ? translate('workspace.accounting.importTypes.TAG') : translate('workspace.xero.notImported'),
title: importTrackingCategories ? translate('workspace.accounting.imported') : translate('workspace.xero.notImported'),
pendingAction: pendingFields?.importTrackingCategories,
},
{
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/accounting/xero/XeroMapCostCentersToConfigurationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ function XeroMapCostCentersToConfigurationPage({policy}: WithPolicyProps) {
sections={[{data: optionsList}]}
ListItem={RadioListItem}
onSelectRow={updateMapping}
initiallyFocusedOptionKey={optionsList.find((option) => option.isSelected)?.keyForList}
/>
</ConnectionLayout>
);
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/accounting/xero/XeroMapRegionsToConfigurationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ function XeroMapRegionsToConfigurationPage({policy}: WithPolicyProps) {
sections={[{data: optionsList}]}
ListItem={RadioListItem}
onSelectRow={updateMapping}
initiallyFocusedOptionKey={optionsList.find((option) => option.isSelected)?.keyForList}
/>
</ConnectionLayout>
);
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ function XeroTrackingCategoryConfigurationPage({policy}: WithPolicyProps) {
title={translate('workspace.accounting.import')}
switchAccessibilityLabel={translate('workspace.xero.trackingCategories')}
isActive={isSwitchOn}
wrapperStyle={styles.mv3}
onToggle={() =>
Connections.updatePolicyConnectionConfig(
policyID,
Expand Down