Merge pull request #42347 from mananjadhav/xero-tracking-categories-f…

…ixes [Wave Collect][Xero] Tracking categories fixes
Expensify · May 20, 2024 · f521fa5 · f521fa5
2 parents 36ac388 + f74e05f
commit f521fa5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/src/pages/workspace/accounting/xero/XeroImportPage.tsx b/src/pages/workspace/accounting/xero/XeroImportPage.tsx
@@ -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,
             },
             {

diff --git a/src/pages/workspace/accounting/xero/XeroMapCostCentersToConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroMapCostCentersToConfigurationPage.tsx
@@ -61,6 +61,7 @@ function XeroMapCostCentersToConfigurationPage({policy}: WithPolicyProps) {
                 sections={[{data: optionsList}]}
                 ListItem={RadioListItem}
                 onSelectRow={updateMapping}
+                initiallyFocusedOptionKey={optionsList.find((option) => option.isSelected)?.keyForList}
             />
         </ConnectionLayout>
     );

diff --git a/src/pages/workspace/accounting/xero/XeroMapRegionsToConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroMapRegionsToConfigurationPage.tsx
@@ -60,6 +60,7 @@ function XeroMapRegionsToConfigurationPage({policy}: WithPolicyProps) {
                 sections={[{data: optionsList}]}
                 ListItem={RadioListItem}
                 onSelectRow={updateMapping}
+                initiallyFocusedOptionKey={optionsList.find((option) => option.isSelected)?.keyForList}
             />
         </ConnectionLayout>
     );

diff --git a/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
@@ -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,