debt(Expense): remove legacy flow

Author: Betree

components/AccountingCategorySelect.tsx

@@ -174,11 +174,7 @@ export const getCategoryLabel = (
 /**
  * Returns true if the category is supported for the given expense type. Host admins can select any category.
  */
-export const isSupportedExpenseCategory = (
-  expenseType: ExpenseType,
-  category: AccountingCategory,
-  isHostAdmin: boolean,
-) => {
+const isSupportedExpenseCategory = (expenseType: ExpenseType, category: AccountingCategory, isHostAdmin: boolean) => {
   return (
     category?.kind === AccountingCategoryKind.EXPENSE &&
     (isHostAdmin || !category?.expensesTypes || category.expensesTypes.includes(expenseType))

components/I18nAddressFields.js

@@ -63,13 +63,6 @@ const wrangleAddressData = addressInfo => {
   return addressFormFields;
 };
 
-export const serializeAddress = address => {
-  return Object.keys(address)
-    .sort()
-    .map(k => address[k])
-    .join('\n');
-};
-
 /** Upon changing selectedCountry, if previous address fields are no longer needed,
  * it clears them i.e. changing from Canada to Germany in the Expense form we no
  * longer need 'zone' in our payeeLocation.address object.

components/collective-navbar/ActionsMenu.js

@@ -8,16 +8,11 @@ import { AttachMoney } from '@styled-icons/material/AttachMoney';
 import { Settings } from '@styled-icons/material/Settings';
 import { Stack } from '@styled-icons/remix-line/Stack';
 import { pickBy } from 'lodash';
-import { useRouter } from 'next/router';
 import { FormattedMessage } from 'react-intl';
 import styled, { css } from 'styled-components';
 
 import { getContributeRoute } from '../../lib/collective';
-import { isSupportedExpenseType } from '../../lib/expenses';
-import { ExpenseType } from '../../lib/graphql/types/v2/graphql';
-import { PREVIEW_FEATURE_KEYS } from '../../lib/preview-features';
 import { getCollectivePageRoute, getDashboardRoute } from '../../lib/url-helpers';
-import { parseToBoolean } from '@/lib/utils';
 
 import ActionButton from '../ActionButton';
 import AddFundsBtn from '../AddFundsBtn';
@@ -183,16 +178,6 @@ const CollectiveNavbarActionsMenu = ({
   const enabledCTAs = Object.keys(pickBy(callsToAction, Boolean));
   const isEmpty = enabledCTAs.length < 1;
   const hasOnlyOneHiddenCTA = enabledCTAs.length === 1 && hiddenActionForNonMobile === enabledCTAs[0];
-  const router = useRouter();
-
-  const newExpenseFlowOptedOut = parseToBoolean(router?.query?.forceLegacyFlow);
-  const isNewGrantFlowEnabled =
-    !newExpenseFlowOptedOut && LoggedInUser?.hasPreviewFeatureEnabled(PREVIEW_FEATURE_KEYS.NEW_EXPENSE_FLOW);
-
-  const isNewExpenseFlowEnabled =
-    !newExpenseFlowOptedOut &&
-    LoggedInUser?.hasPreviewFeatureEnabled(PREVIEW_FEATURE_KEYS.NEW_EXPENSE_FLOW) &&
-    (!isSupportedExpenseType(collective, ExpenseType.GRANT) || isNewGrantFlowEnabled);
 
   // Do not render the menu if there are no available CTAs
   if (isEmpty) {
@@ -241,33 +226,17 @@ const CollectiveNavbarActionsMenu = ({
                     )}
                     {callsToAction.hasSubmitExpense && (
                       <MenuItem isHiddenOnMobile={hiddenActionForNonMobile === NAVBAR_ACTION_TYPE.SUBMIT_EXPENSE}>
-                        {isNewExpenseFlowEnabled ? (
-                          <StyledLink onClick={onOpenSubmitExpenseModalClick}>
-                            <Container p={ITEM_PADDING}>
-                              <Receipt size="20px" />
-                              <FormattedMessage id="ExpenseForm.Submit" defaultMessage="Submit expense" />
-                            </Container>
-                          </StyledLink>
-                        ) : (
-                          <StyledLink
-                            data-cy="submit-expense-dropdown"
-                            as={Link}
-                            href={`${getCollectivePageRoute(collective)}/expenses/new?forceLegacyFlow=true`}
-                          >
-                            <Container p={ITEM_PADDING}>
-                              <Receipt size="20px" />
-                              <FormattedMessage id="ExpenseForm.Submit" defaultMessage="Submit expense" />
-                            </Container>
-                          </StyledLink>
-                        )}
+                        <StyledLink onClick={onOpenSubmitExpenseModalClick}>
+                          <Container p={ITEM_PADDING}>
+                            <Receipt size="20px" />
+                            <FormattedMessage id="ExpenseForm.Submit" defaultMessage="Submit expense" />
+                          </Container>
+                        </StyledLink>
                       </MenuItem>
                     )}
                     {callsToAction.hasRequestGrant && (
                       <MenuItem py={1} isHiddenOnMobile={hiddenActionForNonMobile === NAVBAR_ACTION_TYPE.REQUEST_GRANT}>
-                        <StyledLink
-                          as={Link}
-                          href={`${getCollectivePageRoute(collective)}/${isNewGrantFlowEnabled ? 'grants' : 'expenses'}/new`}
-                        >
+                        <StyledLink as={Link} href={`${getCollectivePageRoute(collective)}/grants/new`}>
                           <Container p={ITEM_PADDING}>
                             <MoneyCheckAlt size="20px" />
                             <FormattedMessage id="ExpenseForm.Type.Request" defaultMessage="Request Grant" />

components/collective-navbar/index.js

@@ -23,10 +23,8 @@ import EXPENSE_TYPE from '../../lib/constants/expenseTypes';
 import roles from '../../lib/constants/roles';
 import { isSupportedExpenseType } from '../../lib/expenses';
 import { API_V2_CONTEXT, gql } from '../../lib/graphql/helpers';
-import { ExpenseType } from '../../lib/graphql/types/v2/graphql';
 import useGlobalBlur from '../../lib/hooks/useGlobalBlur';
 import useLoggedInUser from '../../lib/hooks/useLoggedInUser';
-import { PREVIEW_FEATURE_KEYS } from '../../lib/preview-features';
 import { getCollectivePageRoute, getDashboardRoute } from '../../lib/url-helpers';
 
 import ActionButton from '../ActionButton';
@@ -508,12 +506,6 @@ const CollectiveNavbar = ({
 
   const loading = isLoading || dataLoading;
 
-  const isNewGrantFlowEnabled = LoggedInUser?.hasPreviewFeatureEnabled(PREVIEW_FEATURE_KEYS.NEW_EXPENSE_FLOW);
-
-  const isNewExpenseFlowEnabled =
-    LoggedInUser?.hasPreviewFeatureEnabled(PREVIEW_FEATURE_KEYS.NEW_EXPENSE_FLOW) &&
-    (!isSupportedExpenseType(collective, ExpenseType.GRANT) || isNewGrantFlowEnabled);
-
   const isAllowedAddFunds = Boolean(data?.account?.permissions?.addFunds?.allowed);
   const sections = React.useMemo(() => {
     return sectionsFromParent || getFilteredSectionsForCollective(collective, isAdmin, isHostAdmin);
@@ -531,23 +523,11 @@ const CollectiveNavbar = ({
     ...callsToAction,
   };
   const actionsArray = Object.keys(pickBy(callsToAction, Boolean));
-  const mainAction = getMainAction(
-    collective,
-    actionsArray,
-    LoggedInUser,
-    isNewExpenseFlowEnabled,
-    isNewGrantFlowEnabled,
-    () => setIsSubmitExpenseModalOpen(true),
-  );
+  const mainAction = getMainAction(collective, actionsArray, LoggedInUser, () => setIsSubmitExpenseModalOpen(true));
   const secondAction =
     actionsArray.length === 2 &&
-    getMainAction(
-      collective,
-      without(actionsArray, mainAction?.type),
-      LoggedInUser,
-      isNewExpenseFlowEnabled,
-      isNewGrantFlowEnabled,
-      () => setIsSubmitExpenseModalOpen(true),
+    getMainAction(collective, without(actionsArray, mainAction?.type), LoggedInUser, () =>
+      setIsSubmitExpenseModalOpen(true),
     );
   const navbarRef = useRef(undefined);
   const mainContainerRef = useRef(undefined);

components/dashboard/sections/expenses/ReceivedExpenses.tsx

@@ -14,9 +14,7 @@ import {
   ExpenseType,
   PayoutMethodType,
 } from '../../../../lib/graphql/types/v2/schema';
-import useLoggedInUser from '../../../../lib/hooks/useLoggedInUser';
 import useQueryFilter from '../../../../lib/hooks/useQueryFilter';
-import { PREVIEW_FEATURE_KEYS } from '../../../../lib/preview-features';
 import { i18nExpenseType } from '@/lib/i18n/expense';
 import { sortSelectOptions } from '@/lib/utils';
 
@@ -111,7 +109,6 @@ const ROUTE_PARAMS = ['slug', 'section', 'subpath'];
 const ReceivedExpenses = ({ accountSlug }: DashboardSectionProps) => {
   const router = useRouter();
   const [isExpenseFlowOpen, setIsExpenseFlowOpen] = React.useState(false);
-  const { LoggedInUser } = useLoggedInUser();
 
   const {
     data: metadata,
@@ -161,9 +158,6 @@ const ReceivedExpenses = ({ accountSlug }: DashboardSectionProps) => {
     context: API_V2_CONTEXT,
   });
 
-  const hasNewSubmitExpenseFlow =
-    LoggedInUser?.hasPreviewFeatureEnabled(PREVIEW_FEATURE_KEYS.NEW_EXPENSE_FLOW) || router.query.newExpenseFlowEnabled;
-
   const pageRoute = `/dashboard/${accountSlug}/expenses`;
 
   return (
@@ -173,11 +167,9 @@ const ReceivedExpenses = ({ accountSlug }: DashboardSectionProps) => {
           title={<FormattedMessage defaultMessage="Received Expenses" id="1c0Y31" />}
           description={<FormattedMessage defaultMessage="Expenses submitted to your account." id="0I3Lbj" />}
           actions={
-            hasNewSubmitExpenseFlow ? (
-              <Button onClick={() => setIsExpenseFlowOpen(true)} size="sm" className="gap-1">
-                <FormattedMessage defaultMessage="New expense" id="pNn/g+" />
-              </Button>
-            ) : null
+            <Button onClick={() => setIsExpenseFlowOpen(true)} size="sm" className="gap-1">
+              <FormattedMessage defaultMessage="New expense" id="pNn/g+" />
+            </Button>
           }
         />
         {isSelfHosted && (

components/dashboard/sections/expenses/SubmittedExpenses.tsx

@@ -7,7 +7,6 @@ import { defineMessage, FormattedMessage } from 'react-intl';
 import { API_V2_CONTEXT } from '../../../../lib/graphql/helpers';
 import useLoggedInUser from '../../../../lib/hooks/useLoggedInUser';
 import useQueryFilter from '../../../../lib/hooks/useQueryFilter';
-import { PREVIEW_FEATURE_KEYS } from '../../../../lib/preview-features';
 import type { FilterComponentConfigs } from '@/lib/filters/filter-types';
 import type { Currency } from '@/lib/graphql/types/v2/schema';
 import { ExpenseType } from '@/lib/graphql/types/v2/schema';
@@ -94,9 +93,6 @@ const SubmittedExpenses = ({ accountSlug }: DashboardSectionProps) => {
     accountingCategoryKinds: ExpenseAccountingCategoryKinds,
   };
 
-  const hasNewSubmitExpenseFlow =
-    LoggedInUser?.hasPreviewFeatureEnabled(PREVIEW_FEATURE_KEYS.NEW_EXPENSE_FLOW) || router.query.newExpenseFlowEnabled;
-
   const pageRoute = `/dashboard/${accountSlug}/submitted-expenses`;
 
   if (error) {
@@ -112,18 +108,16 @@ const SubmittedExpenses = ({ accountSlug }: DashboardSectionProps) => {
             <FormattedMessage defaultMessage="Expenses that you have submitted to other accounts." id="aKfm6V" />
           }
           actions={
-            hasNewSubmitExpenseFlow ? (
-              <Button
-                onClick={() => {
-                  setDuplicateExpenseId(null);
-                  setIsExpenseFlowOpen(true);
-                }}
-                size="sm"
-                className="gap-1"
-              >
-                <FormattedMessage defaultMessage="New expense" id="pNn/g+" />
-              </Button>
-            ) : null
+            <Button
+              onClick={() => {
+                setDuplicateExpenseId(null);
+                setIsExpenseFlowOpen(true);
+              }}
+              size="sm"
+              className="gap-1"
+            >
+              <FormattedMessage defaultMessage="New expense" id="pNn/g+" />
+            </Button>
           }
         />
         <Filterbar {...queryFilter} meta={filterMeta} />