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

fix: Merkl tag on farms #11103

Merged
merged 12 commits into from
Jan 3, 2025
Merged

fix: Merkl tag on farms #11103

merged 12 commits into from
Jan 3, 2025

Conversation

memoyil
Copy link
Collaborator

@memoyil memoyil commented Dec 31, 2024


PR-Codex overview

This PR primarily focuses on enhancing the Merkl integration by updating components, adjusting filtering logic, and modifying the data structure in the merklPools configuration. It also introduces a new MerklTag component to the UI.

Detailed summary

  • Updated MerklSection to include poolAddress and chainId.
  • Added a check for lmPool against zeroAddress in useLmPoolLiquidity.
  • Changed token filtering from name to symbol in various places.
  • Modified merklPools JSON configuration to include new pools and chain IDs.
  • Introduced MerklTag in PoolV2Page for better UI representation.
  • Enhanced the logic in useMerkl for fetching and filtering Merkl data.

✨ Ask PR-Codex anything about this PR by commenting with /codex {your question}

Copy link

vercel bot commented Dec 31, 2024

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

Name Status Preview Comments Updated (UTC)
web ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 2, 2025 0:56am
7 Skipped Deployments
Name Status Preview Comments Updated (UTC)
aptos-web ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2025 0:56am
blog ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2025 0:56am
bridge ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2025 0:56am
games ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2025 0:56am
gamification ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2025 0:56am
uikit ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2025 0:56am
ton ⬜️ Skipped (Inspect) Jan 2, 2025 0:56am

Copy link

changeset-bot bot commented Dec 31, 2024

⚠️ No Changeset found

Latest commit: f3c9645

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@memoyil memoyil marked this pull request as draft December 31, 2024 08:57
@vercel vercel bot temporarily deployed to Preview – ton December 31, 2024 09:02 Inactive
@pull-request-size pull-request-size bot added size/L and removed size/M labels Dec 31, 2024
@vercel vercel bot temporarily deployed to Preview – ton December 31, 2024 09:03 Inactive
@vercel vercel bot temporarily deployed to Preview – ton December 31, 2024 09:06 Inactive
@vercel vercel bot temporarily deployed to Preview – ton December 31, 2024 09:13 Inactive
@memoyil memoyil marked this pull request as ready for review December 31, 2024 09:14
return hasLiveDistribution
})
const hasLive = pools
.filter((pool) => isAddressEqual(pool.identifier, poolAddress))
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

adds filter to check only for the given pool

const unclaimed = BigInt(amount || 0) - BigInt(claimed || 0)
return unclaimed > 0
})
const rewardAddresses = pools
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it is used for to show rewards for the given pool only

@@ -35,9 +35,15 @@ const fetchAllMerklConfig = async (): Promise<any[]> => {

const parseMerklConfig = (merklConfigResponse: any[]): MerklConfigPool[] => {
return merklConfigResponse
.sort((a, b) => {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

to avoid updates without any changes

@Chef-Yogi
Copy link
Contributor

Hi @memoyil, Sir, could you take a look at the conflict and rebase it? thanks🙏

@memoyil memoyil force-pushed the feature/fix_merkl_tag_on_farms branch from c08daee to 4db068a Compare January 2, 2025 07:49
@vercel vercel bot temporarily deployed to Preview – ton January 2, 2025 07:49 Inactive
@memoyil
Copy link
Collaborator Author

memoyil commented Jan 2, 2025

Hi @memoyil, Sir, could you take a look at the conflict and rebase it? thanks🙏

Done 👍

@memoyil memoyil marked this pull request as draft January 2, 2025 07:59
@memoyil memoyil marked this pull request as ready for review January 2, 2025 07:59
@Chef-Yogi Chef-Yogi merged commit 2f0b8b5 into develop Jan 3, 2025
21 checks passed
@Chef-Yogi Chef-Yogi deleted the feature/fix_merkl_tag_on_farms branch January 3, 2025 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants