Skip to content

Commit 31c04e4

Browse files
committed
cleanup and reverts
1 parent 5ab455b commit 31c04e4

5 files changed

Lines changed: 9 additions & 17 deletions

File tree

src/CONST/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3013,7 +3013,6 @@ const CONST = {
30133013
},
30143014
SYNC_STAGE_TIMEOUT_MINUTES: 20,
30153015
},
3016-
30173016
ACCESS_VARIANTS: {
30183017
PAID: 'paid',
30193018
ADMIN: 'admin',

src/libs/AccountingUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function getConnectionNameFromRouteParam(routeParam: ValueOf<typeof CONST.POLICY
2323
}
2424

2525
function getRouteParamForConnection(connectionName: ConnectionName) {
26-
return NAME_ROUTE_MAPPING[connectionName as keyof typeof NAME_ROUTE_MAPPING];
26+
return NAME_ROUTE_MAPPING[connectionName];
2727
}
2828

2929
export {getConnectionNameFromRouteParam, getRouteParamForConnection};

src/libs/PolicyUtils.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,15 +1189,7 @@ function getValidConnectedIntegration(policy: Policy | undefined, accountingInte
11891189
}
11901190

11911191
function hasIntegrationAutoSync(policy: Policy | undefined, connectedIntegration?: ConnectionName) {
1192-
const connectionConfig = connectedIntegration ? policy?.connections?.[connectedIntegration]?.config : undefined;
1193-
return !!(
1194-
connectionConfig &&
1195-
'autoSync' in connectionConfig &&
1196-
connectionConfig.autoSync &&
1197-
typeof connectionConfig.autoSync === 'object' &&
1198-
'enabled' in connectionConfig.autoSync &&
1199-
connectionConfig.autoSync.enabled
1200-
);
1192+
return (connectedIntegration && policy?.connections?.[connectedIntegration]?.config?.autoSync?.enabled) ?? false;
12011193
}
12021194

12031195
function hasUnsupportedIntegration(policy: Policy | undefined, accountingIntegrations?: ConnectionName[]) {

src/libs/actions/connections/index.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,12 @@ function syncConnection(policy: Policy | undefined, connectionName: PolicyConnec
160160
});
161161
}
162162

163-
function updateManyPolicyConnectionConfigs<
164-
TConnectionName extends ConnectionNameExceptNetSuite,
165-
TConfigUpdate extends Partial<(Connections[TConnectionName] & {config: Record<string, unknown>})['config']>,
166-
>(policyID: string | undefined, connectionName: TConnectionName, configUpdate: TConfigUpdate, configCurrentData: TConfigUpdate) {
163+
function updateManyPolicyConnectionConfigs<TConnectionName extends ConnectionNameExceptNetSuite, TConfigUpdate extends Partial<Connections[TConnectionName]['config']>>(
164+
policyID: string | undefined,
165+
connectionName: TConnectionName,
166+
configUpdate: TConfigUpdate,
167+
configCurrentData: TConfigUpdate,
168+
) {
167169
if (!policyID) {
168170
return;
169171
}

src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
1212
import {getConnectionNameFromRouteParam} from '@libs/AccountingUtils';
1313
import {isExpensifyCardFullySetUp} from '@libs/CardUtils';
1414
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
15-
import {hasIntegrationAutoSync} from '@libs/PolicyUtils';
1615
import Navigation from '@navigation/Navigation';
1716
import type {SettingsNavigatorParamList} from '@navigation/types';
1817
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -76,7 +75,7 @@ function CardReconciliationPage({policy, route}: CardReconciliationPageProps) {
7675

7776
const {connection} = route.params;
7877
const connectionName = getConnectionNameFromRouteParam(connection) as ConnectionName;
79-
const autoSync = hasIntegrationAutoSync(policy, connectionName);
78+
const autoSync = !!policy?.connections?.[connectionName]?.config?.autoSync?.enabled;
8079
const shouldShow = !!fullySetUpCardSetting.cardSetting?.paymentBankAccountID;
8180

8281
const handleToggleContinuousReconciliation = (value: boolean) => {

0 commit comments

Comments
 (0)