Merge pull request #48700 from cretadn22/remove-free-workspace

Remove free workspace
Expensify · Sep 23, 2024 · 79b64bf · 79b64bf
2 parents dcf1a0c + bbf8ed2
commit 79b64bf
Show file tree

Hide file tree

Showing 53 changed files with 39 additions and 1,734 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -2156,7 +2156,6 @@ const CONST = {
 
     POLICY: {
         TYPE: {
-            FREE: 'free',
             PERSONAL: 'personal',
 
             // Often referred to as "control" workspaces
@@ -2695,11 +2694,7 @@ const CONST = {
         CONCIERGE_DM: 'NewExpensifyConciergeDM',
         WORKSPACE_INITIAL: 'WorkspaceHome',
         WORKSPACE_PROFILE: 'WorkspaceProfile',
-        WORKSPACE_CARD: 'WorkspaceCorporateCards',
-        WORKSPACE_REIMBURSE: 'WorkspaceReimburseReceipts',
-        WORKSPACE_BILLS: 'WorkspacePayBills',
         WORKSPACE_INVOICES: 'WorkspaceSendInvoices',
-        WORKSPACE_TRAVEL: 'WorkspaceBookTravel',
         WORKSPACE_MEMBERS: 'WorkspaceManageMembers',
         WORKSPACE_EXPENSIFY_CARD: 'WorkspaceExpensifyCard',
         WORKSPACE_WORKFLOWS: 'WorkspaceWorkflows',
@@ -4012,7 +4007,6 @@ const CONST = {
         SEARCH_ISSUES: 'https://github.com/Expensify/App/issues',
     },
 
-    CONCIERGE_TRAVEL_URL: 'https://community.expensify.com/discussion/7066/introducing-concierge-travel',
     BOOK_TRAVEL_DEMO_URL: 'https://calendly.com/d/ck2z-xsh-q97/expensify-travel-demo-travel-page',
     TRAVEL_DOT_URL: 'https://travel.expensify.com',
     STAGING_TRAVEL_DOT_URL: 'https://staging.travel.expensify.com',

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
@@ -68,14 +68,6 @@ const ONYXKEYS = {
     /** Contains all the info for Tasks */
     TASK: 'task',
 
-    /**
-     * Contains all the info for Workspace Rate and Unit while editing.
-     *
-     * Note: This is not under the COLLECTION key as we can edit rate and unit
-     * for one workspace only at a time. And we don't need to store
-     * rates and units for different workspaces at the same time. */
-    WORKSPACE_RATE_AND_UNIT: 'workspaceRateAndUnit',
-
     /** Contains a list of all currencies available to the user - user can
      * select a currency based on the list */
     CURRENCY_LIST: 'currencyList',
@@ -530,8 +522,6 @@ const ONYXKEYS = {
         WORKSPACE_SETTINGS_FORM_DRAFT: 'workspaceSettingsFormDraft',
         WORKSPACE_DESCRIPTION_FORM: 'workspaceDescriptionForm',
         WORKSPACE_DESCRIPTION_FORM_DRAFT: 'workspaceDescriptionFormDraft',
-        WORKSPACE_RATE_AND_UNIT_FORM: 'workspaceRateAndUnitForm',
-        WORKSPACE_RATE_AND_UNIT_FORM_DRAFT: 'workspaceRateAndUnitFormDraft',
         WORKSPACE_TAX_CUSTOM_NAME: 'workspaceTaxCustomName',
         WORKSPACE_TAX_CUSTOM_NAME_DRAFT: 'workspaceTaxCustomNameDraft',
         WORKSPACE_COMPANY_CARD_FEED_NAME: 'workspaceCompanyCardFeedName',
@@ -708,7 +698,6 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM]: FormTypes.WorkspaceSettingsForm;
     [ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM]: FormTypes.WorkspaceCategoryForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAG_FORM]: FormTypes.WorkspaceTagForm;
-    [ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM]: FormTypes.WorkspaceRateAndUnitForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME]: FormTypes.WorkspaceTaxCustomName;
     [ONYXKEYS.FORMS.WORKSPACE_COMPANY_CARD_FEED_NAME]: FormTypes.WorkspaceCompanyCardFeedName;
     [ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM]: FormTypes.WorkspaceCompanyCardEditName;
@@ -878,7 +867,6 @@ type OnyxValuesMapping = {
     [ONYXKEYS.PRIVATE_PERSONAL_DETAILS]: OnyxTypes.PrivatePersonalDetails;
     [ONYXKEYS.PERSONAL_DETAILS_METADATA]: Record<string, OnyxTypes.PersonalDetailsMetadata>;
     [ONYXKEYS.TASK]: OnyxTypes.Task;
-    [ONYXKEYS.WORKSPACE_RATE_AND_UNIT]: OnyxTypes.WorkspaceRateAndUnit;
     [ONYXKEYS.CURRENCY_LIST]: OnyxTypes.CurrencyList;
     [ONYXKEYS.UPDATE_AVAILABLE]: boolean;
     [ONYXKEYS.SCREEN_SHARE_REQUEST]: OnyxTypes.ScreenShareRequest;

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -684,30 +684,6 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/workflows/auto-reporting-frequency/monthly-offset',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/workflows/auto-reporting-frequency/monthly-offset` as const,
     },
-    WORKSPACE_CARD: {
-        route: 'settings/workspaces/:policyID/card',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/card` as const,
-    },
-    WORKSPACE_REIMBURSE: {
-        route: 'settings/workspaces/:policyID/reimburse',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/reimburse` as const,
-    },
-    WORKSPACE_RATE_AND_UNIT: {
-        route: 'settings/workspaces/:policyID/rateandunit',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rateandunit` as const,
-    },
-    WORKSPACE_RATE_AND_UNIT_RATE: {
-        route: 'settings/workspaces/:policyID/rateandunit/rate',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rateandunit/rate` as const,
-    },
-    WORKSPACE_RATE_AND_UNIT_UNIT: {
-        route: 'settings/workspaces/:policyID/rateandunit/unit',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rateandunit/unit` as const,
-    },
-    WORKSPACE_BILLS: {
-        route: 'settings/workspaces/:policyID/bills',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/bills` as const,
-    },
     WORKSPACE_INVOICES: {
         route: 'settings/workspaces/:policyID/invoices',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/invoices` as const,
@@ -720,10 +696,6 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/invoices/company-website',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/invoices/company-website` as const,
     },
-    WORKSPACE_TRAVEL: {
-        route: 'settings/workspaces/:policyID/travel',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/travel` as const,
-    },
     WORKSPACE_MEMBERS: {
         route: 'settings/workspaces/:policyID/members',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/members` as const,

diff --git a/src/SCREENS.ts b/src/SCREENS.ts
@@ -374,11 +374,6 @@ const SCREENS = {
         },
         INITIAL: 'Workspace_Initial',
         PROFILE: 'Workspace_Profile',
-        CARD: 'Workspace_Card',
-        REIMBURSE: 'Workspace_Reimburse',
-        RATE_AND_UNIT: 'Workspace_RateAndUnit',
-        RATE_AND_UNIT_RATE: 'Workspace_RateAndUnit_Rate',
-        RATE_AND_UNIT_UNIT: 'Workspace_RateAndUnit_Unit',
         COMPANY_CARDS: 'Workspace_CompanyCards',
         COMPANY_CARDS_ASSIGN_CARD: 'Workspace_CompanyCards_AssignCard',
         COMPANY_CARDS_SELECT_FEED: 'Workspace_CompanyCards_Select_Feed',
@@ -402,11 +397,9 @@ const SCREENS = {
         EXPENSIFY_CARD_SETTINGS: 'Workspace_ExpensifyCard_Settings',
         EXPENSIFY_CARD_SETTINGS_ACCOUNT: 'Workspace_ExpensifyCard_Settings_Account',
         EXPENSIFY_CARD_SETTINGS_FREQUENCY: 'Workspace_ExpensifyCard_Settings_Frequency',
-        BILLS: 'Workspace_Bills',
         INVOICES: 'Workspace_Invoices',
         INVOICES_COMPANY_NAME: 'Workspace_Invoices_Company_Name',
         INVOICES_COMPANY_WEBSITE: 'Workspace_Invoices_Company_Website',
-        TRAVEL: 'Workspace_Travel',
         MEMBERS: 'Workspace_Members',
         MEMBERS_IMPORT: 'Members_Import',
         MEMBERS_IMPORTED: 'Members_Imported',

diff --git a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
@@ -20,12 +20,8 @@ const WIDE_LAYOUT_INACTIVE_SCREENS: string[] = [
     SCREENS.WORKSPACE.ACCOUNTING.ROOT,
     SCREENS.WORKSPACE.INITIAL,
     SCREENS.WORKSPACE.PROFILE,
-    SCREENS.WORKSPACE.CARD,
     SCREENS.WORKSPACE.WORKFLOWS,
-    SCREENS.WORKSPACE.REIMBURSE,
-    SCREENS.WORKSPACE.BILLS,
     SCREENS.WORKSPACE.INVOICES,
-    SCREENS.WORKSPACE.TRAVEL,
     SCREENS.WORKSPACE.MEMBERS,
     SCREENS.WORKSPACE.CATEGORIES,
     SCREENS.WORKSPACE.MORE_FEATURES,

diff --git a/src/components/UnorderedList.tsx b/src/components/UnorderedList.tsx
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -275,6 +275,8 @@ export default {
             invalidTimeRange: 'Please enter a time using the 12-hour clock format (e.g., 2:30 PM).',
             pleaseCompleteForm: 'Please complete the form above to continue.',
             pleaseSelectOne: 'Please select an option above.',
+            invalidRateError: 'Please enter a valid rate.',
+            lowRateError: 'Rate must be greater than 0.',
         },
         comma: 'comma',
         semicolon: 'semicolon',
@@ -3273,18 +3275,6 @@ export default {
             importMembers: 'Import members',
         },
         card: {
-            header: 'Unlock free Expensify Cards',
-            headerWithEcard: 'Cards are ready!',
-            noVBACopy: 'Connect a bank account to issue Expensify Cards to your workspace members and access exclusive benefits like:',
-            VBANoECardCopy: 'Add a work email to issue unlimited Expensify Cards to your workspace members and enjoy exclusive benefits like:',
-            VBAWithECardCopy: 'Access these incredible benefits and more:',
-            benefit1: 'Cash back on every US purchase',
-            benefit2: 'Unlimited virtual and physical cards',
-            benefit3: 'No personal liability',
-            benefit4: 'Customizable limits and spend controls',
-            addWorkEmail: 'Add work email address',
-            checkingDomain: "Hang tight! We're still working on enabling your Expensify Cards. Check back here in a few minutes.",
-            issueAndManageCards: 'Issue and manage your Expensify Cards',
             getStartedIssuing: 'Get started by issuing your first virtual or physical card.',
             issueCard: 'Issue card',
             issueNewCard: {
@@ -3320,25 +3310,6 @@ export default {
                 deactivateConfirmation: 'Deactivating this card will decline all future transactions and can’t be undone.',
             },
         },
-        reimburse: {
-            captureReceipts: 'Capture receipts',
-            fastReimbursementsHappyMembers: 'Fast reimbursements = happy members!',
-            viewAllReceipts: 'View all receipts',
-            reimburseReceipts: 'Reimburse receipts',
-            trackDistance: 'Track distance',
-            trackDistanceCopy: 'Set the per mile/km rate and choose a default unit to track.',
-            trackDistanceRate: 'Rate',
-            trackDistanceUnit: 'Unit',
-            trackDistanceChooseUnit: 'Choose a default unit to track.',
-            unlockNextDayReimbursements: 'Unlock next-day reimbursements',
-            captureNoVBACopyBeforeEmail: 'Ask your workspace members to forward receipts to ',
-            captureNoVBACopyAfterEmail: ' and download the Expensify app to track expenses on the go.',
-            unlockNoVBACopy: 'Connect a bank account to reimburse your workspace members quickly and easily.',
-            fastReimbursementsVBACopy: "You're all set to reimburse receipts from your bank account!",
-            updateCustomUnitError: "Your changes couldn't be saved because the workspace was modified while you were offline. Please try again.",
-            invalidRateError: 'Please enter a valid rate.',
-            lowRateError: 'Rate must be greater than 0.',
-        },
         accounting: {
             settings: 'settings',
             title: 'Connections',
@@ -3562,16 +3533,6 @@ export default {
             notReadyHeading: 'Not ready to export',
             notReadyDescription: 'Draft or pending expense reports cannot be exported to the accounting system. Please approve or pay these expenses before exporting them.',
         },
-        bills: {
-            manageYourBills: 'Manage your bills',
-            askYourVendorsBeforeEmail: 'Ask your vendors to forward their invoices to ',
-            askYourVendorsAfterEmail: " and we'll scan them for you to pay.",
-            viewAllBills: 'View all bills',
-            unlockOnlineBillPayment: 'Unlock online bill payment',
-            unlockNoVBACopy: 'Connect your bank account to pay bills online for free!',
-            hassleFreeBills: 'Hassle-free bills!',
-            VBACopy: "You're all set to make payments from your bank account!",
-        },
         invoices: {
             invoiceClientsAndCustomers: 'Invoice clients and customers',
             invoiceFirstSectionCopy: 'Send beautiful, professional invoices directly to your clients and customers right from the Expensify app.',
@@ -3596,13 +3557,6 @@ export default {
                 payingAsBusiness: 'Paying as a business',
             },
         },
-        travel: {
-            unlockConciergeBookingTravel: 'Unlock Concierge travel booking',
-            noVBACopy: 'Connect your bank account to let workspace members book their flights, hotels, and cars by starting a chat with Concierge.',
-            packYourBags: 'Pack your bags!',
-            VBACopy: 'Members with the Expensify card can chat with Concierge to book travel!',
-            bookTravelWithConcierge: 'Book travel with Concierge',
-        },
         invite: {
             member: 'Invite member',
             members: 'Invite members',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -265,6 +265,8 @@ export default {
             invalidTimeRange: 'Por favor, introduce una hora entre 1 y 12 (por ejemplo, 2:30 PM).',
             pleaseCompleteForm: 'Por favor complete el formulario de arriba para continuar.',
             pleaseSelectOne: 'Seleccione una de las opciones.',
+            invalidRateError: 'Por favor, introduce una tarifa válida.',
+            lowRateError: 'La tarifa debe ser mayor que 0.',
         },
         comma: 'la coma',
         semicolon: 'el punto y coma',
@@ -3538,20 +3540,7 @@ export default {
             },
         },
         card: {
-            header: 'Desbloquea Tarjetas Expensify gratis',
-            headerWithEcard: '¡Tus tarjetas están listas!',
-            noVBACopy: 'Conecta una cuenta bancaria para emitir Tarjetas Expensify a los miembros de tu espacio de trabajo y acceder a estos increíbles beneficios y más:',
-            VBANoECardCopy:
-                'Añade tu correo electrónico de trabajo para emitir Tarjetas Expensify ilimitadas a los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:',
-            VBAWithECardCopy: 'Acceda a estos increíbles beneficios y más:',
-            benefit1: 'Devolución de dinero en cada compra en Estados Unidos',
-            benefit2: 'Tarjetas virtuales y físicas ilimitadas',
-            benefit3: 'Sin responsabilidad personal',
-            benefit4: 'Límites personalizables',
-            addWorkEmail: 'Añadir correo electrónico de trabajo',
-            checkingDomain: '¡Un momento! Estamos todavía trabajando para habilitar tu Tarjeta Expensify. Vuelve aquí en unos minutos.',
             issueCard: 'Emitir tarjeta',
-            issueAndManageCards: 'Emitir y gestionar Tarjetas Expensify',
             getStartedIssuing: 'Empieza emitiendo tu primera tarjeta virtual o física.',
             issueNewCard: {
                 whoNeedsCard: '¿Quién necesita una tarjeta?',
@@ -3586,40 +3575,12 @@ export default {
                 deactivateConfirmation: 'Al desactivar esta tarjeta, se rechazarán todas las transacciones futuras y no se podrá deshacer.',
             },
         },
-        reimburse: {
-            captureReceipts: 'Captura recibos',
-            fastReimbursementsHappyMembers: '¡Reembolsos rápidos = miembros felices!',
-            viewAllReceipts: 'Ver todos los recibos',
-            reimburseReceipts: 'Reembolsar recibos',
-            trackDistance: 'Medir distancia',
-            trackDistanceCopy: 'Configura la tarifa y unidad usadas para medir distancias.',
-            trackDistanceRate: 'Tarifa',
-            trackDistanceUnit: 'Unidad',
-            trackDistanceChooseUnit: 'Elige una unidad predeterminada de medida.',
-            unlockNextDayReimbursements: 'Desbloquea reembolsos diarios',
-            captureNoVBACopyBeforeEmail: 'Pide a los miembros de tu espacio de trabajo que envíen recibos a ',
-            captureNoVBACopyAfterEmail: ' y descarga la app de Expensify para controlar tus gastos en efectivo sobre la marcha.',
-            unlockNoVBACopy: 'Conecta una cuenta bancaria para reembolsar online a los miembros de tu espacio de trabajo.',
-            fastReimbursementsVBACopy: '¡Todo listo para reembolsar recibos desde tu cuenta bancaria!',
-            updateCustomUnitError: 'Los cambios no han podido ser guardados. El espacio de trabajo ha sido modificado mientras estabas desconectado. Por favor, inténtalo de nuevo.',
-            invalidRateError: 'Por favor, introduce una tarifa válida.',
-            lowRateError: 'La tarifa debe ser mayor que 0.',
-        },
+
         export: {
             notReadyHeading: 'No está listo para exportar',
             notReadyDescription:
                 'Los borradores o informes de gastos pendientes no se pueden exportar al sistema contabilidad. Por favor, apruebe o pague estos gastos antes de exportarlos.',
         },
-        bills: {
-            manageYourBills: 'Gestiona tus facturas',
-            askYourVendorsBeforeEmail: 'Pide a tus proveedores que envíen sus facturas a ',
-            askYourVendorsAfterEmail: ' y las escanearemos para que las pagues.',
-            viewAllBills: 'Ver facturas recibidas',
-            unlockOnlineBillPayment: 'Desbloquea el pago de facturas online',
-            unlockNoVBACopy: '¡Conecta tu cuenta bancaria para pagar tus facturas online de manera gratuita!',
-            hassleFreeBills: '¡Facturas sin complicaciones!',
-            VBACopy: '¡Todo listo para realizar pagos desde tu cuenta bancaria!',
-        },
         invoices: {
             invoiceClientsAndCustomers: 'Emite facturas a tus clientes',
             invoiceFirstSectionCopy: 'Envía facturas detalladas y profesionales directamente a tus clientes desde la app de Expensify.',
@@ -3644,13 +3605,6 @@ export default {
                 payingAsBusiness: 'Pagar como una empresa',
             },
         },
-        travel: {
-            unlockConciergeBookingTravel: 'Desbloquea la reserva de viajes con Concierge',
-            noVBACopy: 'Conecta tu cuenta bancaria para permitir a los miembros de tu espacio de trabajo reservar sus vuelos, hoteles y coches empezando una conversación con Concierge.',
-            packYourBags: '¡Haz las maletas!',
-            VBACopy: '¡Miembros con la tarjeta Expensify pueden hablar con Concierge para reservar viajes!',
-            bookTravelWithConcierge: 'Reserva viajes con Concierge',
-        },
         invite: {
             member: 'Invitar miembros',
             members: 'Invitar miembros',

diff --git a/src/libs/API/parameters/OpenWorkspaceReimburseViewParams.ts b/src/libs/API/parameters/OpenWorkspaceReimburseViewParams.ts
diff --git a/src/libs/API/parameters/UpdateWorkspaceCustomUnitAndRateParams.ts b/src/libs/API/parameters/UpdateWorkspaceCustomUnitAndRateParams.ts