From bc3351d5669c939e7c18e4d0d74690310a560d7e Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 1 Jan 2025 22:03:35 +0700 Subject: [PATCH] fix: Features in Workspace LHN are not in the same order --- src/pages/workspace/WorkspaceInitialPage.tsx | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index 09937a6c75bf6..d32c7241ab18e 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -192,18 +192,6 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac App.confirmReadyToOpenApp(); }, []); - if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED]) { - const currencyCode = policy?.outputCurrency ?? CONST.CURRENCY.USD; - - protectedCollectPolicyMenuItems.push({ - translationKey: 'workspace.common.invoices', - icon: Expensicons.InvoiceGeneric, - action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_INVOICES.getRoute(policyID)))), - routeName: SCREENS.WORKSPACE.INVOICES, - badgeText: CurrencyUtils.convertToDisplayString(policy?.invoice?.bankAccount?.stripeConnectAccountBalance ?? 0, currencyCode), - }); - } - if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED]) { protectedCollectPolicyMenuItems.push({ translationKey: 'workspace.common.distanceRates', @@ -263,6 +251,18 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac }); } + if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED]) { + const currencyCode = policy?.outputCurrency ?? CONST.CURRENCY.USD; + + protectedCollectPolicyMenuItems.push({ + translationKey: 'workspace.common.invoices', + icon: Expensicons.InvoiceGeneric, + action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_INVOICES.getRoute(policyID)))), + routeName: SCREENS.WORKSPACE.INVOICES, + badgeText: CurrencyUtils.convertToDisplayString(policy?.invoice?.bankAccount?.stripeConnectAccountBalance ?? 0, currencyCode), + }); + } + if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED]) { protectedCollectPolicyMenuItems.push({ translationKey: 'workspace.common.categories',