Merge pull request #458 from HausDAO/develop

deploy
HausDAO · Dec 5, 2023 · f31b99e · f31b99e
2 parents 4a2f11b + f79045d
commit f31b99e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 11 deletions.
diff --git a/apps/summon/src/layouts/StakeTokenSegment.tsx b/apps/summon/src/layouts/StakeTokenSegment.tsx
@@ -62,9 +62,9 @@ export const StakeTokensSegment = ({
                   rules={{
                     required: 'Token symbol is required',
                     maxLength: {
-                      value: 5,
+                      value: 20,
                       message:
-                        'Token symbol cannot be longer than 5 characters',
+                        'Token symbol cannot be longer than 20 characters',
                     },
                   }}
                 />
@@ -100,9 +100,9 @@ export const StakeTokensSegment = ({
                   rules={{
                     required: 'Token symbol is required',
                     maxLength: {
-                      value: 5,
+                      value: 20,
                       message:
-                        'Token symbol cannot be longer than 5 characters',
+                        'Token symbol cannot be longer than 20 characters',
                     },
                   }}
                 />

diff --git a/libs/moloch-v3-legos/src/tx.ts b/libs/moloch-v3-legos/src/tx.ts
@@ -3,7 +3,6 @@ import {
   NestedArray,
   POSTER_TAGS,
   TABULA_TAGS,
-  ENCODED_0X0_DATA,
   TXLego,
   ValidArgType,
   TXLegoBase,
@@ -254,7 +253,7 @@ export const TX: Record<string, TXLego> = {
         value: '.formValues.paymentAmount',
         data: {
           type: 'static',
-          value: ENCODED_0X0_DATA,
+          value: '0x',
         },
       },
     ],
@@ -307,7 +306,6 @@ export const TX: Record<string, TXLego> = {
                       value: '.formValues.paymentAmount',
                       data: {
                         type: 'static',
-                        // value: ENCODED_0X0_DATA,
                         value: '0x',
                       },
                     },

diff --git a/libs/moloch-v3-macro-ui/src/components/ProposalDetails/ProposalDetails.tsx b/libs/moloch-v3-macro-ui/src/components/ProposalDetails/ProposalDetails.tsx
@@ -29,12 +29,35 @@ import { ProposalWarning } from '../ProposalActionData/ProposalWarning';
 import styled from 'styled-components';
 import { ProposalActionConfig } from '../ProposalActionData';
 
-import ReactMarkdown from "react-markdown";
+import ReactMarkdown from 'react-markdown';
 
 const Spacer = styled.div`
   margin-bottom: 2rem;
 `;
 
+const ReactMarkdownWrapper = styled.div`
+  font-size: 1.6rem;
+
+  .description {
+    p,
+    h1,
+    h2,
+    h3,
+    h4 {
+      margin-top: 1rem;
+    }
+    h2 + p {
+      margin-top: 0;
+    }
+    h3 + p {
+      margin-top: 0;
+    }
+    h4 + p {
+      margin-top: 0;
+    }
+  }
+`;
+
 type ProposalDetailsProps = {
   daoChain: string;
   daoId: string;
@@ -61,7 +84,11 @@ export const ProposalDetails = ({
 
   return (
     <OverviewContainer>
-      <ReactMarkdown className="description">{proposal.description}</ReactMarkdown>
+      <ReactMarkdownWrapper>
+        <ReactMarkdown className="description">
+          {proposal.description}
+        </ReactMarkdown>
+      </ReactMarkdownWrapper>
       {proposal.contentURI && (
         <Link href={proposal.contentURI} className="proposal-link">
           Link

diff --git a/libs/utils/src/constants/proposals.ts b/libs/utils/src/constants/proposals.ts
@@ -108,7 +108,7 @@ export const PROPOSAL_FILTERS: Record<string, string> = {
 // Processing gas estimate buffer
 export const GAS_BUFFER_MULTIPLIER = 2;
 // Adding to the gas limit to account for cost of processProposal
-export const PROCESS_PROPOSAL_GAS_LIMIT_ADDITION = 150000;
+export const PROCESS_PROPOSAL_GAS_LIMIT_ADDITION = 250000;
 // Adding to the gas limit to account for cost of each action
 export const ACTION_GAS_LIMIT_ADDITION = 150000;
 

diff --git a/libs/utils/src/constants/summoning.ts b/libs/utils/src/constants/summoning.ts
@@ -8,7 +8,7 @@ export const SUMMON_COPY = {
   VOTING_STK:
     'What does your DAO want to name the tokens representing voting stake?',
   TOKEN_SYMBOL:
-    'How would your DAO like to abbreviate the tokens representing voting stake?',
+    'How would your DAO like to abbreviate the tokens representing voting stake? (20 letters max)',
   STAKE_TRANSFER:
     'Should DAO members be allowed to transfer voting stake to other accounts? After summoning, the DAO can change this with a proposal.',
   NV_STAKE_TRANSFER: