feat: add amount filter to events with asset type support (QUBIC, Other, Any)

sallymoc · sallymoc · commit fdecaa344345 · 2026-03-13T01:59:07.000+01:00
diff --git a/public/locales/ar/network-page.json b/public/locales/ar/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "لقد شاهدت جميع المعاملات",
   "amount": "المبلغ",
+  "amountAssetAny": "الكل",
+  "amountAssetOther": "أصول أخرى",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "الأصل",
   "amount100Mto1B": "100 مليون - 1 مليار",
   "amount1Bto10B": "1 مليار - 10 مليار",
   "amount1Mto100M": "1 مليون - 100 مليون",
diff --git a/public/locales/de/network-page.json b/public/locales/de/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "Sie haben alle Transaktionen gesehen",
   "amount": "Betrag",
+  "amountAssetAny": "Alle",
+  "amountAssetOther": "Andere Assets",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Asset",
   "amount100Mto1B": "100Mio - 1Mrd",
   "amount1Bto10B": "1Mrd - 10Mrd",
   "amount1Mto100M": "1Mio - 100Mio",
diff --git a/public/locales/en/network-page.json b/public/locales/en/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "You have seen all transactions",
   "amount": "Amount",
+  "amountAssetAny": "Any",
+  "amountAssetOther": "Other Assets",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Asset",
   "amount100Mto1B": "100M - 1B",
   "amount1Bto10B": "1B - 10B",
   "amount1Mto100M": "1M - 100M",
diff --git a/public/locales/es/network-page.json b/public/locales/es/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "Has visto todas las transacciones",
   "amount": "Cantidad",
+  "amountAssetAny": "Todos",
+  "amountAssetOther": "Otros Activos",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Activo",
   "amount100Mto1B": "100M - 1MM",
   "amount1Bto10B": "1MM - 10MM",
   "amount1Mto100M": "1M - 100M",
diff --git a/public/locales/fr/network-page.json b/public/locales/fr/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "Vous avez vu toutes les transactions",
   "amount": "Montant",
+  "amountAssetAny": "Tous",
+  "amountAssetOther": "Autres actifs",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Actif",
   "amount100Mto1B": "100M - 1Md",
   "amount1Bto10B": "1Md - 10Md",
   "amount1Mto100M": "1M - 100M",
diff --git a/public/locales/ja/network-page.json b/public/locales/ja/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "すべてのトランザクションを確認しました",
   "amount": "金額",
+  "amountAssetAny": "すべて",
+  "amountAssetOther": "その他のアセット",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "アセット",
   "amount100Mto1B": "1億 - 10億",
   "amount1Bto10B": "10億 - 100億",
   "amount1Mto100M": "1百万 - 1億",
diff --git a/public/locales/nl/network-page.json b/public/locales/nl/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "Je hebt alle transacties gezien",
   "amount": "Bedrag",
+  "amountAssetAny": "Alle",
+  "amountAssetOther": "Andere activa",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Activa",
   "amount100Mto1B": "100M - 1Mrd",
   "amount1Bto10B": "1Mrd - 10Mrd",
   "amount1Mto100M": "1M - 100M",
diff --git a/public/locales/pt/network-page.json b/public/locales/pt/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "Você viu todas as transações",
   "amount": "Quantidade",
+  "amountAssetAny": "Todos",
+  "amountAssetOther": "Outros Ativos",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Ativo",
   "amount100Mto1B": "100mi - 1bi",
   "amount1Bto10B": "1bi - 10bi",
   "amount1Mto100M": "1mi - 100mi",
diff --git a/public/locales/ru/network-page.json b/public/locales/ru/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "Вы просмотрели все транзакции",
   "amount": "Сумма",
+  "amountAssetAny": "Все",
+  "amountAssetOther": "Другие активы",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Актив",
   "amount100Mto1B": "100млн - 1млрд",
   "amount1Bto10B": "1млрд - 10млрд",
   "amount1Mto100M": "1млн - 100млн",
diff --git a/public/locales/tr/network-page.json b/public/locales/tr/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "Tüm işlemleri gördünüz",
   "amount": "Miktar",
+  "amountAssetAny": "Tümü",
+  "amountAssetOther": "Diğer Varlıklar",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Varlık",
   "amount100Mto1B": "100M - 1Mr",
   "amount1Bto10B": "1Mr - 10Mr",
   "amount1Mto100M": "1M - 100M",
diff --git a/public/locales/vi/network-page.json b/public/locales/vi/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "Bạn đã xem tất cả giao dịch",
   "amount": "Số lượng",
