Skip to content

backmerge 09-06-26#436

Merged
technophile-04 merged 7 commits into
mainfrom
backmerge-09-06-26
Jun 18, 2026
Merged

backmerge 09-06-26#436
technophile-04 merged 7 commits into
mainfrom
backmerge-09-06-26

Conversation

@technophile-04

Copy link
Copy Markdown
Collaborator

carletex and others added 3 commits June 9, 2026 19:57
Co-authored-by: Rinat <rinat@hey.com>
# Conflicts:
#	templates/base/packages/nextjs/components/Header.tsx.template.mjs
#	templates/base/packages/nextjs/package.json
#	yarn.lock
@technophile-04 technophile-04 requested a review from rin-st June 9, 2026 13:13
@rin-st

rin-st commented Jun 9, 2026

Copy link
Copy Markdown
Member

(Scaffold-UI, not create-eth issue)

I mentioned in the one of the meetups that new scaffold-ui versions should be major but my bad, I forgot to say it here scaffold-eth#1282 (comment) and didn't add changeset myself :(.

Problem: Since we have in create-eth@2.0.18

    "@scaffold-ui/components": "^0.1.10",
    "@scaffold-ui/debug-contracts": "^0.1.9",
    "@scaffold-ui/hooks": "^0.1.8",

which is used currently in SRE challenges, when creating challenge instance scaffold-ui compnents now takes the last versions with square corners, but all other things are rounded. (debug tabs buttons takes global rounded so it will be fixed later)

Screenshot 2026-06-09 at 19 15 47

Not very critical, nothing breaks but ui looks inconsistent

Is it possible to:

    "@scaffold-ui/components": "^0.1.10",
    "@scaffold-ui/debug-contracts": "^0.1.9",
    "@scaffold-ui/hooks": "^0.1.8",

won't break?

and again change versions in se-2 and in this backmerge


Another options:

1 Remove from npmPreapprovedPackages in se-2 and here and make [2] within a week (npmMinimalAgeGate: 7d):

  • "@scaffold-ui/components"
  • "@scaffold-ui/debug-contracts"
  • merge all the hh v3 PRs, all except zk is approved
  • change all the sre challenges custom components to be square borders
  • return scaffold-ui packages to npmPreapprovedPackages

We'll need to do it anyway but it will take at least 1-2 days

@rin-st

rin-st commented Jun 10, 2026

Copy link
Copy Markdown
Member

(Scaffold-UI, not create-eth issue)

Since this is fixed for now, Lgtm! Thanks!

rin-st
rin-st previously approved these changes Jun 10, 2026
@rin-st rin-st dismissed their stale review June 12, 2026 14:29

Don't merge this for now, please, I may need small frontend changes for hh v3 challenges PRs. I'll resolve it in the next days

@technophile-04

Copy link
Copy Markdown
Collaborator Author

Don't merge this for now, please, I may need small frontend changes for hh v3 challenges PRs. I'll resolve it in the next days

Sure! Feel free to push the backmerge changes 🙌

@rin-st

rin-st commented Jun 16, 2026

Copy link
Copy Markdown
Member

Pushed last changes, reapproving. No additional changes needed. Abis formatting just fixes warnings, nothing critical, so no need to merge it before scaffold-ui updates

@technophile-04 technophile-04 merged commit 0d8a569 into main Jun 18, 2026
7 checks passed
@technophile-04 technophile-04 deleted the backmerge-09-06-26 branch June 18, 2026 07:30
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.

3 participants