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

OCG Sync Alpha #2113

Merged
merged 34 commits into from
Aug 1, 2022
Merged

OCG Sync Alpha #2113

merged 34 commits into from
Aug 1, 2022

Conversation

brightiron
Copy link
Contributor

Sync upstream changes from alpha branch back to ocg/proposals-dashboard.

appleseed-iii and others added 30 commits July 6, 2022 18:46
@appleseed-iii
Merge pull request #1964 from OlympusDAO/dsV3
ab536d6 
V3 Design System Updates
@brightiron
Merge branch 'develop' into alpha
eb26b54
@brightiron
updating alpha snapshots
5334367
@brightiron
Merge pull request #2048 from OlympusDAO/alpha-snapshots
3e69453 
updating alpha snapshots
@dependabot
build(deps-dev): bump @babel/plugin-proposal-private-methods (#2038)
079becd 
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>
@brightiron
updating v3 colors
a895506
@brightiron
zap input styling to align with other inputs
3236166
@dependabot
build(deps-dev): bump @babel/preset-react from 7.17.12 to 7.18.6 (#2052)
effb47d 
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>
@brightiron
updating component library
d2d434f
@brightiron
Merge branch 'alpha' into v3ReviewUpdates
6eb1e63
@dependabot
build(deps-dev): bump eslint-plugin-prettier from 4.0.0 to 4.2.1 (#2057)
24d03c7 
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>
@appleseed-iii @brightiron
remove apy copy & replace with annual rebases (#2054)
90b634b 
* 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>
@brightiron
Merge branch 'develop' into alpha
335370d
@dependabot
build(deps-dev): bump @babel/runtime from 7.18.3 to 7.18.6 (#2058)
4617224 
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>
@dependabot
build(deps-dev): bump @babel/plugin-transform-destructuring (#2043)
ee031bc 
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>
@dependabot
build(deps-dev): bump @babel/plugin-proposal-class-properties (#2037)
5500b47 
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>
@brightiron
Merge branch 'alpha' into v3ReviewUpdates
f9175fa
@brightiron
updating dark color palette. changing background and nav
7c27311
@brightiron
updating snapshots
e35f706
@brightiron
update snapshots
50ed2f7
@brightiron
add test back
310e02c
@brightiron
update test
1ccd37f
@dependabot
build(deps-dev): bump @babel/plugin-syntax-flow from 7.17.12 to 7.18.6 (
211f7b0 
#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>
@dependabot
build(deps-dev): bump @typescript-eslint/eslint-plugin (#2062)
c5eca21 
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>
@dependabot
build(deps-dev): bump @lingui/macro from 3.13.3 to 3.14.0 (#2044)
0fa9072 
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>
@dependabot @brightiron
build(deps): bump @mui/material from 5.8.3 to 5.8.7 (#2040)
b16839a 
* 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>
@dependabot
build(deps): bump wagmi from 0.5.6 to 0.5.9 (#2074)
331b83b 
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>
@dependabot
build(deps-dev): bump jest-puppeteer from 6.1.0 to 6.1.1 (#2072)
26fddca 
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>
@dependabot
build(deps-dev): bump @babel/plugin-proposal-private-property-in-obje…
8261bcf 
…ct (#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>
@dependabot
build(deps-dev): bump eslint from 8.18.0 to 8.19.0 (#2071)
f9ba848 
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>
@gitpod-io
Copy link

gitpod-io bot commented Jul 28, 2022

@github-actions
Copy link

Coverage report

St.❔
 Category Percentage Covered / Total
🟡 Statements 66.15% 3291/4975
🔴 Branches 53.3% 1519/2850
🟡 Functions 61.43% 750/1221
🟡 Lines 67.74% 3095/4569

Test suite run success

202 tests passing in 48 suites.

Report generated by 🧪jest coverage report action from a2eeafc

@appleseed-iii appleseed-iii merged commit b92d6b6 into ocg/proposals-dashboard Aug 1, 2022
@appleseed-iii appleseed-iii deleted the ocg/syncAlpha branch August 1, 2022 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@appleseed-iii appleseed-iii appleseed-iii approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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