rename to "coVaults" (#1079)

coordinape · Jun 24, 2022 · b717236 · b717236 · vercel · Jun 24, 2022
1 parent e25afc1
commit b717236
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 22 deletions.
diff --git a/api/hasura/actions/_handlers/createVault.ts b/api/hasura/actions/_handlers/createVault.ts
@@ -36,7 +36,7 @@ async function handler(req: VercelRequest, res: VercelResponse) {
 
   if (!isOrgAdmin)
     throw new UnauthorizedError(
-      `Error on Vault Creation: Address ${hasuraAddress} is not an admin` +
+      `Error during coVault Creation: Address ${hasuraAddress} is not an admin` +
         ` of org ${org_id}`
     );
 
@@ -47,7 +47,7 @@ async function handler(req: VercelRequest, res: VercelResponse) {
 
   if (!vaultExists)
     throw new UnprocessableError(
-      `Vault with address ${vault_address} not registered`
+      `No coVault with address ${vault_address} exists`
     );
 
   const vault = contracts.getVault(vault_address);
@@ -90,7 +90,9 @@ async function handler(req: VercelRequest, res: VercelResponse) {
   );
 
   if (!result?.id)
-    throw new InternalServerError(`No Vault Id returned for ${vault_address}`);
+    throw new InternalServerError(
+      `No coVault ID returned for ${vault_address}`
+    );
   res.status(200).json(result);
 }
 

diff --git a/cypress/integration/createVault.ts b/cypress/integration/createVault.ts
@@ -28,10 +28,10 @@ context('Coordinape', () => {
     cy.login();
     cy.contains('Ended Epoch With Gifts', { timeout: 120000 }).click();
     cy.wait(1000);
-    cy.contains('Add Vault').click();
+    cy.contains('Add coVault').click();
     cy.get('[role=dialog]').contains('USDC').click();
-    cy.contains('Create Vault').click();
-    cy.contains('USDC Vault', { timeout: 120000 });
+    cy.contains('Create coVault').click();
+    cy.contains('USDC coVault', { timeout: 120000 });
 
     // Deposit USDC into the vault
     cy.contains('Deposit').click();

diff --git a/src/components/MainLayout/MainHeader.tsx b/src/components/MainLayout/MainHeader.tsx
@@ -26,7 +26,7 @@ import { shortenAddress } from 'utils';
 
 const mainLinks = [
   [paths.circles, 'Overview'],
-  isFeatureEnabled('vaults') && [paths.vaults, 'Vaults'],
+  isFeatureEnabled('vaults') && [paths.vaults, 'coVaults'],
 ].filter(x => x) as [string, string][];
 
 export const MainHeader = () => {

diff --git a/src/components/OverviewMenu/OverviewMenu.tsx b/src/components/OverviewMenu/OverviewMenu.tsx
@@ -35,7 +35,7 @@ type QueryResult = Awaited<ReturnType<typeof getOverviewMenuData>>;
 
 const mainLinks = [
   [paths.circles, 'Overview'],
-  isFeatureEnabled('vaults') && [paths.vaults, 'Vaults'],
+  isFeatureEnabled('vaults') && [paths.vaults, 'coVaults'],
 ].filter(x => x) as [string, string][];
 
 export const OverviewMenu = () => {
@@ -58,7 +58,7 @@ export const OverviewMenu = () => {
   const overviewMenuTriggerText = inCircle
     ? currentCircle
     : location.pathname.includes(paths.vaults)
-    ? 'Vaults'
+    ? 'coVaults'
     : 'Overview';
   const overviewMenuTrigger = (
     <Link

diff --git a/src/lib/vaults/tokens.ts b/src/lib/vaults/tokens.ts
@@ -21,7 +21,10 @@ export const getTokenAddress = (
   const address = hasSimpleToken(vault)
     ? vault.simple_token_address
     : vault.token_address;
-  assert(address && address !== ZERO_ADDRESS, 'Vault is missing token address');
+  assert(
+    address && address !== ZERO_ADDRESS,
+    'coVault is missing token address'
+  );
   return address;
 };
 

diff --git a/src/pages/AdminPage/AdminUserModal.tsx b/src/pages/AdminPage/AdminUserModal.tsx
@@ -164,7 +164,7 @@ export const AdminUserModal = ({
                     onChange={() => {}}
                     label="Fixed Payment Amount"
                     disabled={true}
-                    placeholder="Vault owner must set asset type first"
+                    placeholder="coVault owner must set asset type first"
                   />
                 )}
                 <pre>

diff --git a/src/pages/DistributionsPage/AllocationsTable.tsx b/src/pages/DistributionsPage/AllocationsTable.tsx
@@ -33,7 +33,7 @@ export const AllocationsTable = ({
         { title: 'ETH' },
         { title: `${tokenName || 'GIVE'} Received` },
         { title: '% of Epoch' },
-        { title: 'Vault Funds Allocated' },
+        { title: 'Funds Allocated' },
       ]}
       data={users}
       startingSortIndex={2}

diff --git a/src/pages/DistributionsPage/DistributionForm.tsx b/src/pages/DistributionsPage/DistributionForm.tsx
@@ -114,7 +114,7 @@ export function DistributionForm({
                 textAlign: 'center',
               }}
             >
-              Select Vault
+              Select coVault
             </Box>
             <Controller
               name="selectedVaultId"
@@ -127,7 +127,7 @@ export function DistributionForm({
                   <>
                     <Select
                       value={value || ''}
-                      label="Vault"
+                      label="coVault"
                       error={!!error}
                       disabled={submitting}
                       onChange={({ target: { value } }) => {

diff --git a/src/pages/VaultsPage/CreateForm.test.tsx b/src/pages/VaultsPage/CreateForm.test.tsx
@@ -20,7 +20,7 @@ test('select an asset', async () => {
   });
   await screen.findByText('DAI');
   fireEvent.click(screen.getByText('DAI'));
-  const submitButton = screen.getByText('Create Vault') as HTMLButtonElement;
+  const submitButton = screen.getByText('Create coVault') as HTMLButtonElement;
   await waitFor(() => expect(submitButton.disabled).toBeFalsy());
 });
 

diff --git a/src/pages/VaultsPage/CreateForm.tsx b/src/pages/VaultsPage/CreateForm.tsx
@@ -135,10 +135,10 @@ export const CreateForm = ({
       }}
     >
       <Text font="source" size="large" semibold css={{ mb: '$sm' }}>
-        Select a Vault Asset
+        Select a coVault Asset
       </Text>
       <Text font="source" size="medium">
-        Vaults allow you to fund your circles with the asset of your choice.
+        coVaults allow you to fund your circles with the asset of your choice.
       </Text>
       <Box css={{ display: 'flex', gap: '$sm', my: '$lg' }}>
         {contracts.getAvailableTokens().map(symbol => (
@@ -181,7 +181,7 @@ export const CreateForm = ({
         css={{ mt: '$lg', width: '100%' }}
         disabled={!isValid}
       >
-        Create Vault
+        Create coVault
       </Button>
       {!isEmpty(errors) && (
         <Text color="alert" css={{ mt: '$sm' }}>

diff --git a/src/pages/VaultsPage/VaultRow.tsx b/src/pages/VaultsPage/VaultRow.tsx
@@ -49,7 +49,7 @@ export function VaultRow({
         css={{ display: 'flex', alignItems: 'center', gap: '$md', mb: '$md' }}
       >
         <Text h3 css={{ flexGrow: 1 }}>
-          {vault.symbol || '...'} Vault
+          {vault.symbol || '...'} coVault
         </Text>
         <Button
           color="primary"

diff --git a/src/pages/VaultsPage/VaultsPage.tsx b/src/pages/VaultsPage/VaultsPage.tsx
@@ -59,7 +59,7 @@ const VaultsPage = () => {
       </Box>
       <Box css={{ display: 'flex' }}>
         <Text h2 css={{ flexGrow: 1 }}>
-          Vaults
+          coVaults
         </Text>
         {isAdmin && (
           <Button
@@ -68,7 +68,7 @@ const VaultsPage = () => {
             size="small"
             onClick={() => setModal('create')}
           >
-            Add Vault
+            Add coVault
           </Button>
         )}
       </Box>
@@ -88,7 +88,7 @@ const VaultsPage = () => {
         </Panel>
       )}
       {modal === 'create' && currentOrg && (
-        <Modal onClose={closeModal} title="Create a New Vault">
+        <Modal onClose={closeModal} title="Create a New coVault">
           <CreateForm onSuccess={closeModal} orgId={currentOrg.id} />
         </Modal>
       )}