Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fancy-lines-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@venusprotocol/evm": patch
---

always show user assets only filter
13 changes: 5 additions & 8 deletions apps/evm/src/containers/MarketTable/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export const MarketTable: React.FC<MarketTableProps> = ({
const {
assets: filteredAssets,
pausedAssetsExist,
userHasAssets,
searchValue,
onSearchValueChange,
showPausedAssets,
Expand Down Expand Up @@ -152,13 +151,11 @@ export const MarketTable: React.FC<MarketTableProps> = ({
/>
)}

{userHasAssets && (
<Toggle
onChange={() => setShowUserAssetsOnly(!showUserAssetsOnly)}
value={showUserAssetsOnly}
label={t('marketTable.userAssetsOnlyToggle.label')}
/>
)}
<Toggle
onChange={() => setShowUserAssetsOnly(!showUserAssetsOnly)}
value={showUserAssetsOnly}
label={t('marketTable.userAssetsOnlyToggle.label')}
/>

{userEModeGroup && (
<Toggle
Expand Down
8 changes: 0 additions & 8 deletions apps/evm/src/containers/MarketTable/useControls/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,9 @@ export const useControls = ({

const { showPausedAssets, showUserAssetsOnly, showUserEModeAssetsOnly } = userChainSettings;

let userHasAssets = false;
let pausedAssetsExist = false;

assets.forEach(asset => {
const isUserAsset = asset.userWalletBalanceTokens.isGreaterThan(0);

if (isUserAsset && !userHasAssets) {
userHasAssets = true;
}

const isPaused = isAssetPaused({ disabledTokenActions: asset.disabledTokenActions });
if (isPaused && !pausedAssetsExist) {
pausedAssetsExist = true;
Expand Down Expand Up @@ -86,7 +79,6 @@ export const useControls = ({
setShowUserEModeAssetsOnly,
onSearchValueChange: setSearchValue,
pausedAssetsExist,
userHasAssets,
showPausedAssets,
showUserAssetsOnly,
showUserEModeAssetsOnly,
Expand Down