fix: show l2 tokens (#1623)

* show l2 tokens * add timelock filter * fix locale
bloomwalletio · Dec 18, 2023 · daf059c · daf059c
1 parent ad69cea
commit daf059c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/packages/shared/src/components/molecules/filter-items/TokenFilterItem.svelte b/packages/shared/src/components/molecules/filter-items/TokenFilterItem.svelte
@@ -1,16 +1,26 @@
 <script lang="ts">
-    import { activeProfile } from '@core/profile/stores'
     import { IOption, SelectInput } from '@bloomwalletio/ui'
     import { visibleSelectedAccountTokens } from '@core/token/stores'
     import { TokenFilterUnit } from '@core/utils/interfaces/filter'
 
     export let filterUnit: TokenFilterUnit
-    const { baseCoin, nativeTokens } = $visibleSelectedAccountTokens[$activeProfile?.network?.id]
 
-    const options: IOption[] = [baseCoin, ...nativeTokens].map((choice) => ({
-        label: choice.metadata?.name,
-        value: choice.id,
-    }))
+    const options: IOption[] = getTokenOptions()
+    function getTokenOptions(): IOption[] {
+        const tokens: { [key: string]: string } = {}
+        for (const networkTokens of Object.values($visibleSelectedAccountTokens)) {
+            if (networkTokens?.baseCoin?.metadata) {
+                tokens[networkTokens.baseCoin.id] = networkTokens.baseCoin.metadata?.name
+            }
+            networkTokens?.nativeTokens.forEach((token) => {
+                if (token.metadata) {
+                    tokens[token.id] = token.metadata.name
+                }
+            })
+        }
+        return Object.entries(tokens).map(([id, name]) => ({ label: name, value: id }))
+    }
+
     let selected = options.find((option) => option.value === filterUnit.selected)
 
     $: selected && onSelect(selected)

diff --git a/packages/shared/src/lib/core/activity/constants/default-activity-filter.constant.ts b/packages/shared/src/lib/core/activity/constants/default-activity-filter.constant.ts
@@ -34,6 +34,7 @@ export const DEFAULT_ACTIVITY_FILTER: ActivityFilter = {
         choices: [
             StatusFilterOption.Confirmed,
             StatusFilterOption.Pending,
+            StatusFilterOption.Timelocked,
             StatusFilterOption.Claimed,
             StatusFilterOption.Unclaimed,
         ],

diff --git a/packages/shared/src/lib/core/activity/utils/isVisibleActivity.ts b/packages/shared/src/lib/core/activity/utils/isVisibleActivity.ts
@@ -237,6 +237,12 @@ function isVisibleWithActiveStatusFilter(activity: Activity, filter: ActivityFil
         ) {
             return false
         }
+        if (
+            filter.status.selected === StatusFilterOption.Timelocked &&
+            activity.asyncData?.asyncStatus !== ActivityAsyncStatus.Timelocked
+        ) {
+            return false
+        }
         if (
             filter.status.selected === StatusFilterOption.Claimed &&
             activity.type === ActivityType.Basic &&

diff --git a/packages/shared/src/lib/core/utils/enums/filters/status-option.enum.ts b/packages/shared/src/lib/core/utils/enums/filters/status-option.enum.ts
@@ -1,6 +1,7 @@
 export enum StatusFilterOption {
     Confirmed = 'confirmed',
     Pending = 'pending',
+    Timelocked = 'timelocked',
     Claimed = 'claimed',
     Unclaimed = 'unclaimed',
 }
diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json
@@ -1561,6 +1561,7 @@
         "status": {
             "label": "Status",
             "confirmed": "confirmed",
+            "timelocked": "timelocked",
             "pending": "pending",
             "claimed": "claimed",
             "unclaimed": "unclaimed"