feat: support isolation mode tag#5600
Draft
cuzz-venus wants to merge 7 commits into
Draft
Conversation
🦋 Changeset detectedLatest commit: bb8f6a2 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Greptile SummaryThis PR adds an "Isolated" badge to assets in isolation-mode groups within the market table and refactors the
Confidence Score: 4/5Safe to merge after fixing the hardcoded pool name in the supply description. The supplyDescription translation now hardcodes Core Pool and SupplyNotification no longer passes pool.name, but AssetWarning is rendered on every market page. Any borrowable or non-zero-collateral-factor asset in a non-Core pool will display the wrong pool name. SupplyNotification/index.tsx and en.json (plus all other locale files) need the poolName interpolation restored. Important Files Changed
Reviews (2): Last reviewed commit: "feat: support transalation" | Re-trigger Greptile |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Comment on lines
+58
to
+67
| if (isAvailableInEMode && isAvailableInIsolation) { | ||
| // t('assetWarning.modeOnly.eModeAndIsolation') | ||
| i18nKey = 'assetWarning.modeOnly.eModeAndIsolation'; | ||
| } else if (isAvailableInEMode) { | ||
| // t('assetWarning.modeOnly.eMode') | ||
| i18nKey = 'assetWarning.modeOnly.eMode'; | ||
| } else { | ||
| // t('assetWarning.modeOnly.isolation') | ||
| i18nKey = 'assetWarning.modeOnly.isolation'; | ||
| } |
There was a problem hiding this comment.
else branch fires even when both isAvailableInEMode and isAvailableInIsolation are false, so an asset with collateralFactor === 0 that is not in any mode group will incorrectly display the isolation-mode-only message. Adding an explicit isAvailableInIsolation guard prevents this.
Suggested change
| if (isAvailableInEMode && isAvailableInIsolation) { | |
| // t('assetWarning.modeOnly.eModeAndIsolation') | |
| i18nKey = 'assetWarning.modeOnly.eModeAndIsolation'; | |
| } else if (isAvailableInEMode) { | |
| // t('assetWarning.modeOnly.eMode') | |
| i18nKey = 'assetWarning.modeOnly.eMode'; | |
| } else { | |
| // t('assetWarning.modeOnly.isolation') | |
| i18nKey = 'assetWarning.modeOnly.isolation'; | |
| } | |
| if (isAvailableInEMode && isAvailableInIsolation) { | |
| // t('assetWarning.modeOnly.eModeAndIsolation') | |
| i18nKey = 'assetWarning.modeOnly.eModeAndIsolation'; | |
| } else if (isAvailableInEMode) { | |
| // t('assetWarning.modeOnly.eMode') | |
| i18nKey = 'assetWarning.modeOnly.eMode'; | |
| } else if (isAvailableInIsolation) { | |
| // t('assetWarning.modeOnly.isolation') | |
| i18nKey = 'assetWarning.modeOnly.isolation'; | |
| } else { | |
| // Asset is not in core and not in any mode group — fall back to standard supply description | |
| return ( | |
| <Trans | |
| i18nKey="assetWarning.supplyDescription" | |
| values={{ tokenSymbol }} | |
| components={{ Button: showAllMarketsButton }} | |
| /> | |
| ); | |
| } |
Comment on lines
+40
to
+57
| const description = | ||
| type === 'supply' && asset ? ( | ||
| <SupplyNotification asset={asset} pool={pool} onShowAllMarkets={handleShowAssets} /> | ||
| ) : ( | ||
| <Trans | ||
| // t('assetWarning.borrowDescription') | ||
| i18nKey="assetWarning.borrowDescription" | ||
| values={{ poolName: pool.name, tokenSymbol: token.symbol }} | ||
| components={{ | ||
| Button: ( | ||
| <TextButton | ||
| className="p-0 h-auto font-medium text-xs md:text-sm" | ||
| onClick={handleShowAssets} | ||
| /> | ||
| ), | ||
| }} | ||
| /> | ||
| ); |
There was a problem hiding this comment.
type === 'supply' but asset is not provided (e.g., the existing "renders without crashing" test), the else-branch now renders assetWarning.borrowDescription instead of the supply description. Before this PR, the supply path always rendered assetWarning.supplyDescription. Any caller that passes type="supply" without asset will silently display borrow-facing copy.
Suggested change
| const description = | |
| type === 'supply' && asset ? ( | |
| <SupplyNotification asset={asset} pool={pool} onShowAllMarkets={handleShowAssets} /> | |
| ) : ( | |
| <Trans | |
| // t('assetWarning.borrowDescription') | |
| i18nKey="assetWarning.borrowDescription" | |
| values={{ poolName: pool.name, tokenSymbol: token.symbol }} | |
| components={{ | |
| Button: ( | |
| <TextButton | |
| className="p-0 h-auto font-medium text-xs md:text-sm" | |
| onClick={handleShowAssets} | |
| /> | |
| ), | |
| }} | |
| /> | |
| ); | |
| const description = | |
| type === 'supply' ? ( | |
| asset ? ( | |
| <SupplyNotification asset={asset} pool={pool} onShowAllMarkets={handleShowAssets} /> | |
| ) : ( | |
| <Trans | |
| // t('assetWarning.supplyDescription') | |
| i18nKey="assetWarning.supplyDescription" | |
| values={{ poolName: pool.name, tokenSymbol: token.symbol }} | |
| components={{ | |
| Button: ( | |
| <TextButton | |
| className="p-0 h-auto font-medium text-xs md:text-sm" | |
| onClick={handleShowAssets} | |
| /> | |
| ), | |
| }} | |
| /> | |
| ) | |
| ) : ( | |
| <Trans | |
| // t('assetWarning.borrowDescription') | |
| i18nKey="assetWarning.borrowDescription" | |
| values={{ poolName: pool.name, tokenSymbol: token.symbol }} | |
| components={{ | |
| Button: ( | |
| <TextButton | |
| className="p-0 h-auto font-medium text-xs md:text-sm" | |
| onClick={handleShowAssets} | |
| /> | |
| ), | |
| }} | |
| /> | |
| ); |
Contributor
Author
|
@greptile review again |
Contributor
Coverage Report for ./apps/evm
File Coverage
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Jira ticket(s)
VPD-1201
Changes