From 8bff1e6d24d75ee87eee04e7ab69e75efca7d797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nandy=20B=C3=A2?= <nandyba@yahoo.fr>
Date: Sun, 15 Dec 2024 21:06:17 +0100
Subject: [PATCH 1/6] feat: add product type filter

---
 .../filters/AssetsViewFilterModal.tsx         |  7 ++
 .../filters/AssetsViewFilterType.tsx          | 77 +++++++++++++++++++
 .../assetsView/filters/useFilters.ts          |  4 +
 .../assetsView/types/assetProduct.type.ts     |  6 ++
 src/components/assetsView/types/index.ts      |  1 +
 src/states/index.ts                           |  3 +
 6 files changed, 98 insertions(+)
 create mode 100644 src/components/assetsView/filters/AssetsViewFilterType.tsx
 create mode 100644 src/components/assetsView/types/assetProduct.type.ts

diff --git a/src/components/assetsView/filters/AssetsViewFilterModal.tsx b/src/components/assetsView/filters/AssetsViewFilterModal.tsx
index 8125e21e..06380a7c 100644
--- a/src/components/assetsView/filters/AssetsViewFilterModal.tsx
+++ b/src/components/assetsView/filters/AssetsViewFilterModal.tsx
@@ -12,6 +12,7 @@ import {
   assetsViewFilterAtom,
 } from 'src/states'
 
+import { AssetsViewProductTypeFilter } from './AssetsViewFilterType'
 import { AssetsViewRentStatusFilter } from './AssetsViewRentStatusFilter'
 import { AssetsViewRmmStatusFilter } from './AssetsViewRmmStatusFilter'
 import { AssetsViewSort } from './AssetsViewSort'
@@ -76,6 +77,12 @@ export const AssetsViewFilterModal: FC<ContextModalProps> = ({
             setFilterModel({ ...filterModel, ...value })
           }}
         />
