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.

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

Update Proposal list #1472

Merged
merged 27 commits into from
Mar 26, 2024
Merged

Update Proposal list #1472

merged 27 commits into from
Mar 26, 2024

Conversation

Da-Colon
Copy link
Contributor

@Da-Colon Da-Colon commented Mar 20, 2024

Updated Proposal List (Dashboard, Proposals (Governance page), and updates Badge on Details

Testing:

For testing: Please view Dashboard, Proposals Page and Details of a few different DAO types. Make sure everything loads correctly. Here is the design link to compare. https://www.figma.com/file/dNWxEnscUonneTsNdzn6qZ/Components---Fractal-Design-System-0.0.1?type=design&node-id=10810-261&mode=design&t=qBGWJaHrBkbPIkTo-0

Here are some different DAO addresses:
0x259a5770d7242b5aBa7420926690E90c69037d10
0x70484d88cB248b9a5150d133fEDBa7948AfC9b0B
0xDD73b64C8845868CCddB30df83929fBA63b4d284
0x76DA0508ee8f900be06E58D8D56F418494C266d7

Screenshots:

Token DAO

localhost_3000_daos_0x259a5770d7242b5aBa7420926690E90c69037d10 (1)

Multisig DAO

localhost_3000_daos_0x70484d88cB248b9a5150d133fEDBa7948AfC9b0B(Desktop)

Snapshot Proposals

  • Note here. Proposal Description format is handled by the Markdown. I removed a conditional that was doing plaintext when truncated to let the markdown do its thing. Its more or less controlled by number of lines now.
    localhost_3000_daos_0x70484d88cB248b9a5150d133fEDBa7948AfC9b0B_proposals_2 (1)

Responsive Design

localhost_3000_daos_0x70484d88cB248b9a5150d133fEDBa7948AfC9b0B

Details Page update (Badge | Proposal Title | Proposal Description)

localhost_3000_daos_0x70484d88cB248b9a5150d133fEDBa7948AfC9b0B_proposals_2

Closes #1448

@Da-Colon Da-Colon self-assigned this Mar 20, 2024
Copy link

netlify bot commented Mar 20, 2024

Deploy Preview for fractal-dev ready!

Name Link
🔨 Latest commit 78aa6e4
🔍 Latest deploy log https://app.netlify.com/sites/fractal-dev/deploys/6601fe343dba4d00086a2cbc
😎 Deploy Preview https://deploy-preview-1472.app.dev.fractalframework.xyz
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Main entry to changes. Replaces current ActivityGovernance component.

Comment on lines 16 to 37
const greenPlus2 = '#56A355';
const greenMinus5 = '#0A320A';
const greenHover = '#0E440E';

const redPlus4 = '#FFC7C7';
const redMinus2 = '#640E0D';
const redHover = '#76110F';

const sandBG = '#C18D5A';
const sandHover = '#B97F46'
const blackText = '#150D04'

const grayBG = '#9A979D'
const grayHover = '#8C8990'

const lightBlueBG = '#A3B9EC'
const lightBlueHover = '#8DA8E7'
const darkBlueText = '#0A1E3D'

const darkBlueBG = '#1B3B83'
const darkBlueHover = '#17326E'
const lightBlueText = '#D1DCF5'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New colors are hardcoded in file for now. Not ideal I tried to use the name given in the figma file but some don't have colors yet. This can be move to design system once overhaul is done.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uses meetsQuorum to pull the information directly from contract for linearERC20 strategy token DAOs. I created a issue for update ERC721 contract to do the same.

Comment on lines -86 to -96
if (truncate) {
return (
<Text
noOfLines={2}
fontWeight={400}
minWidth="100%"
>
{plainText}
</Text>
);
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need this. Markdown looks pretty good. going straight to the markdown below. Let me know @mudrila if this is a bad idea.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah the idea was to remove styling applied by markdown in order to fit more actual content. I don't have strong opinion here but think we'd need some additional input to decide

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we still removing translations if the english json is updated?

@Da-Colon
Copy link
Contributor Author

Da-Colon commented Mar 20, 2024

localhost_3000_daos_0xDD73b64C8845868CCddB30df83929fBA63b4d284

Here is the current UI when Frozen. @xraystyle1980 @nicolaus-sherrill @xanaramoss

There are few 'Activities' that have UI components but I haven't seen them in the UI in a while. This Frozen Activity is one of them. This PR doesn't touch the UI for these activities beyond the shared components (Badge, Proposal Title).

@Da-Colon Da-Colon marked this pull request as ready for review March 20, 2024 14:07
Copy link

@nicolaus-sherrill nicolaus-sherrill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So far, I'm only able to find Executed, Rejected,and Closed in my testing but I'm seeing issues with color and vertical alignment on them.

See images below:
Screenshot 2024-03-20 at 11 49 51 AM
Screenshot 2024-03-20 at 11 55 09 AM
Screenshot 2024-03-20 at 11 55 14 AM

@Da-Colon
Copy link
Contributor Author

So far, I'm only able to find Executed, Rejected,and Closed in my testing but I'm seeing issues with color and vertical alignment on them.

See images below: Screenshot 2024-03-20 at 11 49 51 AM Screenshot 2024-03-20 at 11 55 09 AM Screenshot 2024-03-20 at 11 55 14 AM

@nicolaus-sherrill Coolio. updated colors and fixed alignment (which was a little tricky)

Copy link
Contributor

@mudrila mudrila left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple minor suggestions, but other than that - looks good!


// @dev only azorius governance has quorum
if ((proposal as SnapshotProposal).snapshotProposalId || !votingStrategy) {
return null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Snapshot proposal also might have a quorum, yet it might be non-trivial to calculate it. Can you create a ticket so we'd investigate this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

src/components/ui/badges/QuorumBadge.tsx Outdated Show resolved Hide resolved
Comment on lines -86 to -96
if (truncate) {
return (
<Text
noOfLines={2}
fontWeight={400}
minWidth="100%"
>
{plainText}
</Text>
);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah the idea was to remove styling applied by markdown in order to fit more actual content. I don't have strong opinion here but think we'd need some additional input to decide

@Da-Colon Da-Colon requested a review from mudrila March 21, 2024 14:05
@xraystyle1980
Copy link

xraystyle1980 commented Mar 22, 2024

The spacing is off. All status badges should have 8px horizontal padding, 8px gap between icon and label, and 4px border radius. (the colors are not 100% but we have new colors coming soon so I'm not pushing back on that)

image

@Da-Colon
Copy link
Contributor Author

@xraystyle1980 Colors are wrong? I'll take a look? I'll take another look at the padding as well.

@Da-Colon Da-Colon force-pushed the design-update/proposal-list branch from 401d3b6 to 7eff319 Compare March 25, 2024 13:21
@Da-Colon
Copy link
Contributor Author

@xraystyle1980 Ah I see ha. There were a few updates to the colors I didn't notice and didn't realize there was a hover text color. Ive updated the badge. I've adjusted the padding around the badge to 8px to match the designs more closely.

@tomstuart123
Copy link

@Da-Colon

Two line proposal title's force the proposer address to the wrong line

see below proposal 14 (i.e. address below title) v.s proposal 13 where the address is on the same line

Screenshot 2024-03-25 at 15 46 36

@nicolaus-sherrill
Copy link

@Da-Colon

Two line proposal title's force the proposer address to the wrong line

see below proposal 14 (i.e. address below title) v.s proposal 13 where the address is on the same line

Screenshot 2024-03-25 at 15 46 36

My take is that keeping proposal titles to one line, and implementing some visual way to represent that there is more of the title would be best.

However, if that's not reasonable/feasible, definitely want to see that author name on the same line as the proposal title.

src/components/ui/proposal/Markdown.tsx Show resolved Hide resolved
src/components/ui/badges/QuorumBadge.tsx Outdated Show resolved Hide resolved
src/components/ui/badges/Badge.tsx Outdated Show resolved Hide resolved
@Da-Colon
Copy link
Contributor Author

@Da-Colon
Two line proposal title's force the proposer address to the wrong line
see below proposal 14 (i.e. address below title) v.s proposal 13 where the address is on the same line
Screenshot 2024-03-25 at 15 46 36

My take is that keeping proposal titles to one line, and implementing some visual way to represent that there is more of the title would be best.

However, if that's not reasonable/feasible, definitely want to see that author name on the same line as the proposal title.

Yeah I actually ran into quite a bit of an issue getting these to play together with longer titles. Almost all the Proposals are fine except for the longer ones.

localhost_3000_daos_0xD26c85D435F02DaB8B220cd4D2d398f6f646e235 (1)

localhost_3000_daos_0xD26c85D435F02DaB8B220cd4D2d398f6f646e235 (3)

@Da-Colon Da-Colon requested a review from adamgall March 25, 2024 19:08
@xraystyle1980
Copy link

Layout looks good @Da-Colon

Copy link

@nicolaus-sherrill nicolaus-sherrill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making those pixel-perfect tweaks. Looks great!

@Da-Colon Da-Colon merged commit 54a9e51 into develop Mar 26, 2024
7 checks passed
@Da-Colon Da-Colon deleted the design-update/proposal-list branch March 26, 2024 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement new Proposal List designs
6 participants