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

Jump to bottom

Merge ethstaker features (excluding content) #529

Merged
merged 93 commits into from
Jul 14, 2022
Merged

Merge ethstaker features (excluding content) #529

merged 93 commits into from
Jul 14, 2022

Conversation

yuetloo
Copy link
Collaborator

@yuetloo yuetloo commented Jul 7, 2022 •
edited
Loading

Create this as new PR to replace PR#490 to avoid updating https://qf.ethstaker.cc/#/

samajammin and others added 30 commits December 14, 2021 11:02
@samajammin
Add KYC explanations
d3a863f
@samajammin
Update ProjectAdded copy
4f64355
@samajammin
Update Twitter account for info
4d345a2
@samajammin
Update recipient guide copy
eb84090
@daodesigner
Merge pull request #415 from ethereum/develop
6b99c62 
PR changes upstream
@samajammin
Add netlify config
42c2a73
@samajammin
Add null checks on registryInfo
7911074
@samajammin
Add required documents
3ef7fbe
@samajammin
Add specification of address within last 3 months
b56ff09
@samajammin
Add staking-specific copy
a98c1d3
@samajammin
Add more staking mentions
151b78f
@samajammin
Add "Ethereum" copy
bc96411
@samajammin
Add changes from Danny's feedback
7b200ec
@samajammin
Merge pull request #490 from ethereum/staking-copy
ff5fdbd 
Add staking-specific copy
@samajammin
Merge pull request #480 from ethereum/kyc-info
294769e 
Add KYC info
@daodesigner
Merge pull request #425 from clrfund/develop
43cda19 
Sync with dev branch
@daodesigner
Merge pull request #426 from ethereum/staking-round
1c40a47 
Staking round
@samajammin
Merge branch 'develop' into staking-round
2c966b8
@samajammin
Update L2 ETH references
f2d3c59
@samajammin
Add notifications of recipient cap
3b9d247
@samajammin
Merge pull request #500 from ethereum/recipient-cap
9ca031a 
Add notifications of recipient cap
@samajammin
Clean up how it works copy
60011a5
@samajammin
Merge pull request #498 from ethereum/l2-eth
ffa25d9 
Update L2 ETH references
@samajammin
Simplify round criteria
26bd028
@samajammin
Merge pull request #501 from ethereum/staking-criteria-updates
d014aa0 
Simplify round criteria
@corwintines
remove breadcrumbs from join form
9614af6
@samajammin
Merge pull request #502 from ethereum/hide-breadcrumbs
a4a230d 
Hide breadcrumbs in join form
@samajammin
Re-sort criteria
25e96cd
@pettinarip
make executeRequest only owner (#503)
6e45ee3
@pettinarip @samajammin
Refactor: maxRecipients getter (#505)
d0cb664 
* fetch maci factory data and save it in the store

* Refactor last maxRecipients getter

Co-authored-by: Sam Richards <[email protected]>
pettinarip and others added 21 commits May 14, 2022 10:21
@pettinarip
check existing balance before formatting it
b68e9e9
@daodesigner
Merge pull request #494 from ethereum/fix-bignumber-format
f4ab844
@pettinarip
change max cart size to 8
e9d990a
@auryn-macmillan
Merge pull request #495 from ethereum/max-cart-size
7c498b2 
Change max cart size to 8
@yuetloo
only render brightid link if available
c31778c
@daodesigner
Merge pull request #496 from clrfund/fix/brightid-link-not-found
cd3c2d2
@pettinarip
fetch round contributions balance from the contract
6431bb8
@auryn-macmillan
Merge pull request #497 from ethereum/fix-contributions-balances
d44ba36 
Fetch round contributions balance from the contract
@pettinarip
refactor and fix race conditions while loading round & user data
349b3b0
@auryn-macmillan
Merge pull request #499 from ethereum/refactor-loading-data
0915a92 
Refactor on data loading
@yuetloo
detect invalid date when challenge period is too large
60e61cb
@auryn-macmillan
Merge pull request #505 from clrfund/fix/join-deadline
c981515 
Hide the add project callout on landing page if passed deadline
@yuetloo
merged with the develop branch
371a264
@yuetloo
remove obsolete code
482cb07
@yuetloo
fix test failure by reverting ethStaker changes
63c72a9
@yuetloo
remove ethStaker content
e10b68f
@yuetloo
remove unused file
50bbfaa
@yuetloo
removed ethStaker specific deploymnet script
e81f81f
@yuetloo
revert changes to remove round list
96da1a3
@yuetloo
add PermissionedRecipientRegistry
7970a7c
@yuetloo
fix error from empty round address if round is loaded from VUE_APP_EX…
a2b1f3f 
…TRA_ROUND
@yuetloo yuetloo requested a review from auryn-macmillan July 7, 2022 20:13
@auryn-macmillan
Copy link
Member

@yuetloo, there are a handful of places in the app where clr.fund is mentioned in the copy. In most cases, where it is talking about the operator or title of the round, rather than the application itself, I think we should probably change the copy to be variables that are settable in the .env file, perhaps they default to clr.fund if not set.

Thoughts?

@yuetloo
Copy link
Collaborator Author

yuetloo commented Jul 8, 2022

@yuetloo, there are a handful of places in the app where clr.fund is mentioned in the copy. In most cases, where it is talking about the operator or title of the round, rather than the application itself, I think we should probably change the copy to be variables that are settable in the .env file, perhaps they default to clr.fund if not set.

Thoughts?

Make sense, I'll update it

@yuetloo yuetloo self-assigned this Jul 8, 2022
auryn-macmillan
auryn-macmillan approved these changes Jul 11, 2022
View reviewed changes
Copy link
Member

@auryn-macmillan auryn-macmillan left a comment

Choose a reason for hiding this comment

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

lgtm

@auryn-macmillan auryn-macmillan merged commit 7eef2fb into develop Jul 14, 2022
@yuetloo yuetloo deleted the feat/merge-cohort-ethstaker branch July 14, 2022 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@auryn-macmillan auryn-macmillan auryn-macmillan approved these changes

Assignees

@yuetloo yuetloo

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@yuetloo @auryn-macmillan @samajammin @daodesigner @corwintines @pettinarip