+  "amountAssetAny": "Tất cả",
+  "amountAssetOther": "Tài sản khác",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "Tài sản",
   "amount100Mto1B": "100Tr - 1T",
   "amount1Bto10B": "1T - 10T",
   "amount1Mto100M": "1Tr - 100Tr",
diff --git a/public/locales/zh/network-page.json b/public/locales/zh/network-page.json
@@ -8,6 +8,10 @@
   "allProcedures": "All procedures",
   "allTransactionsLoaded": "您已经看过所有的交易",
   "amount": "金额",
+  "amountAssetAny": "全部",
+  "amountAssetOther": "其他资产",
+  "amountAssetQubic": "QUBIC",
+  "amountAssetType": "资产",
   "amount100Mto1B": "1亿 - 10亿",
   "amount1Bto10B": "10亿 - 100亿",
   "amount1Mto100M": "1百万 - 1亿",
diff --git a/src/pages/network/address/components/AddressEvents.tsx b/src/pages/network/address/components/AddressEvents.tsx
@@ -23,6 +23,7 @@ export default function AddressEvents({ addressId }: Props) {
     dateRange,
     sourceFilter,
     destinationFilter,
+    amountFilter,
     isLoading,
     hasError
   } = useAddressEvents(addressId)
@@ -35,6 +36,7 @@ export default function AddressEvents({ addressId }: Props) {
     dateRange,
     sourceFilter,
     destinationFilter,
+    amountFilter,
     addressId
   })
 
