Independent collectives - update copy (#11728)

* deprecate independent collectives copy

Author: znarf

components/dashboard/sections/collectives/AddFundsModal.tsx

@@ -431,7 +431,7 @@ const checkCanAddHostFee = account => {
     return account.host.id !== account.parent.id;
   }
 
-  // No host fees for Host Organizations or Independent Collectives
+  // No host fees for Host Organizations
   return account.host.id !== account.id;
 };
 

components/dashboard/sections/community/People.tsx

@@ -302,7 +302,6 @@ const PeopleDashboard = ({ accountSlug }: ContributorsProps) => {
       <DashboardHeader
         title={<FormattedMessage id="People" defaultMessage="People" />}
         description={
-          // Should ideally be "your collective" for Independent Collectives but it will be deprecated soon
           <FormattedMessage id="People.Description" defaultMessage="People that interacted with your organization." />
         }
       />

components/dashboard/sections/contributions/PausedIncomingContributionsMessage.tsx

@@ -143,8 +143,8 @@ export const PausedIncomingContributionsMessage = ({ accountSlug }: PausedIncomi
       ) : !account.canStartResumeContributionsProcess ? (
         <p>
           <FormattedMessage
-            defaultMessage="These contributions can't be resumed yet. You need to either find a Fiscal Host or become an Independent Collective. <LearnMoreLink>Learn more</LearnMoreLink>"
-            id="BCdRHe"
+            defaultMessage="These contributions can't be resumed yet. You need to either find a Fiscal Host or become an Organization. <LearnMoreLink>Learn more</LearnMoreLink>"
+            id="XI1j5d"
             values={{ LearnMoreLink: getI18nLink({ as: Link, href: getDashboardRoute(account, 'host') }) }}
           />
         </p>

components/edit-collective/actions/Archive.js

@@ -3,12 +3,10 @@ import { useMutation } from '@apollo/client';
 import { FormattedMessage } from 'react-intl';
 
 import { hasAccountMoneyManagement } from '@/lib/collective';
-import { CollectiveType } from '@/lib/constants/collectives';
 import { getErrorFromGraphqlException } from '@/lib/errors';
 import { API_V1_CONTEXT, gqlV1 } from '@/lib/graphql/helpers';
 
 import { adminPanelQuery } from '../../dashboard/queries';
-import { getI18nLink } from '../../I18nFormatters';
 import MessageBox from '../../MessageBox';
 import StyledModal, { ModalBody, ModalFooter, ModalHeader } from '../../StyledModal';
 import { P } from '../../Text';
@@ -131,19 +129,11 @@ const ArchiveCollective = ({ collective }) => {
       )}
       {!isArchived && !hasBalance && hasMoneyManagement && (
         <MessageBox type="warning">
-          {collective.type === CollectiveType.COLLECTIVE ? (
-            <FormattedMessage
-              id="collective.archive.selfHosted"
-              defaultMessage={`To archive this Independent Collective, first go to your <SettingsLink>Fiscal Host settings</SettingsLink> and click 'Reset Fiscal Host'.`}
-              values={{ SettingsLink: getI18nLink({ href: `/dashboard/${collective.host?.slug}/host` }) }}
-            />
-          ) : (
-            <FormattedMessage
-              id="collective.archive.balance.warning"
-              defaultMessage="You can't archive {type, select, ORGANIZATION {your organization} other {your account}} while managing money on the platform. Please disable Money Management (and Fiscal Hosting if enabled) before archiving this account."
-              values={{ type: collective.type }}
-            />
-          )}
+          <FormattedMessage
+            id="collective.archive.balance.warning"
+            defaultMessage="You can't archive {type, select, ORGANIZATION {your organization} other {your account}} while managing money on the platform. Please disable Money Management (and Fiscal Hosting if enabled) before archiving this account."
+            values={{ type: collective.type }}
+          />
         </MessageBox>
       )}
       {isArchived && confirmationMsg && (

components/edit-collective/actions/Delete.js

@@ -10,7 +10,6 @@ import { API_V1_CONTEXT, gqlV1 } from '@/lib/graphql/helpers';
 
 import MessageBox from '@/components/MessageBox';
 
-import { getI18nLink } from '../../I18nFormatters';
 import StyledModal, { ModalBody, ModalFooter, ModalHeader } from '../../StyledModal';
 import { P } from '../../Text';
 import { Button } from '../../ui/Button';
@@ -33,7 +32,7 @@ const deleteUserCollectiveMutation = gqlV1 /* GraphQL */ `
   }
 `;
 
-const { COLLECTIVE, PROJECT, EVENT } = CollectiveType;
+const { PROJECT, EVENT } = CollectiveType;
 
 const DeleteCollective = ({ collective, ...props }) => {
   const [showModal, setShowModal] = useState(false);
@@ -89,19 +88,11 @@ const DeleteCollective = ({ collective, ...props }) => {
         </MessageBox>
       ) : hasMoneyManagement ? (
         <MessageBox type="warning">
-          {collective.type === COLLECTIVE ? (
-            <FormattedMessage
-              id="collective.delete.selfHost"
-              defaultMessage={`To delete this Independent Collective, first go to your <SettingsLink>Fiscal Host settings</SettingsLink> and click 'Reset Fiscal Host'.`}
-              values={{ SettingsLink: getI18nLink({ href: `/dashboard/${collective.host?.slug}/host` }) }}
-            />
-          ) : (
-            <FormattedMessage
-              id="collective.delete.balance.warning"
-              defaultMessage="You can't delete {type, select, ORGANIZATION {your organization} other {your account}} while managing money on the platform. Please disable Money Management (and Fiscal Hosting if enabled) before archiving this account."
-              values={{ type: collective.type }}
-            />
-          )}
+          <FormattedMessage
+            id="collective.delete.balance.warning"
+            defaultMessage="You can't delete {type, select, ORGANIZATION {your organization} other {your account}} while managing money on the platform. Please disable Money Management (and Fiscal Hosting if enabled) before archiving this account."
+            values={{ type: collective.type }}
+          />
         </MessageBox>
       ) : !collective.isDeletable && [EVENT, PROJECT].includes(collective.type) ? (
         <MessageBox type="warning">

components/edit-collective/sections/Policies.js

@@ -362,7 +362,7 @@ const Policies = ({ collective }) => {
               )}
             </StyledInputField>
 
-            {/* Mandatory Fields: For Organizations and Independent Collectives */}
+            {/* Mandatory Fields: For Organizations */}
             {hasMoneyManagement && (
               <div className="mt-4 flex flex-col gap-2">
                 <div className="font-bold">
@@ -898,7 +898,7 @@ const Policies = ({ collective }) => {
           />
         </Container>
 
-        {/* Expense Types: For Organizations and Independent Collectives */}
+        {/* Expense Types: For Organizations */}
         {hasMoneyManagement && (
           <React.Fragment>
             <Container>

components/faqs/PricingFAQ.js

@@ -39,14 +39,14 @@ const PricingFAQ = props => (
     <Entry>
       <Title>
         <H4 fontWeight="500" fontSize="20px" lineHeight="28px" letterSpacing="-0.008em">
-          <FormattedMessage id="pricing.faq.fiscalHost.title" defaultMessage="What is a Fiscal Host?" />
+          <FormattedMessage id="pricing.faq.organization.title" defaultMessage="What is an Organization?" />
         </H4>
       </Title>
       <Content>
         <P fontSize="14px" lineHeight="20px" fontWeight="400" color="black.800">
           <FormattedMessage
-            id="OCFHostApplication.faq.fiscalHost.content"
-            defaultMessage="A Fiscal Host holds funds on behalf of Collectives, enabling them to operate using the Host's bank account and legal entity."
+            id="OCFHostApplication.faq.organization.content"
+            defaultMessage="An Organization is a legal entity, such as a non-profit, cooperative, or company, that can manage funds for itself and/or act as a Fiscal Host by receiving and holding contributions on behalf of Collectives using its legal entity and bank account."
           />
         </P>
       </Content>

components/pricing/ForFiscalHostCard.js

@@ -183,7 +183,7 @@ const ForFiscalHosts = () => {
             letterSpacing={[null, '-0.00em']}
             color="primary.900"
           >
-            <FormattedMessage id="pricing.fiscalHost" defaultMessage="For Fiscal Hosts" />
+            <FormattedMessage defaultMessage="For Organizations" id="X7kjxh" />
           </H3>
           <StyledHR my="8px" />
           <P fontSize="14px" lineHeight="20px" color="black.800">
@@ -298,9 +298,9 @@ const ForFiscalHosts = () => {
       </Flex>
 
       <Flex justifyContent={['center', 'left']} alignItems={['flex-start', 'center']} mt={10}>
-        <Link href="/signup/organization?host=true">
+        <Link href="/signup/organization?active=true">
           <StyledButton px={3} py={2} buttonStyle="primary" width="160px" whiteSpace="nowrap" mb={4}>
-            <FormattedMessage id="home.createHost" defaultMessage="Create a Fiscal Host" />
+            <FormattedMessage id="host.organization.create" defaultMessage="Create an Organization" />
           </StyledButton>
         </Link>
       </Flex>

components/pricing/Tabs.js

@@ -51,7 +51,7 @@ const Tabs = ({ activeTab }) => (
     </Link>
     <Link href="#fiscalHost">
       <Tab active={activeTab === 'fiscalHost'}>
-        <FormattedMessage id="pricing.forFiscalHost" defaultMessage="For fiscal hosts" />
+        <FormattedMessage defaultMessage="For Organizations" id="X7kjxh" />
       </Tab>
     </Link>
     <Link href="#faq">

components/pricing/index.js

@@ -197,7 +197,7 @@ const Pricing = () => {
           borderRadius="8px"
           mb={['20px', 0]}
           mr={[null, '10px']}
-          minHeight="500px"
+          minHeight="525px"
           background="white"
         >
           <Flex flexDirection={['column', 'row']} alignItems="center">
@@ -233,13 +233,9 @@ const Pricing = () => {
                 <P fontSize="14px" lineHeight="20px" fontWeight="400" color="black.800">
                   <FormattedMessage
                     id="pricing.collectiveCard.description"
-                    defaultMessage="<strong>Collect, spend and manage money transparently.</strong> Connect your bank account as an <IndependentCollectiveLink>Independent Collective</IndependentCollectiveLink>, or apply to a <FiscalHostLink>Fiscal Host</FiscalHostLink>."
+                    defaultMessage="<strong>Collect, spend, and manage money transparently for a group, project, or initiative.</strong> Collectives do not have a legal entity of their own and must apply to a <FiscalHostLink>Fiscal Host</FiscalHostLink> to operate under their legal entity."
                     values={{
                       ...I18nFormatters,
-                      IndependentCollectiveLink: getI18nLink({
-                        href: 'https://documentation.opencollective.com/independent-collectives/independent-collectives',
-                        openInNewTab: true,
-                      }),
                       FiscalHostLink: getI18nLink({
                         href: 'https://opencollective.com/fiscal-hosting',
                         openInNewTab: true,
@@ -252,7 +248,7 @@ const Pricing = () => {
           </Flex>
           <Box minHeight={['252px', null, '150px']} mb={[null, null, '24px']} mt={[null, null, '24px', '40px']}>
             <H4 fontSize="24px" lineHeight="32px" letterSpacing="-0.008em" color="primary.900" fontWeight="500">
-              <FormattedMessage id="pricing.collectiveCard.free" defaultMessage="Free – forever" />
+              <FormattedMessage id="Amount.Free" defaultMessage="Free" />
             </H4>
             <ListWrapper as="ul">
               <ListItem
@@ -275,10 +271,7 @@ const Pricing = () => {
                 />
               </ListItem>
               <ListItem>
-                <FormattedMessage
-                  id="pricing.collectiveCard.hostFees"
-                  defaultMessage="Fiscal Host fees may apply, if you opt to join one"
-                />
+                <FormattedMessage id="pricing.collectiveCard.hostFees" defaultMessage="Fiscal Host fees may apply" />
               </ListItem>
             </ListWrapper>
           </Box>
@@ -303,7 +296,7 @@ const Pricing = () => {
             </Link>
           </Container>
         </Card>
-        <Card border="1px solid #DCDEE0" borderRadius="8px" ml={[null, '10px']} minHeight="500px" background="white">
+        <Card border="1px solid #DCDEE0" borderRadius="8px" ml={[null, '10px']} minHeight="525px" background="white">
           <Flex flexDirection={['column', null, 'row']}>
             <Box width="144px" height="144px" display={['none', null, 'block']} mr={[null, null, '24px']}>
               <NextIllustration
@@ -323,7 +316,7 @@ const Pricing = () => {
                 color="primary.900"
                 mb="8px"
               >
-                <FormattedMessage id="pricing.fiscalHost" defaultMessage="For Fiscal Hosts" />
+                <FormattedMessage defaultMessage="For Organizations" id="X7kjxh" />
               </P>
               <StyledHR />
               <Box width="144px" height="144px" my="8px" display={[null, null, 'none']}>
@@ -338,7 +331,7 @@ const Pricing = () => {
                 <P fontSize="14px" lineHeight="20px" fontWeight="400" color="black.800">
                   <FormattedMessage
                     id="pricing.fiscalHostCard.description"
-                    defaultMessage="As a <FiscalHostLink>Fiscal Host</FiscalHostLink>, you hold funds on behalf of Collectives. <strong>You decide what fees to charge</strong> (if any), and share revenue with the platform."
+                    defaultMessage="Hold funds for your own legal entity and/or act as a <FiscalHostLink>Fiscal Host</FiscalHostLink> by holding funds on behalf of Collectives. When hosting, you decide what fees to charge, if any, and share revenue with the platform."
                     values={{
                       strong: I18nBold,
                       FiscalHostLink: getI18nLink({
@@ -376,13 +369,13 @@ const Pricing = () => {
               <ListItem>
                 <FormattedMessage
                   id="pricing.fiscalHost.hostFees"
-                  defaultMessage="15% revenue share with the platform if you charge Host Fees"
+                  defaultMessage="15% share with the platform if you charge Host Fees"
                 />
               </ListItem>
             </ListWrapper>
           </Box>
           <Container display="flex" flexDirection={['column', null, 'row']} alignItems={['center', null, 'flex-start']}>
-            <Link href="/signup/organization?host=true">
+            <Link href="/signup/organization?active=true">
               <StyledButton
                 buttonStyle="primary"
                 width={['224px', null, '160px']}
@@ -392,7 +385,7 @@ const Pricing = () => {
                 whiteSpace="nowrap"
                 mr={[null, null, 3]}
               >
-                <FormattedMessage id="home.createHost" defaultMessage="Create a Fiscal Host" />
+                <FormattedMessage id="host.organization.create" defaultMessage="Create an Organization" />
               </StyledButton>
             </Link>
             <Link href="#fiscalHost">