From 6d71b0ebc4b6e06152b3e7d18abacabc67848de9 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 17 May 2024 22:04:58 +0530 Subject: [PATCH 1/3] fix: change selected text --- src/pages/workspace/accounting/xero/XeroImportPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/accounting/xero/XeroImportPage.tsx b/src/pages/workspace/accounting/xero/XeroImportPage.tsx index 0d9b96c46003a..86fdcbf7ff927 100644 --- 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, }, { From 4115f7e94a407d6fe6c1f614bc995effb535f2be Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 17 May 2024 22:05:13 +0530 Subject: [PATCH 2/3] fix: added padding --- .../accounting/xero/XeroTrackingCategoryConfigurationPage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx index 75323337cbed6..2742060eaa2b1 100644 --- 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, From 73524a9331f39353f4dabbe2dea8195a453848a7 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 17 May 2024 22:05:26 +0530 Subject: [PATCH 3/3] fix: default selection --- .../accounting/xero/XeroMapCostCentersToConfigurationPage.tsx | 1 + .../accounting/xero/XeroMapRegionsToConfigurationPage.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/workspace/accounting/xero/XeroMapCostCentersToConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroMapCostCentersToConfigurationPage.tsx index b4f0fe04f6ce9..1d1307a0d31ce 100644 --- 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} /> ); diff --git a/src/pages/workspace/accounting/xero/XeroMapRegionsToConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroMapRegionsToConfigurationPage.tsx index bb5870da8fc36..5c97de36d3536 100644 --- 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} /> );