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

Resolve dev main conflicts #227

Merged
merged 14 commits into from
Oct 16, 2024
Merged

Conversation

jeremy-babylonlabs
Copy link
Contributor

@jeremy-babylonlabs jeremy-babylonlabs commented Oct 15, 2024

resolve
#204

jeremy-babylonlabs and others added 13 commits October 4, 2024 10:36
* fix: improvement on using the correct height for unbonding model
---------

Co-authored-by: wjrjerome <[email protected]>
* fix: skip ordinals for cactus

---------

Co-authored-by: Filippos Malandrakis <[email protected]>
* fix: mempool endpoints errors should provide better UX

* fix: remove delegation from local storage only when error status is 404
* feat: refactor global params

* fix: version info data for loading state

* fix: small review issues

* fix: review issues
* feat: added new api hooks and global states

* fix: review issues

* fix: add new eslint rule for booleans

* fix: FAQ test

* fix: review feedback
* use correct height for unbonding model (#196)

* fix: improvement on using the correct height for unbonding model
---------

Co-authored-by: wjrjerome <[email protected]>

* fix format

---------

Co-authored-by: wjrjerome <[email protected]>
src/app/components/Points/StakerPoints.tsx Outdated Show resolved Hide resolved
@jeremy-babylonlabs jeremy-babylonlabs merged commit 756f128 into dev Oct 16, 2024
1 check passed
@jeremy-babylonlabs jeremy-babylonlabs deleted the resolve-dev-main-conflicts branch October 16, 2024 07:50
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.

4 participants