copy-sweep-roundup (ENG-1158) (#583)

Govrn-HQ · Jul 10, 2023 · ddc69c0 · ddc69c0
1 parent ba30a56
commit ddc69c0
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 59 deletions.
diff --git a/apps/protocol-frontend/src/components/AttestationsTable.tsx b/apps/protocol-frontend/src/components/AttestationsTable.tsx
@@ -445,8 +445,8 @@ const AttestationsTable = ({
                 DAO Contributions
               </Text>
               <Text fontSize="md" fontWeight="normal">
-                These are minted contributions that you haven't already attested
-                to.
+                These are minted contributions from your peers that you can give
+                attestations to.
               </Text>
             </Stack>
             <Button

diff --git a/apps/protocol-frontend/src/components/ContributionsTableShell.tsx b/apps/protocol-frontend/src/components/ContributionsTableShell.tsx
@@ -123,6 +123,7 @@ const ContributionsTableShell = () => {
             🌞
           </span>{' '}
           Please select at least one contribution to attribute to a DAO or mint.
+          Minting allows others to view and attest to your contributions!
         </AlertDescription>
       </Alert>
     ) : (
@@ -184,7 +185,7 @@ const ContributionsTableShell = () => {
                       maxWidth="100vw"
                     >
                       <Text fontSize="lg" fontWeight="medium">
-                        My Contributions
+                        Manage My Contributions
                       </Text>
                       {nonMintedContributions &&
                       nonMintedContributions.length > 0 ? (

diff --git a/apps/protocol-frontend/src/components/DaoCard.tsx b/apps/protocol-frontend/src/components/DaoCard.tsx
@@ -138,10 +138,9 @@ const DaoCard = ({ userId, daoUser }: DaoCardProps) => {
               <Link to={`/dao/${daoUser.guild.id}/settings`}>
                 <IconButton
                   aria-label="Click on the gear icon to open this DAO's settings."
-                  bg="transparent"
-                  _hover={{ bg: 'transparent' }}
-                  _active={{ bg: 'transparent' }}
-                  icon={<HiOutlineCog color="#5100E4" size={24} />}
+                  variant="ghost"
+                  colorScheme="brand.secondary"
+                  icon={<HiOutlineCog size={24} />}
                 />
               </Link>
             ) : (

diff --git a/apps/protocol-frontend/src/components/EditContributionForm.tsx b/apps/protocol-frontend/src/components/EditContributionForm.tsx
@@ -291,24 +291,19 @@ const EditContributionForm = ({ contribution }: EditContributionFormProps) => {
           <Select
             name="daoId"
             label="DAO"
-            placeholder="Select a DAO to associate this Contribution with."
+            placeholder="Select a DAO to associate this contribution with."
             tip={
-              <>
-                Please select a DAO to associate this contribution with.
-                <Box fontWeight={700} lineHeight={2}>
-                  This is optional. Don't see your DAO? Join or create one{' '}
-                  <Link
-                    as={RouterLink}
-                    to="/profile"
-                    state={{ targetId: 'myDaos' }}
-                    textDecoration="underline"
-                  >
-                    on your Profile.
-                  </Link>
-                </Box>
-                Note: Clicking the link will navigate to your Profile and clear
-                the form!
-              </>
+              <Box lineHeight={2}>
+                This is optional. Don't see your DAO? Join or create one{' '}
+                <Link
+                  as={RouterLink}
+                  to="/profile"
+                  state={{ targetId: 'myDaos' }}
+                  textDecoration="underline"
+                >
+                  on your Profile.
+                </Link>
+              </Box>
             }
             defaultValue={{
               value: contribution?.guilds[0]?.guild.id

diff --git a/apps/protocol-frontend/src/components/FloatingReportButton.tsx b/apps/protocol-frontend/src/components/FloatingReportButton.tsx
@@ -25,7 +25,7 @@ const FloatingReportButton = () => {
 
   return (
     <Box position="fixed" bottom="40px" right={['16px', '84px']} zIndex={1}>
-      <Tooltip variant="primary" label="Report Contribution" fontSize="md">
+      <Tooltip variant="primary" label="Report a Contribution" fontSize="md">
         <IconButton
           aria-label="Add Contribution Activity Report Button"
           background="brand.gradient"
@@ -49,7 +49,7 @@ const FloatingReportButton = () => {
       </Tooltip>
       <ModalWrapper
         name="reportingFormModal"
-        title="Report Contribution Activity"
+        title="Report a Contribution"
         localOverlay={localOverlay}
         content={<ReportForm onFinish={() => closeForm()} />}
       />

diff --git a/apps/protocol-frontend/src/components/HomeLayout.tsx b/apps/protocol-frontend/src/components/HomeLayout.tsx
@@ -139,7 +139,7 @@ const HomeNew = () => {
           maxW={{ base: '70%', lg: '60%' }}
         >
           <Text textAlign="center">
-            Track and record your DAO Contributions
+            Track and Record your DAO Contributions
           </Text>
           <span role="img" aria-labelledby="Govrn motto handshake emoji">
             🤝

diff --git a/apps/protocol-frontend/src/components/MyAttestationsTable.tsx b/apps/protocol-frontend/src/components/MyAttestationsTable.tsx
@@ -333,10 +333,10 @@ const MyAttestationsTable = ({
           >
             <Stack direction="column" gap="2">
               <Text fontSize="lg" fontWeight="medium">
-                My Contributions
+                Attestations Given
               </Text>
               <Text fontSize="md" fontWeight="normal">
-                These are contributions that you have already attested to.
+                These are peer contributions that you have already attested to.
               </Text>
             </Stack>
           </Stack>

diff --git a/apps/protocol-frontend/src/components/ReportForm.tsx b/apps/protocol-frontend/src/components/ReportForm.tsx
@@ -313,22 +313,17 @@ const ReportForm = ({ onFinish }: { onFinish: () => void }) => {
             isClearable={true}
             backspaceRemovesValue={true}
             tip={
-              <>
-                Please select a DAO to associate this contribution with.
-                <Box fontWeight={700} lineHeight={2}>
-                  This is optional. Don't see your DAO? Join or create one{' '}
-                  <Link
-                    as={RouterLink}
-                    to="/profile"
-                    state={{ targetId: 'myDaos' }}
-                    textDecoration="underline"
-                  >
-                    on your Profile.
-                  </Link>
-                </Box>
-                Note: Clicking the link will navigate to your Profile and clear
-                the form!
-              </>
+              <Box lineHeight={2}>
+                This is optional. Don't see your DAO? Join or create one{' '}
+                <Link
+                  as={RouterLink}
+                  to="/profile"
+                  state={{ targetId: 'myDaos' }}
+                  textDecoration="underline"
+                >
+                  on your Profile.
+                </Link>
+              </Box>
             }
             placeholder="Select a DAO to associate this contribution with."
             onChange={dao => {
@@ -344,7 +339,7 @@ const ReportForm = ({ onFinish }: { onFinish: () => void }) => {
             isClearable={true}
             backspaceRemovesValue={true}
             isRequired
-            placeholder="Select an activity type or add a new one"
+            placeholder="Select existing or type in a new one"
             onChange={activity => {
               if (activity instanceof Array || !activity) {
                 return;
@@ -358,7 +353,7 @@ const ReportForm = ({ onFinish }: { onFinish: () => void }) => {
           <Textarea
             name="details"
             label="Details"
-            tip="Briefly describe your contribution"
+            tip="Briefly describe your contribution."
             placeholder="I added a section to our onboarding documentation that provides an overview of our Discord channels."
             variant="outline"
             localForm={localForm}

diff --git a/apps/protocol-frontend/src/components/ReportShell.tsx b/apps/protocol-frontend/src/components/ReportShell.tsx
@@ -14,7 +14,7 @@ const ReportShell = () => {
       color="gray.700"
       maxWidth="1200px"
     >
-      <PageHeading>Report an Activity Contribution</PageHeading>
+      <PageHeading>Report a Contribution</PageHeading>
       <Flex
         justify="space-between"
         direction="column"

diff --git a/apps/protocol-frontend/src/components/VerificationFramework.tsx b/apps/protocol-frontend/src/components/VerificationFramework.tsx
@@ -46,8 +46,8 @@ const VerificationFramework = ({
           </Text>
           <br />
           <Text>
-            A contribution becomes Verified by the DAO when it receives a
-            minimum number of attestations from members.
+            A contribution becomes <Text as="i">verified</Text> by the DAO when
+            it receives a minimum number of attestations from members.
           </Text>
         </Flex>
         <VerificationFrameworkForm

diff --git a/apps/protocol-frontend/src/utils/requireAuth.tsx b/apps/protocol-frontend/src/utils/requireAuth.tsx
@@ -19,16 +19,13 @@ const NonAuthenticatedView = () => {
       copy={
         <Stack fontSize="lg" fontWeight="regular" mx={{ base: 4, lg: 32 }}>
           <Text>
-            You'll need to connect your wallet to get started with Govrn. If
-            you're a new user we'll create an account for you with your address.
+            Connect your wallet to get started! If you're a new user, we'll
+            create an account for you and then you'll be redirected to the page
+            you're looking for.
           </Text>
           <Text>
-            You’ll be able to join a DAO, attest to other people’s
-            contributions, and create contributions of your own.
-          </Text>
-          <Text>
-            After connecting you should be redirected to whatever page you’re
-            looking for.
+            You'll be able to join a DAO, attest to others' contributions, and
+            create contributions of your own.
           </Text>
         </Stack>
       }

diff --git a/libs/protocol-ui/src/components/molecules/Textarea/Textarea.tsx b/libs/protocol-ui/src/components/molecules/Textarea/Textarea.tsx
@@ -47,7 +47,11 @@ const Textarea: React.FC<TextareaProps> = ({
   });
 
   return (
-    <FormControl isInvalid={errors[name] !== undefined} isRequired={isRequired}>
+    <FormControl
+      isInvalid={errors[name] !== undefined}
+      isRequired={isRequired}
+      mb={4}
+    >
       <Stack spacing={2}>
         {label && <FormLabel label={label} />}
         {tip && <HelperText tipText={tip} fontSize="xs" color="gray.700" />}