Skip to content

chore(sync): back-merge main v1.1.0 release commit into develop#163

Merged
jeziellopes merged 3 commits intodevelopfrom
chore/sync-main-to-develop
Apr 10, 2026
Merged

chore(sync): back-merge main v1.1.0 release commit into develop#163
jeziellopes merged 3 commits intodevelopfrom
chore/sync-main-to-develop

Conversation

@jeziellopes
Copy link
Copy Markdown
Owner

Summary

Semantic-release pushed chore(release): 1.1.0 directly to main after the v1.1.0 stable promotion. That commit updates CHANGELOG.md and package.json but is never automatically reflected in develop, causing conflicts on the next develop → main PR.

This back-merge resolves those conflicts so PR #162 can proceed cleanly.

Conflict resolution

  • CHANGELOG.md — kept develop's version (all next.x pre-release history); semantic-release will regenerate the full file for v1.2.0
  • package.json — kept develop's version (1.1.0-next.26); semantic-release will set 1.2.0 when it runs on main

Follow-up

A post-release automation job is being added to release.yml in a companion PR so this situation never recurs.

jeziellopes and others added 3 commits April 3, 2026 23:03
chore(release): promote develop to main for v1.1.0
# [1.1.0](v1.0.0...v1.1.0) (2026-04-04)

### Bug Fixes