@@ -51,6 +53,7 @@ export default function AddressEvents({ addressId }: Props) {
         dateRange={dateRange}
         sourceFilter={sourceFilter}
         destinationFilter={destinationFilter}
+        amountFilter={amountFilter}
         idPrefix="addr-events"
         showDirectionFilter
         addressId={addressId}
diff --git a/src/pages/network/address/hooks/useAddressEvents.ts b/src/pages/network/address/hooks/useAddressEvents.ts
@@ -14,11 +14,14 @@ import type {
 } from '../components/TransactionsOverview/filterUtils'
 import { DIRECTION } from '../components/TransactionsOverview/filterUtils'
 import {
+  type EventAmountFilter,
+  buildAmountFilter,
   buildEventAddressFilter,
   buildTickFilter,
   buildTimestampRange,
   type DateRangeValue,
   parseAddressFilter,
+  parseAmountFilter,
   parseDateRange,
   parseTickRange
 } from '../../utils/eventFilterUtils'
@@ -33,6 +36,7 @@ export default function useAddressEvents(addressId: string): {
   dateRange: DateRangeValue | undefined
   sourceFilter: AddressFilter | undefined
   destinationFilter: AddressFilter | undefined
+  amountFilter: EventAmountFilter | undefined
   isLoading: boolean
   hasError: boolean
 } {
@@ -56,6 +60,8 @@ export default function useAddressEvents(addressId: string): {
       ? directionRaw
       : undefined
 
+  const amountFilter = parseAmountFilter(searchParams)
+
   const { tickNumber, tickRange } = buildTickFilter(tickStart, tickEnd)
 
   const timestampRange = buildTimestampRange(dateRange)
@@ -74,12 +80,23 @@ export default function useAddressEvents(addressId: string): {
   // When direction is set, implicit source/dest handles the scoping instead.
   const useShouldFilter = !direction
 
-  const should = useMemo<ShouldFilter[] | undefined>(
+  const addressShould = useMemo<ShouldFilter[] | undefined>(
     () =>
       useShouldFilter ? [{ terms: { source: addressId, destination: addressId } }] : undefined,
     [addressId, useShouldFilter]
   )
 
+  const { amountShould, ...amountParams } = useMemo(
+    () => buildAmountFilter(amountFilter),
+    [amountFilter]
+  )
+
+  // Merge address should (OR) with amount should (OR) when both are present
+  const should = useMemo<ShouldFilter[] | undefined>(() => {
+    if (!addressShould && !amountShould) return undefined
+    return [...(addressShould ?? []), ...(amountShould ?? [])]
+  }, [addressShould, amountShould])
+
   // When direction is set, implicit source/dest scopes to the page address.
   // When direction is undefined, `should` (OR) handles scoping instead.
   const implicitSource = isOutgoing ? addressId : undefined
@@ -97,7 +114,8 @@ export default function useAddressEvents(addressId: string): {
       source: sourceResult.include ?? implicitSource,
       excludeSource: sourceResult.exclude,
       destination: destResult.include ?? implicitDest,
-      excludeDestination: destResult.exclude
+      excludeDestination: destResult.exclude,
+      ...amountParams
     },
     { skip: !addressId }
   )
@@ -116,6 +134,7 @@ export default function useAddressEvents(addressId: string): {
     dateRange,
     sourceFilter,
     destinationFilter,
+    amountFilter,
     isLoading: isFetching,
     hasError: isError
   }
diff --git a/src/pages/network/blockchain/events/EventsPage.tsx b/src/pages/network/blockchain/events/EventsPage.tsx
@@ -21,6 +21,7 @@ function EventsPage() {
     dateRange,
     sourceFilter,
     destinationFilter,
+    amountFilter,
     isLoading
   } = useEventsPage()
 
@@ -30,7 +31,8 @@ function EventsPage() {
     eventTypes,
     dateRange,
     sourceFilter,
-    destinationFilter
+    destinationFilter,
+    amountFilter
   })
 
   return (
@@ -54,6 +56,7 @@ function EventsPage() {
           dateRange={dateRange}
           sourceFilter={sourceFilter}
           destinationFilter={destinationFilter}
+          amountFilter={amountFilter}
           idPrefix="events"
         />
 
diff --git a/src/pages/network/blockchain/events/useEventsPage.ts b/src/pages/network/blockchain/events/useEventsPage.ts
@@ -1,3 +1,4 @@
+import { useMemo } from 'react'
 import { useSearchParams } from 'react-router-dom'
 
 import {
@@ -9,11 +10,14 @@ import {
 import { type TransactionEvent, useGetEventsQuery } from '@app/store/apis/events'
 import type { AddressFilter } from '../../address/components/TransactionsOverview/filterUtils'
 import {
+  type EventAmountFilter,
+  buildAmountFilter,
   buildEventAddressFilter,
   buildTickFilter,
   buildTimestampRange,
   type DateRangeValue,
   parseAddressFilter,
+  parseAmountFilter,
   parseDateRange,
   parseTickRange
 } from '../../utils/eventFilterUtils'
@@ -27,6 +31,7 @@ export default function useEventsPage(): {
   dateRange: DateRangeValue | undefined
   sourceFilter: AddressFilter | undefined
   destinationFilter: AddressFilter | undefined
+  amountFilter: EventAmountFilter | undefined
   isLoading: boolean
 } {
   const [searchParams] = useSearchParams()
@@ -43,11 +48,17 @@ export default function useEventsPage(): {
 
   const eventTypes = useSanitizedEventTypes()
 
+  const amountFilter = parseAmountFilter(searchParams)
+
   const { tickNumber, tickRange } = buildTickFilter(tickStart, tickEnd)
 
   const timestampRange = buildTimestampRange(dateRange)
   const sourceResult = buildEventAddressFilter(sourceFilter)
   const destResult = buildEventAddressFilter(destinationFilter)
+  const { amountShould, ...amountParams } = useMemo(
+    () => buildAmountFilter(amountFilter),
+    [amountFilter]
+  )
 
   const { data, isFetching } = useGetEventsQuery({
     tickNumber,
@@ -59,7 +70,9 @@ export default function useEventsPage(): {
     source: sourceResult.include,
     excludeSource: sourceResult.exclude,
     destination: destResult.include,
-    excludeDestination: destResult.exclude
+    excludeDestination: destResult.exclude,
+    ...(amountShould && { should: amountShould }),
+    ...amountParams
   })
 
   const total = data?.total ?? 0
@@ -75,6 +88,7 @@ export default function useEventsPage(): {
     dateRange,
     sourceFilter,
     destinationFilter,
+    amountFilter,
     isLoading: isFetching
   }
 }
diff --git a/src/pages/network/components/filters/EventAmountFilterContent.tsx b/src/pages/network/components/filters/EventAmountFilterContent.tsx
diff --git a/src/pages/network/components/filters/EventsFilterBar.tsx b/src/pages/network/components/filters/EventsFilterBar.tsx
diff --git a/src/pages/network/components/filters/EventsMobileFiltersModal.tsx b/src/pages/network/components/filters/EventsMobileFiltersModal.tsx
diff --git a/src/pages/network/hooks/useEventFilters.ts b/src/pages/network/hooks/useEventFilters.ts
diff --git a/src/pages/network/tick/components/TickEvents.tsx b/src/pages/network/tick/components/TickEvents.tsx
diff --git a/src/pages/network/tick/hooks/useTickEvents.ts b/src/pages/network/tick/hooks/useTickEvents.ts
diff --git a/src/pages/network/utils/eventFilterUtils.ts b/src/pages/network/utils/eventFilterUtils.ts
diff --git a/src/store/apis/events/events.api.ts b/src/store/apis/events/events.api.ts