+        <AssetsViewProductTypeFilter
+          filter={filterModel}
+          onChange={(value) => {
+            setFilterModel({ ...filterModel, ...value })
+          }}
+        />
         <AssetsViewUserProtocolFilter
           filter={filterModel}
           onChange={(value) => {
diff --git a/src/components/assetsView/filters/AssetsViewFilterType.tsx b/src/components/assetsView/filters/AssetsViewFilterType.tsx
new file mode 100644
index 00000000..01b6a4fc
--- /dev/null
+++ b/src/components/assetsView/filters/AssetsViewFilterType.tsx
@@ -0,0 +1,77 @@
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { Select } from '@mantine/core'
+
+import {
+  RWARealtoken,
+  UserRealtoken,
+} from 'src/store/features/wallets/walletsSelector'
+
+import { useInputStyles } from '../../inputs/useInputStyles'
+import { AssetProductType } from '../types'
+
+interface AssetsViewFilterType {
+  productType: AssetProductType
+}
+
+interface AssetsViewProductTypeFilterProps {
+  filter: AssetsViewFilterType
+  onChange: (value: AssetsViewFilterType) => void
+}
+export const AssetsViewProductTypeFilter: FC<
+  AssetsViewProductTypeFilterProps
+> = ({ filter, onChange }) => {
+  const { t } = useTranslation('common', { keyPrefix: 'assetProduct' })
+  const { classes: inputClasses } = useInputStyles()
+
+  const viewOptions = [
+    {
+      value: AssetProductType.ALL,
+      label: t('options.all'),
+    },
+    {
+      value: AssetProductType.REAL_EASTATE_RENTAL,
+      label: t('options.realEstateRental'),
+    },
+    {
+      value: AssetProductType.LOAN_INCOME,
+      label: t('options.loanIncome'),
+    },
+    {
+      value: AssetProductType.EQUITY_TOKEN,
+      label: t('options.equityToken'),
+    },
+  ]
+
+  return (
+    <Select
+      label={t('label')}
+      data={viewOptions}
+      value={filter.productType}
+      onChange={(value) => onChange({ productType: value as AssetProductType })}
+      classNames={inputClasses}
+    />
+  )
+}
+AssetsViewProductTypeFilter.displayName = 'AssetsViewProductTypeFilter'
+
+export function useAssetsViewProductTypeFilter(filter: AssetsViewFilterType) {
+  function assetProductTypeFilterFunction(asset: UserRealtoken | RWARealtoken) {
+    const Asset = asset as UserRealtoken
+    switch (filter.productType) {
+      case AssetProductType.ALL:
+        return true
+      case AssetProductType.REAL_EASTATE_RENTAL:
+        return (
+          String(Asset.productType) === AssetProductType.REAL_EASTATE_RENTAL
+        )
+      case AssetProductType.LOAN_INCOME:
+        return String(Asset.productType) === AssetProductType.LOAN_INCOME
+      case AssetProductType.EQUITY_TOKEN:
+        return String(Asset.productType) === AssetProductType.EQUITY_TOKEN
+    }
+  }
+
+  return { assetProductTypeFilterFunction }
+}
diff --git a/src/components/assetsView/filters/useFilters.ts b/src/components/assetsView/filters/useFilters.ts
index dae6dc0a..d627f784 100644
--- a/src/components/assetsView/filters/useFilters.ts
+++ b/src/components/assetsView/filters/useFilters.ts
@@ -6,6 +6,7 @@ import {
   UserRealtoken,
 } from 'src/store/features/wallets/walletsSelector'
 
+import { useAssetsViewProductTypeFilter } from './AssetsViewFilterType'
 import { useAssetsViewRentStatusFilter } from './AssetsViewRentStatusFilter'
 import { useAssetsViewRmmStatusFilter } from './AssetsViewRmmStatusFilter'
 import { useAssetsViewSort } from './AssetsViewSort'
@@ -22,6 +23,8 @@ export function useAssetsViewFilters() {
     useAssetsViewSubsidyFilter(activeFilter)
   const { assetUserStatusFilterFunction } =
     useAssetsViewUserStatusFilter(activeFilter)
+  const { assetProductTypeFilterFunction } =
+    useAssetsViewProductTypeFilter(activeFilter)
   const { assetRentStatusFilterFunction } =
     useAssetsViewRentStatusFilter(activeFilter)
   const { assetRmmStatusFilterFunction } =
@@ -35,6 +38,7 @@ export function useAssetsViewFilters() {
     return tokenList
       .filter(assetUserStatusFilterFunction)
       .filter(assetUserProtocolFilterFunction)
+      .filter(assetProductTypeFilterFunction)
       .filter(assetRentStatusFilterFunction)
       .filter(assetSubsidyFilterFunction)
       .filter(assetRmmStatusFilterFunction)
diff --git a/src/components/assetsView/types/assetProduct.type.ts b/src/components/assetsView/types/assetProduct.type.ts
new file mode 100644
index 00000000..4729d046
--- /dev/null
+++ b/src/components/assetsView/types/assetProduct.type.ts
@@ -0,0 +1,6 @@
+export enum AssetProductType {
+  ALL = 'all',
+  REAL_EASTATE_RENTAL = 'real_estate_rental',
+  EQUITY_TOKEN = 'equity_token',
+  LOAN_INCOME = 'loan_income',
+}
diff --git a/src/components/assetsView/types/index.ts b/src/components/assetsView/types/index.ts
index e18ec409..74dbbcbe 100644
--- a/src/components/assetsView/types/index.ts
+++ b/src/components/assetsView/types/index.ts
@@ -5,3 +5,4 @@ export * from './assetUserStatus.type'
 export * from './assetRentStatus.type'
 export * from './assetRmmStatus.type'
 export * from './assetUserProtocol.type'
+export * from './assetProduct.type'
diff --git a/src/states/index.ts b/src/states/index.ts
index f42c82d5..66984504 100644
--- a/src/states/index.ts
+++ b/src/states/index.ts
@@ -1,6 +1,7 @@
 import { atomWithStorage } from 'jotai/utils'
 
 import {
+  AssetProductType,
   AssetRentStatusType,
   AssetRmmStatusType,
   AssetSortType,
@@ -20,6 +21,7 @@ export interface AssetsViewFilterType {
   sortReverse: boolean
   subsidy: AssetSubsidyType
   userStatus: AssetUserStatusType
+  productType: AssetProductType
   rentStatus: AssetRentStatusType
   rmmStatus: AssetRmmStatusType
   userProtocol: AssetUserProtocolType
@@ -30,6 +32,7 @@ export const assetsViewDefaultFilter: AssetsViewFilterType = {
   sortReverse: false,
   subsidy: AssetSubsidyType.ALL,
   userStatus: AssetUserStatusType.OWNED,
+  productType: AssetProductType.ALL,
   rentStatus: AssetRentStatusType.ALL,
   rmmStatus: AssetRmmStatusType.ALL,
   userProtocol: AssetUserProtocolType.ALL,

From d2a96c8ef1604fce5aeb82ec258d00c7e53f6c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nandy=20B=C3=A2?= <nandyba@yahoo.fr>
Date: Sun, 15 Dec 2024 21:13:23 +0100
Subject: [PATCH 2/6] refactor: change filter file name

---
 src/components/assetsView/filters/AssetsViewFilterModal.tsx     | 2 +-
 ...AssetsViewFilterType.tsx => AssetsViewFilterProductType.tsx} | 0
 src/components/assetsView/filters/useFilters.ts                 | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/components/assetsView/filters/{AssetsViewFilterType.tsx => AssetsViewFilterProductType.tsx} (100%)

diff --git a/src/components/assetsView/filters/AssetsViewFilterModal.tsx b/src/components/assetsView/filters/AssetsViewFilterModal.tsx
index 06380a7c..991b8561 100644
--- a/src/components/assetsView/filters/AssetsViewFilterModal.tsx
+++ b/src/components/assetsView/filters/AssetsViewFilterModal.tsx
@@ -12,7 +12,7 @@ import {
   assetsViewFilterAtom,
 } from 'src/states'
 
-import { AssetsViewProductTypeFilter } from './AssetsViewFilterType'
+import { AssetsViewProductTypeFilter } from './AssetsViewFilterProductType'
 import { AssetsViewRentStatusFilter } from './AssetsViewRentStatusFilter'
 import { AssetsViewRmmStatusFilter } from './AssetsViewRmmStatusFilter'
 import { AssetsViewSort } from './AssetsViewSort'
diff --git a/src/components/assetsView/filters/AssetsViewFilterType.tsx b/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
similarity index 100%
rename from src/components/assetsView/filters/AssetsViewFilterType.tsx
rename to src/components/assetsView/filters/AssetsViewFilterProductType.tsx
diff --git a/src/components/assetsView/filters/useFilters.ts b/src/components/assetsView/filters/useFilters.ts
index d627f784..1462b8ba 100644
--- a/src/components/assetsView/filters/useFilters.ts
+++ b/src/components/assetsView/filters/useFilters.ts
@@ -6,7 +6,7 @@ import {
   UserRealtoken,
 } from 'src/store/features/wallets/walletsSelector'
 
-import { useAssetsViewProductTypeFilter } from './AssetsViewFilterType'
+import { useAssetsViewProductTypeFilter } from './AssetsViewFilterProductType'
 import { useAssetsViewRentStatusFilter } from './AssetsViewRentStatusFilter'
 import { useAssetsViewRmmStatusFilter } from './AssetsViewRmmStatusFilter'
 import { useAssetsViewSort } from './AssetsViewSort'

From 5946275f275326f415876259ff47998ad46f65e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nandy=20B=C3=A2?= <nandyba@yahoo.fr>
Date: Sun, 15 Dec 2024 21:23:28 +0100
Subject: [PATCH 3/6] feat: add product type i18n translations

---
 .../assetsView/filters/AssetsViewFilterProductType.tsx   | 2 +-
 src/i18next/locales/en/common.json                       | 9 +++++++++
 src/i18next/locales/fr/common.json                       | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/assetsView/filters/AssetsViewFilterProductType.tsx b/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
index 01b6a4fc..53fc5ddd 100644
--- a/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
+++ b/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
@@ -22,7 +22,7 @@ interface AssetsViewProductTypeFilterProps {
 export const AssetsViewProductTypeFilter: FC<
   AssetsViewProductTypeFilterProps
 > = ({ filter, onChange }) => {
-  const { t } = useTranslation('common', { keyPrefix: 'assetProduct' })
+  const { t } = useTranslation('common', { keyPrefix: 'assetProductType' })
   const { classes: inputClasses } = useInputStyles()
 
   const viewOptions = [
diff --git a/src/i18next/locales/en/common.json b/src/i18next/locales/en/common.json
index 3f7f7554..defea8fe 100644
--- a/src/i18next/locales/en/common.json
+++ b/src/i18next/locales/en/common.json
@@ -159,6 +159,15 @@
       "notWhitelisted": "Not whitelisted"
     }
   },
+  "assetProductType": {
+    "label": "Product type",
+    "options": {
+      "all": "All",
+      "realEstateRental": "Real estate rental",
+      "loanIncome": "Loan income",
+      "equityToken": "Equity token"
+    }
+  },
   "assetRentStatus": {
     "label": "Rent",
     "options": {
diff --git a/src/i18next/locales/fr/common.json b/src/i18next/locales/fr/common.json
index e05985a7..6515af4e 100644
--- a/src/i18next/locales/fr/common.json
+++ b/src/i18next/locales/fr/common.json
@@ -159,6 +159,15 @@
       "notWhitelisted": "Non whitelistées"
     }
   },
+  "assetProductType": {
+    "label": "Type de propriété",
+    "options": {
+      "all": "Tous",
+      "realEstateRental": "Location immobilière",
+      "loanIncome": "Revenu de prêt",
+      "equityToken": "Token d'équité"
+    }
+  },
   "assetRentStatus": {
     "label": "Loyers",
     "options": {

From 9732cad7543e4a9b08482e86e9e3765afe4bb9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nandy=20B=C3=A2?= <nandyba@yahoo.fr>
Date: Tue, 17 Dec 2024 20:31:39 +0100
Subject: [PATCH 4/6] feat: update REG and RWA type to support new filter

---
 .../filters/AssetsViewFilterProductType.tsx   | 16 ++--
 src/hooks/useREG.ts                           |  2 +
 src/hooks/useREGVotingPower.ts                |  2 +
 src/hooks/useRWA.ts                           |  2 +
 src/store/features/wallets/walletsSelector.ts |  7 +-
 yarn.lock                                     | 81 ++++++++++++++++++-
 6 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/src/components/assetsView/filters/AssetsViewFilterProductType.tsx b/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
index 53fc5ddd..cde79d1d 100644
--- a/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
+++ b/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
@@ -4,9 +4,10 @@ import { useTranslation } from 'react-i18next'
 import { Select } from '@mantine/core'
 
 import {
-  RWARealtoken,
+  OtherRealtoken,
   UserRealtoken,
 } from 'src/store/features/wallets/walletsSelector'
+import { APIRealTokenProductType } from 'src/types/APIRealToken'
 
 import { useInputStyles } from '../../inputs/useInputStyles'
 import { AssetProductType } from '../types'
@@ -57,19 +58,18 @@ export const AssetsViewProductTypeFilter: FC<
 AssetsViewProductTypeFilter.displayName = 'AssetsViewProductTypeFilter'
 
 export function useAssetsViewProductTypeFilter(filter: AssetsViewFilterType) {
-  function assetProductTypeFilterFunction(asset: UserRealtoken | RWARealtoken) {
-    const Asset = asset as UserRealtoken
+  function assetProductTypeFilterFunction(
+    asset: UserRealtoken | OtherRealtoken,
+  ) {
     switch (filter.productType) {
       case AssetProductType.ALL:
         return true
       case AssetProductType.REAL_EASTATE_RENTAL:
-        return (
-          String(Asset.productType) === AssetProductType.REAL_EASTATE_RENTAL
-        )
+        return asset.productType === APIRealTokenProductType.RealEstateRental
       case AssetProductType.LOAN_INCOME:
-        return String(Asset.productType) === AssetProductType.LOAN_INCOME
+        return asset.productType === APIRealTokenProductType.LoanIncome
       case AssetProductType.EQUITY_TOKEN:
-        return String(Asset.productType) === AssetProductType.EQUITY_TOKEN
+        return asset.productType === APIRealTokenProductType.EquityToken
     }
   }
 
diff --git a/src/hooks/useREG.ts b/src/hooks/useREG.ts
index a8631b69..0a83161d 100644
--- a/src/hooks/useREG.ts
+++ b/src/hooks/useREG.ts
@@ -13,6 +13,7 @@ import {
   selectUserIncludesEth,
 } from 'src/store/features/settings/settingsSelector'
 import { REGRealtoken } from 'src/store/features/wallets/walletsSelector'
+import { APIRealTokenProductType } from 'src/types/APIRealToken'
 import { Currency } from 'src/types/Currencies'
 import { ERC20ABI } from 'src/utils/blockchain/abi/ERC20ABI'
 import {
@@ -147,6 +148,7 @@ const getREG = async (
     id: `${REG_asset_ID}`,
     fullName: 'RealToken Ecosystem Governance',
     shortName: 'REG',
+    productType: APIRealTokenProductType.EquityToken,
     amount,
     tokenPrice,
     totalTokens,
diff --git a/src/hooks/useREGVotingPower.ts b/src/hooks/useREGVotingPower.ts
index 6f9a4098..5af3af1a 100644
--- a/src/hooks/useREGVotingPower.ts
+++ b/src/hooks/useREGVotingPower.ts
@@ -6,6 +6,7 @@ import { Contract } from 'ethers'
 import { initializeProviders } from 'src/repositories/RpcProvider'
 import { selectUserAddressList } from 'src/store/features/settings/settingsSelector'
 import { REGVotingPowertoken } from 'src/store/features/wallets/walletsSelector'
+import { APIRealTokenProductType } from 'src/types/APIRealToken'
 import { ERC20ABI } from 'src/utils/blockchain/abi/ERC20ABI'
 import {
   DEFAULT_REGVotingPower_PRICE,
@@ -44,6 +45,7 @@ const getRegVotingPower = async (
     id: `${REGVotingPower_asset_ID}`,
     fullName: 'REG Voting Power Registry',
     shortName: 'REG VOTING POWER',
+    productType: APIRealTokenProductType.EquityToken,
     amount,
     tokenPrice,
     totalTokens,
diff --git a/src/hooks/useRWA.ts b/src/hooks/useRWA.ts
index 16eef6d8..88cf8606 100644
--- a/src/hooks/useRWA.ts
+++ b/src/hooks/useRWA.ts
@@ -12,6 +12,7 @@ import {
   selectUserAddressList, // selectUserIncludesEth,
 } from 'src/store/features/settings/settingsSelector'
 import { RWARealtoken } from 'src/store/features/wallets/walletsSelector'
+import { APIRealTokenProductType } from 'src/types/APIRealToken'
 import { Currency } from 'src/types/Currencies'
 import { ERC20ABI } from 'src/utils/blockchain/abi/ERC20ABI'
 import {
@@ -98,6 +99,7 @@ const getRWA = async (
     shortName: 'RWA',
     amount,
     tokenPrice,
+    productType: APIRealTokenProductType.EquityToken,
     totalTokens,
     imageLink: [
       'https://realt.co/wp-content/uploads/2024/02/Equity_FinalDesign-2000px-800x542.png',
diff --git a/src/store/features/wallets/walletsSelector.ts b/src/store/features/wallets/walletsSelector.ts
index 34b185f3..a35ad139 100644
--- a/src/store/features/wallets/walletsSelector.ts
+++ b/src/store/features/wallets/walletsSelector.ts
@@ -5,10 +5,14 @@ import _max from 'lodash/max'
 import _sumBy from 'lodash/sumBy'
 import moment from 'moment'
 
+import { AssetProductType } from 'src/components/assetsView'
 import { WalletBalances, WalletType } from 'src/repositories'
 import { UserRealTokenTransfer } from 'src/repositories/transfers/transfers.type'
 import { RootState } from 'src/store/store'
-import { APIRealTokenDate } from 'src/types/APIRealToken'
+import {
+  APIRealTokenDate,
+  APIRealTokenProductType,
+} from 'src/types/APIRealToken'
 import { RealToken, RealTokenCanal } from 'src/types/RealToken'
 import {
   RentCalculation,
@@ -42,6 +46,7 @@ export interface OtherRealtoken {
   id: string
   fullName: string
   shortName: string
+  productType: APIRealTokenProductType
   amount: number
   value: number
   tokenPrice: number
diff --git a/yarn.lock b/yarn.lock
index 42c0d7c4..8d2a5ab7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1335,6 +1335,11 @@
     "@noble/hashes" "~1.3.0"
     "@scure/base" "~1.1.0"
 
+"@sindresorhus/merge-streams@^2.1.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958"
+  integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==
+
 "@solana/buffer-layout@^4.0.1":
   version "4.0.1"
   resolved "https://registry.npmjs.org/@solana/buffer-layout/-/buffer-layout-4.0.1.tgz"
@@ -2780,6 +2785,26 @@ defu@^6.1.2, defu@^6.1.3:
   resolved "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz"
   integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==
 
+del-cli@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-6.0.0.tgz#7822d0ffd5b73449a506a586d839711485bfb119"
+  integrity sha512-9nitGV2W6KLFyya4qYt4+9AKQFL+c0Ehj5K7V7IwlxTc6RMCfQUGY9E9pLG6e8TQjtwXpuiWIGGZb3mfVxyZkw==
+  dependencies:
+    del "^8.0.0"
+    meow "^13.2.0"
+
+del@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-8.0.0.tgz#f333a5673cfeb72e46084031714a7c30515e80aa"
+  integrity sha512-R6ep6JJ+eOBZsBr9esiNN1gxFbZE4Q2cULkUSFumGYecAiS6qodDvcPx/sFuWHMNul7DWmrtoEOpYSm7o6tbSA==
+  dependencies:
+    globby "^14.0.2"
+    is-glob "^4.0.3"
+    is-path-cwd "^3.0.0"
+    is-path-inside "^4.0.0"
+    p-map "^7.0.2"
+    slash "^5.1.0"
+
 delay@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz"
@@ -3401,9 +3426,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.11, fast-glob@^3.2.9:
+fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.2:
   version "3.3.2"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
@@ -3652,6 +3677,18 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+globby@^14.0.2:
+  version "14.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-14.0.2.tgz#06554a54ccfe9264e5a9ff8eded46aa1e306482f"
+  integrity sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==
+  dependencies:
+    "@sindresorhus/merge-streams" "^2.1.0"
+    fast-glob "^3.3.2"
+    ignore "^5.2.4"
+    path-type "^5.0.0"
+    slash "^5.1.0"
+    unicorn-magic "^0.1.0"
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"
@@ -3824,6 +3861,11 @@ ignore@^5.2.0:
   resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz"
   integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
 
+ignore@^5.2.4:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
+
 immer@^10.0.3:
   version "10.0.3"
   resolved "https://registry.npmjs.org/immer/-/immer-10.0.3.tgz"
@@ -4031,11 +4073,21 @@ is-number@^7.0.0:
   resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-path-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-3.0.0.tgz#889b41e55c8588b1eb2a96a61d05740a674521c7"
+  integrity sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==
+
 is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
+is-path-inside@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db"
+  integrity sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==
+
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"
@@ -4460,6 +4512,11 @@ match-sorter@^6.0.2:
     "@babel/runtime" "^7.23.8"
     remove-accents "0.5.0"
 
+meow@^13.2.0:
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-13.2.0.tgz#6b7d63f913f984063b3cc261b6e8800c4cd3474f"
+  integrity sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
@@ -4828,6 +4885,11 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
+p-map@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-7.0.3.tgz#7ac210a2d36f81ec28b736134810f7ba4418cdb6"
+  integrity sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
@@ -4875,6 +4937,11 @@ path-type@^4.0.0:
   resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+path-type@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"
+  integrity sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==
+
 pathe@^1.1.0, pathe@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz"
@@ -5503,6 +5570,11 @@ slash@^3.0.0:
   resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slash@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-5.1.0.tgz#be3adddcdf09ac38eebe8dcdc7b1a57a75b095ce"
+  integrity sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==
+
 sonic-boom@^2.2.1:
   version "2.8.0"
   resolved "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.8.0.tgz"
@@ -5899,6 +5971,11 @@ unfetch@^4.2.0:
   resolved "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz"
   integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
 
+unicorn-magic@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4"
+  integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==
+
 unload@2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz"

From bdfa16ccd05ed44da910597418dc48fee0395d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nandy=20B=C3=A2?= <nandyba@yahoo.fr>
Date: Tue, 17 Dec 2024 20:55:49 +0100
Subject: [PATCH 5/6] feat: automatically activate other assets fetch it equity
 token filter is selected

---
 .../assetsView/filters/AssetsViewFilterModal.tsx | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/components/assetsView/filters/AssetsViewFilterModal.tsx b/src/components/assetsView/filters/AssetsViewFilterModal.tsx
index 991b8561..5bcd75fd 100644
--- a/src/components/assetsView/filters/AssetsViewFilterModal.tsx
+++ b/src/components/assetsView/filters/AssetsViewFilterModal.tsx
@@ -1,5 +1,7 @@
 import { FC, useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 
 import { Button, Flex, Stack } from '@mantine/core'
 import { ContextModalProps } from '@mantine/modals'
@@ -11,7 +13,10 @@ import {
   assetsViewDefaultFilter,
   assetsViewFilterAtom,
 } from 'src/states'
+import { selectUserIncludesOtherAssets } from 'src/store/features/settings/settingsSelector'
+import { userIncludesOtherAssetsChanged } from 'src/store/features/settings/settingsSlice'
 
+import { AssetProductType } from '../types'
 import { AssetsViewProductTypeFilter } from './AssetsViewFilterProductType'
 import { AssetsViewRentStatusFilter } from './AssetsViewRentStatusFilter'
 import { AssetsViewRmmStatusFilter } from './AssetsViewRmmStatusFilter'
@@ -50,11 +55,22 @@ export const AssetsViewFilterModal: FC<ContextModalProps> = ({
   const [filterModel, setFilterModel] =
     useState<AssetsViewFilterType>(activeFilter)
 
+  const userIncludesOtherAssets = useSelector(selectUserIncludesOtherAssets)
+  const dispatch = useDispatch()
+  const setUserIncludesOtherAssets = (value: boolean) =>
+    dispatch(userIncludesOtherAssetsChanged(value))
+
   const onClose = useCallback(() => {
     context.closeModal(id)
   }, [context, id])
 
   const onSubmit = () => {
+    if (
+      filterModel.productType === AssetProductType.EQUITY_TOKEN &&
+      !userIncludesOtherAssets
+    ) {
+      setUserIncludesOtherAssets(true) // as all equity token are part of other assets we automatically activate their fetch if the user selects equity token
+    }
     applyFilter(filterModel)
     onClose()
   }

From 356a1675d20e717b84b232704ebb429274aeaad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nandy=20B=C3=A2?= <nandyba@yahoo.fr>
Date: Wed, 18 Dec 2024 19:16:53 +0100
Subject: [PATCH 6/6] feat: add default value for product type filter if user
 un-checked it

---
 .../assetsView/filters/AssetsViewFilterProductType.tsx    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/assetsView/filters/AssetsViewFilterProductType.tsx b/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
index cde79d1d..197a3aef 100644
--- a/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
+++ b/src/components/assetsView/filters/AssetsViewFilterProductType.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next'
 
 import { Select } from '@mantine/core'
 
+import { assetsViewDefaultFilter } from 'src/states'
 import {
   OtherRealtoken,
   UserRealtoken,
@@ -50,7 +51,12 @@ export const AssetsViewProductTypeFilter: FC<
       label={t('label')}
       data={viewOptions}
       value={filter.productType}
-      onChange={(value) => onChange({ productType: value as AssetProductType })}
+      onChange={(value) =>
+        onChange({
+          productType:
+            (value as AssetProductType) ?? assetsViewDefaultFilter.productType,
+        })
+      }
       classNames={inputClasses}
     />
   )