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

Governance #2217

Draft
wants to merge 152 commits into
base: develop
Choose a base branch
from
Draft

Governance #2217

wants to merge 152 commits into from

Conversation

appleseed-iii
Copy link
Contributor

@appleseed-iii appleseed-iii commented Aug 30, 2022 •
edited
Loading

0xLienid and others added 30 commits June 30, 2022 14:57
@0xLienid
Add useProposals and useProposal hooks with mock data
2500da1
@0xLienid
Documentation for useProposals and useProposal
d34d77e
@0xLienid
Update component-library for governance components
28d2fb8
@0xLienid
Add proposals dashboard, frame of filter modal
ef8b84f
@appleseed-iii
Merge branch 'develop' into governance
dc09ba0
@appleseed-iii
Merge branch 'governance' into ocg/proposals-dashboard
e651e05
@appleseed-iii
remove childPaperBackground compile issue
84d9bef
@appleseed-iii
mocked up modal
cedb8b6
@appleseed-iii
wip - filtration work in progress
faffeab
@0xLienid
Set up proposal page routing and frame proposal page component
c73c539
@0xLienid
Modified alignment
5ee1368
@0xLienid
Styling and tab functionality
bba87d3
@0xLienid
Placeholder end date countdown
f78a350
@0xLienid
Switch from x to left chevron for back button
acd9b6f
@0xLienid
Adding content for votes section
46c9a11
@0xLienid
Start create proposal form
f9f9faf
@0xLienid
Clean up create proposals page code
6800e64
@0xLienid
Add continue button
9ce3226
@0xLienid
Clean up proposals page implementation
f18dab4
@appleseed-iii
Merge pull request #2083 from OlympusDAO/ocg/proposals-page
fea6ae1 
Proposals Page and Create Proposal
@0xLienid
Mock proposal states
de64850
@0xLienid
Update snapshots, unsure why Give was failing
7ad6c9c
@appleseed-iii
Merge pull request #2087 from OlympusDAO/ocg/proposal-state
5be5f83 
Mock proposal states
@appleseed-iii
proposals state
244044c
@appleseed-iii
Merge branch 'ocg/proposals-dashboard' of github-appleseed:OlympusDAO…
c957dd0 
…/olympus-frontend into ocg/proposals-dashboard
@brightiron
add contract abis
c2e55fe
@brightiron
add contract addresses
325ddcd
@brightiron
query hooks
9c84cc6
@brightiron
annotations. add query hooks for contracts
416f90c
@brightiron @appleseed-iii @dependabot
OCG Sync Alpha (#2113)
b92d6b6 
* updating alpha snapshots

* build(deps-dev): bump @babel/plugin-proposal-private-methods (#2038)

Bumps [@babel/plugin-proposal-private-methods](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-private-methods) from 7.17.12 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-plugin-proposal-private-methods)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-private-methods"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* updating v3 colors

* zap input styling to align with other inputs

* build(deps-dev): bump @babel/preset-react from 7.17.12 to 7.18.6 (#2052)

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.17.12 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-preset-react)

---
updated-dependencies:
- dependency-name: "@babel/preset-react"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* updating component library

* build(deps-dev): bump eslint-plugin-prettier from 4.0.0 to 4.2.1 (#2057)

Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 4.0.0 to 4.2.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](prettier/eslint-plugin-prettier@v4.0.0...v4.2.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* remove apy copy & replace with annual rebases (#2054)

* remove apy copy & replace with annual rebases

* update next rebase amount to your next rebase

* adjusting tooltip APY reference

Co-authored-by: brightiron <brightiron@protonmail.com>

* build(deps-dev): bump @babel/runtime from 7.18.3 to 7.18.6 (#2058)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.18.3 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump @babel/plugin-transform-destructuring (#2043)

Bumps [@babel/plugin-transform-destructuring](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-destructuring) from 7.18.0 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-plugin-transform-destructuring)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-destructuring"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump @babel/plugin-proposal-class-properties (#2037)

Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-class-properties) from 7.17.12 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-plugin-proposal-class-properties)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-class-properties"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* updating dark color palette. changing background and nav

* updating snapshots

* update snapshots

* add test back

* update test

* build(deps-dev): bump @babel/plugin-syntax-flow from 7.17.12 to 7.18.6 (#2063)

Bumps [@babel/plugin-syntax-flow](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-syntax-flow) from 7.17.12 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-plugin-syntax-flow)

---
updated-dependencies:
- dependency-name: "@babel/plugin-syntax-flow"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump @typescript-eslint/eslint-plugin (#2062)

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.30.0 to 5.30.6.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.30.6/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump @lingui/macro from 3.13.3 to 3.14.0 (#2044)

Bumps [@lingui/macro](https://github.com/lingui/js-lingui) from 3.13.3 to 3.14.0.
- [Release notes](https://github.com/lingui/js-lingui/releases)
- [Changelog](https://github.com/lingui/js-lingui/blob/main/CHANGELOG.md)
- [Commits](lingui/js-lingui@v3.13.3...v3.14.0)

---
updated-dependencies:
- dependency-name: "@lingui/macro"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump @mui/material from 5.8.3 to 5.8.7 (#2040)

* build(deps): bump @mui/material from 5.8.3 to 5.8.7

Bumps [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) from 5.8.3 to 5.8.7.
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v5.8.7/packages/mui-material)

---
updated-dependencies:
- dependency-name: "@mui/material"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* update snapshots

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: brightiron <brightiron@protonmail.com>

* build(deps): bump wagmi from 0.5.6 to 0.5.9 (#2074)

Bumps [wagmi](https://github.com/tmm/wagmi) from 0.5.6 to 0.5.9.
- [Release notes](https://github.com/tmm/wagmi/releases)
- [Commits](https://github.com/tmm/wagmi/compare/wagmi@0.5.6...wagmi@0.5.9)

---
updated-dependencies:
- dependency-name: wagmi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump jest-puppeteer from 6.1.0 to 6.1.1 (#2072)

Bumps [jest-puppeteer](https://github.com/smooth-code/jest-puppeteer) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/smooth-code/jest-puppeteer/releases)
- [Changelog](https://github.com/smooth-code/jest-puppeteer/blob/master/CHANGELOG.md)
- [Commits](argos-ci/jest-puppeteer@v6.1.0...v6.1.1)

---
updated-dependencies:
- dependency-name: jest-puppeteer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump @babel/plugin-proposal-private-property-in-object (#2075)

Bumps [@babel/plugin-proposal-private-property-in-object](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-private-property-in-object) from 7.17.12 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-plugin-proposal-private-property-in-object)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-private-property-in-object"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump eslint from 8.18.0 to 8.19.0 (#2071)

Bumps [eslint](https://github.com/eslint/eslint) from 8.18.0 to 8.19.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.18.0...v8.19.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update snapshot

Co-authored-by: appleseed-iii <80423742+appleseed-iii@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
appleseed-iii and others added 30 commits December 7, 2022 13:41
@appleseed-iii
Merge pull request #2455 from OlympusDAO/governanceInvalidateQueries
0d661ec 
invalidate queries after vOHM wrap/unwrap
@appleseed-iii
Merge pull request #2456 from OlympusDAO/voteButtons
a317074 
toggle vote button color based on vote state
@brightiron
Merge branch 'develop' into governance
5b3b29e
@appleseed-iii
Merge branch 'develop' into governance
fa101ea
@appleseed-iii
fix snapshots
42f4f21
@appleseed-iii
Merge branch 'develop' into governance
c353b49
@brightiron
Merge branch 'develop' into governance
a38ecc3
@brightiron
update seconds on page refresh. fix page title
f0e0f9b
@brightiron
pending state. on success redirect to main governance page. refresh s…
5140da6 
…ubmittedevents query
@appleseed-iii
fix tests
fec51b6
@appleseed-iii
Merge branch 'governance' of github-appleseed:OlympusDAO/olympus-fron…
dc148dc 
…tend into governance
@appleseed-iii
Merge pull request #2543 from OlympusDAO/governanceFixes
c09d93c 
Gov Improvements
@appleseed-iii
Merge branch 'develop' into governance
7ab9f80
@appleseed-iii
update governance addresses
9d0c760
@appleseed-iii
fix collateral balance requirements for creating a proposal
be2fe5c
@appleseed-iii
change voting tabulation back to gOHM
8f7111c
@appleseed-iii
update ipfs gateway to w3s.link
4b0bbd2
@appleseed-iii
invalidate queries after voting & activation
f6c88d1
@appleseed-iii
minor tweaks
1931cdb
@appleseed-iii
cleanup proposal state
d66948a
@appleseed-iii
show voting power & history
df23bab
@appleseed-iii
fix fontsize on markdown preview
8041d76
@appleseed-iii
move cast vote, restyle discussion
ed5f89a
@appleseed-iii
fix buttons & mutation states
e786d4d
@appleseed-iii
reorg voting power per figma
f5b821e
@appleseed-iii
update proposal states, voting power & vote status
067df5a
@appleseed-iii
fix cast vote hero
88a6b1a
@appleseed-iii
reorg proposals dashobard rows
4a0106a
@appleseed-iii
Merge branch 'develop' into governance
ced89ae
@appleseed-iii
md pkg upgrades
950415a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@appleseed-iii @0xLienid @brightiron