Merge pull request #2793 from superhero-com/feature/reset-filters-on-…

…unmounted

fix: do not show previous page filters

src/popup/components/AccountDetailsBase.vue

@@ -79,15 +79,13 @@ import {
   onBeforeUnmount,
   onMounted,
   ref,
-  watch,
 } from 'vue';
 import { useRoute } from 'vue-router';
 import { IS_MOBILE_APP, IS_FIREFOX } from '@/constants';
 
 import {
   useAccounts,
   useBalances,
-  useTransactionAndTokenFilter,
   useUi,
   useScrollConfig,
 } from '@/composables';
@@ -121,7 +119,6 @@ export default defineComponent({
     const ionRouter = useIonRouter();
 
     const { activeAccount } = useAccounts();
-    const { resetFilter } = useTransactionAndTokenFilter();
     const { isScrollEnabled } = useScrollConfig();
     const { homeRouteName } = useUi();
     const { balance } = useBalances();
@@ -153,13 +150,6 @@ export default defineComponent({
       resizeObserver.value.observe(headerEl.value!);
     }
 
-    watch(
-      () => route,
-      () => {
-        resetFilter();
-      },
-    );
-
     onMounted(() => {
       observeTabsHeight();
       // The timeout ensures that the height is calculated correctly in some edge cases

src/popup/components/TransactionAndTokenFilter.vue

@@ -38,6 +38,7 @@ import {
   computed,
   defineComponent,
   onMounted,
+  onUnmounted,
   ref,
   watch,
 } from 'vue';
@@ -69,6 +70,7 @@ export default defineComponent({
       displayMode,
       filtersConfig,
       filtersConfigAe,
+      resetFilter,
     } = useTransactionAndTokenFilter();
 
     const { viewportElement } = useViewport();
@@ -122,14 +124,16 @@ export default defineComponent({
       }
     });
 
-    onMounted(async () => {
+    onMounted(() => {
       if (showFilterBar.value) {
         maxHeight.value = (transactionFilterEl?.value)?.clientHeight!;
         firstRender.value = false;
         observeFilterElHeight();
       }
     });
 
+    onUnmounted(() => resetFilter());
+
     return {
       transactionFilterEl,
       searchPhrase,