From a940a8971468c5928a354adc56118e14be9655ba Mon Sep 17 00:00:00 2001 From: Nando <24811313+fzavalia@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:36:56 +0100 Subject: [PATCH] fix: Don't set ens filter to on sale by default on the current account page --- webapp/src/components/AssetFilters/utils.ts | 14 +++++++------- webapp/src/modules/routing/sagas.ts | 9 +++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/webapp/src/components/AssetFilters/utils.ts b/webapp/src/components/AssetFilters/utils.ts index cbe1bbcb96..21dec94fbf 100644 --- a/webapp/src/components/AssetFilters/utils.ts +++ b/webapp/src/components/AssetFilters/utils.ts @@ -31,13 +31,13 @@ const WearablesFilters = [ ] const EmotesFilters = [ - ...WearablesFilters.filter( - filter => - filter !== AssetFilter.BodyShape && - filter !== AssetFilter.Network && - filter !== AssetFilter.More && - filter !== AssetFilter.OnlySmart - ), + AssetFilter.Rarity, + AssetFilter.Status, + AssetFilter.Price, + AssetFilter.Collection, + AssetFilter.Creators, + AssetFilter.OnSale, + AssetFilter.More, AssetFilter.PlayMode ] diff --git a/webapp/src/modules/routing/sagas.ts b/webapp/src/modules/routing/sagas.ts index 2ef507b3be..22dd97dde8 100644 --- a/webapp/src/modules/routing/sagas.ts +++ b/webapp/src/modules/routing/sagas.ts @@ -696,10 +696,15 @@ function* deriveCurrentOptions( // for ENS, if the previous page had `onlyOnSale` as `undefined` like wearables or emotes, it defaults to `true`, otherwise use the current value newOptions = { ...newOptions, - assetType: AssetType.NFT, - onlyOnSale: + assetType: AssetType.NFT + } + + // Only if the user is not in their own page, show ens on sale by default. + if (window.location.pathname !== locations.currentAccount()) { + newOptions.onlyOnSale = previous.onlyOnSale === undefined ? true : current.onlyOnSale } + break } default: {