Merge pull request #45679 from Expensify/nikki-entity-menu

Only show entity menu item if there are entities to select
Expensify · Jul 22, 2024 · b4c5ac5 · b4c5ac5
2 parents 138578b + 26f31d8
commit b4c5ac5
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -202,7 +202,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
  }, [getDatetimeToRelative, successfulDate]);
 
  const integrationSpecificMenuItems = useMemo(() => {
- const sageIntacctEntityListLength = policy?.connections?.intacct?.data?.entities?.length;
+ const sageIntacctEntityList = policy?.connections?.intacct?.data?.entities ?? [];
  const netSuiteSubsidiaryList = policy?.connections?.netsuite?.options?.data?.subsidiaryList ?? [];
  switch (connectedIntegration) {
  case CONST.POLICY.CONNECTIONS.NAME.XERO:
@@ -242,23 +242,25 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
  },
  };
  case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
- return {
- description: translate('workspace.intacct.entity'),
- iconRight: Expensicons.ArrowRight,
- title: getCurrentSageIntacctEntityName(policy),
- wrapperStyle: [styles.sectionMenuItemTopDescription],
- titleStyle: styles.fontWeightNormal,
- shouldShowRightIcon: !!sageIntacctEntityListLength,
- shouldShowDescriptionOnTop: true,
- pendingAction: policy?.connections?.intacct?.config?.pendingFields?.entity,
- brickRoadIndicator: policy?.connections?.intacct?.config?.errorFields?.entity ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
- onPress: () => {
- if (!sageIntacctEntityListLength) {
- return;
- }
- Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTITY.getRoute(policyID));
- },
- };
+ return !sageIntacctEntityList.length
+ ? {}
+ : {
+ description: translate('workspace.intacct.entity'),
+ iconRight: Expensicons.ArrowRight,
+ title: getCurrentSageIntacctEntityName(policy),
+ wrapperStyle: [styles.sectionMenuItemTopDescription],
+ titleStyle: styles.fontWeightNormal,
+ shouldShowRightIcon: true,
+ shouldShowDescriptionOnTop: true,
+ pendingAction: policy?.connections?.intacct?.config?.pendingFields?.entity,
+ brickRoadIndicator: policy?.connections?.intacct?.config?.errorFields?.entity ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+ onPress: () => {
+ if (!sageIntacctEntityList.length) {
+ return;
+ }
+ Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTITY.getRoute(policyID));
+ },
+ };
  default:
  return undefined;
  }