Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deploy #458

Merged
merged 10 commits into from
Dec 5, 2023
+36 −11
Merged

deploy #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
13c64f0
temporary increase of processing gas addition until, needs more research
dekanbro Nov 15, 2023
5125301
styles to make proposal details more readable
dekanbro Nov 15, 2023
e30f611
style update
dekanbro Nov 16, 2023
78b9985
increase min length of token symbols on summoner form
dekanbro Nov 16, 2023
ecd0ff3
Merge pull request #453 from HausDAO/fix/processingGasLimit
santteegt Nov 17, 2023
3f3ab0a
Merge pull request #456 from HausDAO/feat/summon-symbols-length
skuhlmann Nov 17, 2023
075deb0
Merge pull request #454 from HausDAO/feat/details-markdown-wrapper
dekanbro Nov 17, 2023
90bcce0
Fix funding proposal tx lego
santteegt Dec 5, 2023
ee34371
cleanup
santteegt Dec 5, 2023
f79045d
Merge pull request #457 from HausDAO/fix/funding-proposal
skuhlmann Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apps/summon/src/layouts/StakeTokenSegment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
}}
/>
Expand Down Expand Up @@ -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',
},
}}
/>
Expand Down
4 changes: 1 addition & 3 deletions libs/moloch-v3-legos/src/tx.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {
NestedArray,
POSTER_TAGS,
TABULA_TAGS,
ENCODED_0X0_DATA,
TXLego,
ValidArgType,
TXLegoBase,
Expand Down Expand Up @@ -254,7 +253,7 @@ export const TX: Record<string, TXLego> = {
value: '.formValues.paymentAmount',
data: {
type: 'static',
value: ENCODED_0X0_DATA,
value: '0x',
},
},
],
Expand Down Expand Up @@ -307,7 +306,6 @@ export const TX: Record<string, TXLego> = {
value: '.formValues.paymentAmount',
data: {
type: 'static',
// value: ENCODED_0X0_DATA,
value: '0x',
},
},
Expand Down
31 changes: 29 additions & 2 deletions libs/moloch-v3-macro-ui/src/components/ProposalDetails/ProposalDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libs/utils/src/constants/proposals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion libs/utils/src/constants/summoning.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading