From 00069dbc111482026463ced5e3b8083bcf8dfd53 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Thu, 3 Apr 2025 22:47:30 +0700 Subject: [PATCH 1/5] Existing connections is not scrollable --- .../intacct/ExistingConnectionsPage.tsx | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx index 8d0542a7cf6a..dec5cf35f864 100644 --- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx +++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx @@ -5,6 +5,7 @@ import {LinkCopy} from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; import MenuItemList from '@components/MenuItemList'; import ScreenWrapper from '@components/ScreenWrapper'; +import ScrollView from '@components/ScrollView'; import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useTheme from '@hooks/useTheme'; @@ -63,22 +64,24 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) { shouldShowBackButton onBackButtonPress={() => Navigation.goBack()} /> - - {translate('workspace.common.existingConnectionsDescription', {connectionName: CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT})} - Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID, Navigation.getActiveRoute()))} - /> - {translate('workspace.common.existingConnections')} - - + + + {translate('workspace.common.existingConnectionsDescription', {connectionName: CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT})} + Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID, Navigation.getActiveRoute()))} + /> + {translate('workspace.common.existingConnections')} + + + ); } From ce259b0443d3b80e1024f44f1cad26121a1ce2b1 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 4 Apr 2025 14:57:39 +0700 Subject: [PATCH 2/5] remove View --- .../intacct/ExistingConnectionsPage.tsx | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx index dec5cf35f864..e50ea8d38365 100644 --- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx +++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx @@ -64,23 +64,21 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) { shouldShowBackButton onBackButtonPress={() => Navigation.goBack()} /> - - - {translate('workspace.common.existingConnectionsDescription', {connectionName: CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT})} - Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID, Navigation.getActiveRoute()))} - /> - {translate('workspace.common.existingConnections')} - - + + {translate('workspace.common.existingConnectionsDescription', {connectionName: CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT})} + Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID, Navigation.getActiveRoute()))} + /> + {translate('workspace.common.existingConnections')} + ); From 5b3e2c4a997fb0f72c715fd221e1a0892d619117 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 4 Apr 2025 15:00:59 +0700 Subject: [PATCH 3/5] remove unused View --- .../workspace/accounting/intacct/ExistingConnectionsPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx index e50ea8d38365..215cd2dcd80b 100644 --- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx +++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import {View} from 'react-native'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import {LinkCopy} from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; From 5ec55f16b8631d262d8227cfc20b99b861acb601 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 4 Apr 2025 22:07:53 +0700 Subject: [PATCH 4/5] fix background --- .../workspace/accounting/intacct/ExistingConnectionsPage.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx index 215cd2dcd80b..f1a43501b22e 100644 --- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx +++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx @@ -68,8 +68,7 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) { Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID, Navigation.getActiveRoute()))} /> From 146cd00af2f3b9b8e043e959ebd8ca68bbb943fe Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 4 Apr 2025 22:12:46 +0700 Subject: [PATCH 5/5] lint fix --- .../workspace/accounting/intacct/ExistingConnectionsPage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx index f1a43501b22e..a5b108249f4e 100644 --- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx +++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx @@ -7,7 +7,6 @@ import ScreenWrapper from '@components/ScreenWrapper'; import ScrollView from '@components/ScrollView'; import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; -import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {copyExistingPolicyConnection} from '@libs/actions/connections'; import {getAdminPoliciesConnectedToSageIntacct} from '@libs/actions/Policy/Policy'; @@ -25,7 +24,6 @@ type ExistingConnectionsPageProps = PlatformStackScreenProps