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

Liq rewards proposals #2205

Draft
wants to merge 25 commits into
base: master
Choose a base branch
from
Draft

Liq rewards proposals #2205

wants to merge 25 commits into from

Conversation

hexyls
Copy link
Contributor

@hexyls hexyls commented Aug 13, 2021

closes #2044

@hexyls hexyls marked this pull request as draft August 13, 2021 07:17
@hexyls hexyls requested a review from pimato August 19, 2021 06:29
@hexyls hexyls marked this pull request as ready for review August 19, 2021 06:29
@hexyls
Copy link
Contributor Author

hexyls commented Aug 19, 2021

@pimato - we can just do an initial styling review for this one, then I can fix up any issues in prep for #1851 being merged

current version is missing: scalar market styling, any contract interactions

Copy link
Contributor

@pimato pimato left a comment

Choose a reason for hiding this comment

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

Currently it is possible to pick two markets and request liquidity rewards which we don´t want:

Bildschirmaufnahme.2021-08-19.um.15.18.54.mov

The user should only be able to pick one market.

@pimato
Copy link
Contributor

pimato commented Aug 19, 2021

In order to have not stretched components like this we need to give the text box a fixed height of 54px and align the text vertically centered.

currently:
Bildschirmfoto 2021-08-19 um 15 29 35

should:
Bildschirmfoto 2021-08-19 um 15 31 23

for mobile we can remove the height property as we don`t need to take care of equal heights anymore:
Bildschirmfoto 2021-08-19 um 15 38 17

@pimato
Copy link
Contributor

pimato commented Aug 19, 2021

Now that we have our clearly defined text styles, we should start using them:
https://github.com/protofire/omen-exchange/pull/2078/files

Copy link
Contributor

@Mi-Lan Mi-Lan left a comment

Choose a reason for hiding this comment

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

@hexyls Hey men! Requested some changes so we keep the codebase aligned with stuff from refactoring. Curios what you think!

Comment on lines 1 to 7
import React from 'react'

export const IconBack = () => (
<svg fill="none" height="12" viewBox="0 0 18 12" width="18" xmlns="http://www.w3.org/2000/svg">
<path d="M18 5H3.83L7.41 1.41L6 0L0 6L6 12L7.41 10.59L3.83 7H18V5Z" />
</svg>
)
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think its necessary to import another Icon here I used on my proposal details pr IconArrowBack with slight modification to support this color https://github.com/protofire/omen-exchange/pull/2208/files#

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Cheers dude, copied!

import { BigNumber } from 'ethers/utils'
import React, { useEffect, useState } from 'react'
import styled from 'styled-components'

Copy link
Contributor

Choose a reason for hiding this comment

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

Great that you created guild in the components folder I did the same thing on mine! Also In order to keep separation of concerns I think it might make sense to create guild folder inside pages folder and store all the logic there and separate it from view which will be stored in components? Curios what you and Kaden think about this and how we should go about it...You can also checkout maybe how I did it and if it makes sense or if we should do It differently.... @kadenzipfel @hexyls

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 really like this idea, made a proposed_rewards_page.tsx and a proposed_rewards_view.tsx, much better now

Comment on lines 49 to 53
const ProposalTitle = styled.div`
font-size: 22px;
font-weight: 500;
line-height: 26px;
color: ${props => props.theme.text3};
Copy link
Contributor

Choose a reason for hiding this comment

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

Also for all the text files we should be using new TYPE.something from theme/index.js file It is now on master with recent pr from francesco that we pushed...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done 🏄‍♂️ was cool putting TYPE into action, pretty powerful and easy to use

Copy link
Contributor

Choose a reason for hiding this comment

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

right! Its so dope and easy to copy from figma and not have to worry about text style

@hexyls hexyls marked this pull request as draft August 20, 2021 06:54
@Mi-Lan
Copy link
Contributor

Mi-Lan commented Aug 27, 2021

@hexyls Hey men I started working on this issue #2128 for and found that you have similar table like the one in proposal details view...This table...
Screenshot 2021-08-27 at 14 09 18
Maybe we can reuse it for your pr and my upcoming one...And adjust it a little? What do you think?
Only issue is that I made it responsive based on screen width..

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.

Create Liquidity Rewards Proposal - Design Specification
3 participants