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

Add dark theme to web3 modal #316

Merged
merged 18 commits into from
Sep 28, 2024

Conversation

amochuko
Copy link
Contributor

@amochuko amochuko commented Aug 27, 2024

Related GitHub Issue

closes ##310

Screenshots (if appropriate):

Before code change:

Screenshot 2024-08-27 at 09 39 14

After code change:

Screenshot 2024-08-27 at 12 16 41

How Has This Change Been Tested?

  • All status checks pass (build, lint, e2e, test)
  • Works on Sepolia preview deployment
  • Works on Mainnet preview deployment

Are Any Admin Tasks Required?

  • No admin tasks

Sorry, something went wrong.

@amochuko amochuko requested a review from a team as a code owner August 27, 2024 08:42
Copy link

vercel bot commented Aug 27, 2024

@amochuko is attempting to deploy a commit to the Nation3 DAO Team on Vercel.

A member of the Team first needs to authorize it.

Copy link

vercel bot commented Aug 27, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
citizen-app-mainnet ✅ Ready (Inspect) Visit Preview Sep 28, 2024 2:47pm
citizen-app-sepolia ✅ Ready (Inspect) Visit Preview Sep 28, 2024 2:47pm

ui/components/Layout.tsx Outdated Show resolved Hide resolved
ui/components/Layout.tsx Outdated Show resolved Hide resolved

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
accept suggestion to remove vertical spacing (not available in light theme)

Co-authored-by: Aahna Ashina <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Accept suggestion to remove border from ul tag when wallet is connected

Co-authored-by: Aahna Ashina <[email protected]>
ui/yarn.lock Outdated Show resolved Hide resolved
Copy link
Member

@aahna-ashina aahna-ashina left a comment

Choose a reason for hiding this comment

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

Merge conflicts in yarn.lock.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Co-authored-by: Aahna Ashina <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Co-authored-by: Aahna Ashina <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Co-authored-by: Aahna Ashina <[email protected]>
…dd-dark-theme-to-modal to resolve yarn.lock conflicts
Copy link
Contributor Author

@amochuko amochuko left a comment

Choose a reason for hiding this comment

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

Kindly review the yarn.lock conflict resolve

…into add-dark-theme-to-modal to resolve yarn.lock conflicts"

This reverts commit a8f3d3f, reversing
changes made to edadb3b.
dependabot bot and others added 4 commits September 2, 2024 17:56

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) and [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest). These dependencies needed to be updated together.

Updates `jest` from 28.1.3 to 29.7.0
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.7.0/packages/jest)

Updates `@types/jest` from 28.1.8 to 29.5.12
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/jest"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…i/multi-7c1d38dd65

chore(deps): bump jest and @types/jest in /ui

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Bumps [next](https://github.com/vercel/next.js) from 14.2.7 to 14.2.13.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](vercel/next.js@v14.2.7...v14.2.13)

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

Signed-off-by: dependabot[bot] <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…i/next-14.2.13

chore(deps): bump next from 14.2.7 to 14.2.13 in /ui
@aahna-ashina
Copy link
Member

aahna-ashina commented Sep 21, 2024

Kindly review the yarn.lock conflict resolve

@amochuko Your branch still has merge conflicts from what I can see.

ui/package.json Show resolved Hide resolved
aahna-ashina
aahna-ashina previously approved these changes Sep 28, 2024
@amochuko amochuko dismissed aahna-ashina’s stale review September 28, 2024 14:51

The merge-base changed after approval.

@aahna-ashina aahna-ashina merged commit 79757ff into nation3:main Sep 28, 2024
6 checks passed
@amochuko amochuko deleted the add-dark-theme-to-modal branch September 28, 2024 18:09
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.

None yet

2 participants