* **chart:** canvas-based oklch→sRGB conversion for lightweight-charts ([918c044](918c044))
* **chart:** fitContent on first non-zero resize for correct initial zoom ([f81484e](f81484e)), closes [#79](#79)
* **chart:** handle possibly undefined candle interval fallback ([19c36ac](19c36ac))
* **chart:** wick colors, grid alpha, interval prop + expanded mock data (closes [#71](#71), closes [#72](#72), closes [#73](#73)) ([bb55c11](bb55c11))
* **ci:** remove invalid biome --check flag from code-quality workflow ([5755ea4](5755ea4))
* **data-panel:** align tab header spacing with panel chrome ([07a3620](07a3620))
* **design-system:** correct Flowa theme — forest primary, full 3-colour palette, DS page visibility ([243737c](243737c)), closes [#12](#12) [#25352D](https://github.com/jeziellopes/flow/issues/25352D) [#c2e189](https://github.com/jeziellopes/flow/issues/c2e189) [#9354BB](https://github.com/jeziellopes/flow/issues/9354BB)
* **design-system:** differentiate --secondary vs --accent across all themes ([616c8e8](616c8e8)), closes [#51](#51) [#51](#51) [#52](#52)
* **design-system:** enforce cursor-pointer on all interactive UI primitives (closes [#80](#80)) ([ea35eea](ea35eea))
* **design-system:** fix light mode surface depth and Order Entry container ([5bbffaf](5bbffaf))
* **design-system:** fix segment control visibility with bg-background inactive state ([591af06](591af06)), closes [#60](#60)
* **design-system:** use primitives as source of truth in /design-system ([d55a886](d55a886))
* **grid:** cap rowHeight at 8px on large/4K viewports ([328c61f](328c61f))
* **grid:** lower rowHeight floor to 8px and scale h values to fill 60-row viewport ([7e9cfb8](7e9cfb8)), closes [#92](#92)
* **header:** merge useRouterState import and fix quote style for Biome ([d4779ac](d4779ac))
* **layout:** swap order-entry and portfolio panel positions ([6a81be8](6a81be8)), closes [#9](#9)
* **order-book:** exactOptionalPropertyTypes compat for tickDirection prop ([663202c](663202c))
* **order-entry:** align Limit/Market button height with Buy/Sell ([f4dcaa4](f4dcaa4))
* **order-entry:** fix button spacing and corner radius inside segment tracks ([7597b2f](7597b2f))
* **order-entry:** fix flat inactive segment buttons with segment intent ([295f68a](295f68a))
* **order-form:** 2-layer justify layout + underline tabs (closes [#67](#67), closes [#68](#68)) ([8e9e68c](8e9e68c))
* **perf:** remove unused MOCK_CANDLE_* imports from trading layout ([2d126d8](2d126d8))
* **store:** individual selectors to prevent infinite re-render loop ([4785d4c](4785d4c))
* **tabs:** adjust header variant height and border style ([d533833](d533833))
* **tabs:** header variant enforces 36px height with centered text ([04391c4](04391c4))
* **tabs:** pin header variant line-height to 16px via leading-4 ([bf726f5](bf726f5))
* **test:** replace undefined mockState with MOCK_ORDER_BOOK_STATE in order-book tests ([66315d4](66315d4))
* **theme:** fix invalid CSS in --t-accent-fg and add Logo tests ([b2332e5](b2332e5))
* **trading-grid:** correct xxl column proportions to match Binance layout ([4f61660](4f61660))
* **trading-grid:** fix biome import order and formatting in layout files ([87b11a4](87b11a4))
* **trading-grid:** order spans full chart height; DataPanel header matches panel chrome ([01876b7](01876b7))
* **trading-layout:** chart|book|order column order + lazy layout persistence ([701e8c4](701e8c4))
* **ui:** remove render-time ref mutation in TabList, fix lint ([321283e](321283e))

### Features

* **design-system:** add Colour Roles and Containers sections to /design-system ([709f4c5](709f4c5))
* **design-system:** add on-trading-bid/ask tokens and adopt on-* in button variants ([8744041](8744041))
* **design-system:** close [@theme](https://github.com/theme) gaps and standardise token usage ([b2b0bd0](b2b0bd0)), closes [#13](#13)
* **design-system:** differentiate corpo-ice secondary from primary hue ([a12a6b6](a12a6b6)), closes [#52](#52) [#52](#52)
* **design-system:** introduce on-* colour roles and container tokens ([#57](#57)) ([97e1239](97e1239))
* **grid:** increase row granularity to 30 units and fix CHROME_HEIGHT ([3d42877](3d42877)), closes [#92](#92) [#93](#93) [#92](#92) [#93](#93)
* **header:** route-aware header — logo-only + TickerHeader on symbol route ([c2638e3](c2638e3)), closes [#84](#84)
* **order-entry:** extract Tab primitive, wire into OrderForm ([ea245dd](ea245dd))
* **order-entry:** tab-based Limit/Market form switcher ([bd23610](bd23610)), closes [#60](#60)
* **ticker-header:** embed SymbolSelector in place of plain symbol text (closes [#70](#70)) ([8dcb925](8dcb925))
* **trading-grid:** merge bots + trades into DataPanel with tabs (closes [#76](#76)) ([8f97d78](8f97d78))
* **trading-grid:** xl breakpoint (≥1440px) layout preset ([#65](#65)) ([aba4077](aba4077))
* **trading-grid:** xxl preset + Binance-style layout + side-by-side bots/trades ([e0088c6](e0088c6))
* **ui:** add Logo component and integrate into header ([65e81d1](65e81d1))
* **ui:** add Select, Label, Textarea primitives; wire Button/Input in bot forms ([d53c7be](d53c7be))

### Performance Improvements

* **bundle:** lazy-load recharts and react-grid-layout ([9d845ba](9d845ba)), closes [#20](#20)

Signed-off-by: semantic-release-bot <semantic-release-bot@martynus.net>
Semantic-release auto-committed chore(release): 1.1.0 directly to main
with CHANGELOG.md and package.json updates. Merging main back into develop
to unblock the develop → main promotion PR (#162).

Resolution:
- CHANGELOG.md: keep develop (all next.x history); semantic-release will
  regenerate the full file for v1.2.0
- package.json: keep develop version 1.1.0-next.26 for the same reason

Signed-off-by: Jeziel Lopes <jeziellopes@gmail.com>
@jeziellopes jeziellopes added the chore Build, CI, dependencies, tooling label Apr 10, 2026
@vercel
Copy link
Copy Markdown

vercel bot commented Apr 10, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
flow Ready Ready Preview, Comment Apr 10, 2026 7:40pm

@jeziellopes jeziellopes merged commit d8033dd into develop Apr 10, 2026
4 checks passed
@jeziellopes jeziellopes deleted the chore/sync-main-to-develop branch April 10, 2026 20:21
@jeziellopes
Copy link
Copy Markdown
Owner Author

🎉 This PR is included in version 1.2.0-next.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chore Build, CI, dependencies, tooling released on @develop

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants