Skip to content

Open source personal finance application

fix: update currencies tabs to outline pills, fix stat filter fragment warning

Ilya Komichev931b14b1b706
diff --git a/app/components/currencies/page/List.vue b/app/components/currencies/page/List.vue
index 2e0d559f..931a767e 100644
--- a/app/components/currencies/page/List.vue
+++ b/app/components/currencies/page/List.vue
@@ -1,6 +1,7 @@
<script setup lang="ts">
import { currencies } from '~/components/currencies/currencies'
import { useCurrenciesStore } from '~/components/currencies/useCurrenciesStore'
+import { useCurrencyName } from '~/components/currencies/useCurrencyName'
import { useUserStore } from '~/components/user/useUserStore'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
@@ -8,15 +9,30 @@ const { t } = useI18n()
const currenciesStore = useCurrenciesStore()
const userStore = useUserStore()
const walletsStore = useWalletsStore()
+const { getCurrencyName } = useCurrencyName()
useHead({ title: t('currencies.page.title') })
const searchInput = ref('')
+const activeTab = ref<'fiat' | 'crypto'>('fiat')
const currencyMap = new Map(
- currencies.map(c => [c.code, { name: c.name, symbol: c.symbol }]),
+ currencies.map(c => [c.code, { symbol: c.symbol }]),
)
+// Fiat detection: Intl.DisplayNames knows ISO 4217 codes and returns
+// a translated name for fiat, but returns the code itself for unknown (crypto)
+const intlCurrencyNames = new Intl.DisplayNames('en', { type: 'currency' })
+function isFiatCode(code: string): boolean {
+ try {
+ const name = intlCurrencyNames.of(code)
+ return name !== undefined && name !== code
+ }
+ catch {
+ return false
+ }
+}
+
function getRate(code: string): number | undefined {
const base = currenciesStore.base
const rates = currenciesStore.rates
@@ -45,9 +61,8 @@ function filterBySearch(items: string[]): string[] {
const search = searchInput.value.toLowerCase()
return items.filter((code) => {
- const info = currencyMap.get(code)
return code.toLowerCase().includes(search)
- || info?.name.toLowerCase().includes(search)
+ || getCurrencyName(code).toLowerCase().includes(search)
})
}
@@ -55,11 +70,25 @@ const usedList = computed(() => {
return sortCurrencies(filterBySearch(walletsStore.currenciesUsed))
})
-const allList = computed(() => {
+const allRateCodes = computed(() => {
+ return Object.keys(currenciesStore.rates)
+})
+
+const fiatList = computed(() => {
const usedSet = new Set(walletsStore.currenciesUsed)
- const items = currencies.map(c => c.code).filter(code => !usedSet.has(code))
+ const items = allRateCodes.value.filter(code => isFiatCode(code) && !usedSet.has(code))
return sortCurrencies(filterBySearch(items))
})
+
+const cryptoList = computed(() => {
+ const usedSet = new Set(walletsStore.currenciesUsed)
+ const items = allRateCodes.value.filter(code => !isFiatCode(code) && !usedSet.has(code))
+ return sortCurrencies(filterBySearch(items))
+})
+
+const activeList = computed(() => {
+ return activeTab.value === 'fiat' ? fiatList.value : cryptoList.value
+})
</script>
<template>
@@ -90,29 +119,43 @@ const allList = computed(() => {
:key="code"
:code="code"
:isBase="code === currenciesStore.base"
- :name="currencyMap.get(code)?.name ?? code"
+ :name="getCurrencyName(code)"
:rate="getRate(code)"
:symbol="currencyMap.get(code)?.symbol"
@setBase="userStore.saveUserBaseCurrency"
/>
</div>
- <!-- All currencies -->
- <UiTitleCollapse isHideArrow>
- {{ t('currencies.page.showAll') }}
- </UiTitleCollapse>
-
- <div v-if="allList.length === 0" class="text-muted py-6 text-center text-sm">
+ <!-- Fiat / Crypto tabs -->
+ <UiTabsScroll class="mt-4 mb-2">
+ <UiTabsItemPill
+ :isActive="activeTab === 'fiat'"
+ variant="outline"
+ @click="activeTab = 'fiat'"
+ >
+ {{ t('currencies.page.fiat') }}
+ </UiTabsItemPill>
+
+ <UiTabsItemPill
+ :isActive="activeTab === 'crypto'"
+ variant="outline"
+ @click="activeTab = 'crypto'"
+ >
+ {{ t('currencies.page.crypto') }}
+ </UiTabsItemPill>
+ </UiTabsScroll>
+
+ <div v-if="activeList.length === 0" class="text-muted py-6 text-center text-sm">
{{ t('currencies.list.notFound') }}
</div>
<div v-else>
<CurrenciesItem
- v-for="code in allList"
+ v-for="code in activeList"
:key="code"
:code="code"
:isBase="code === currenciesStore.base"
- :name="currencyMap.get(code)?.name ?? code"
+ :name="getCurrencyName(code)"
:rate="getRate(code)"
:symbol="currencyMap.get(code)?.symbol"
@setBase="userStore.saveUserBaseCurrency"
diff --git a/app/components/stat/filter/Selector.vue b/app/components/stat/filter/Selector.vue
index ca4a6bb6..e09a9a3a 100644
--- a/app/components/stat/filter/Selector.vue
+++ b/app/components/stat/filter/Selector.vue
@@ -11,33 +11,35 @@ const { t } = useI18n()
</script>
<template>
- <StatFilterSelectorItem
- v-if="props.isShowWallets"
- :hasSelection="filter?.walletsIds.value.length > 0"
- :title="t('wallets.filter')"
- icon="hugeicons:wallet-01"
- >
- <WalletsSelector
- :selectedIds="filter?.walletsIds.value"
- class="min-w-80 px-3"
- @selected="filter.toggleWalletId"
- />
- </StatFilterSelectorItem>
-
- <StatFilterSelectorItem
- v-if="props.isShowCategories"
- :buttonLabel="t('base.close')"
- :hasSelection="filter?.categoriesIds.value.length > 0"
- :title="t('categories.filter')"
- icon="hugeicons:folder-library"
- >
- <div class="scrollerBlock overflow-y-auto">
- <CategoriesSelectorTree
- :selectedIds="filter?.categoriesIds.value"
+ <div>
+ <StatFilterSelectorItem
+ v-if="props.isShowWallets"
+ :hasSelection="filter?.walletsIds.value.length > 0"
+ :title="t('wallets.filter')"
+ icon="hugeicons:wallet-01"
+ >
+ <WalletsSelector
+ :selectedIds="filter?.walletsIds.value"
class="min-w-80 px-3"
- @selected="filter.toggleCategoryId"
- @setCategories="filter.setCategories"
+ @selected="filter.toggleWalletId"
/>
- </div>
- </StatFilterSelectorItem>
+ </StatFilterSelectorItem>
+
+ <StatFilterSelectorItem
+ v-if="props.isShowCategories"
+ :buttonLabel="t('base.close')"
+ :hasSelection="filter?.categoriesIds.value.length > 0"
+ :title="t('categories.filter')"
+ icon="hugeicons:folder-library"
+ >
+ <div class="scrollerBlock overflow-y-auto">
+ <CategoriesSelectorTree
+ :selectedIds="filter?.categoriesIds.value"
+ class="min-w-80 px-3"
+ @selected="filter.toggleCategoryId"
+ @setCategories="filter.setCategories"
+ />
+ </div>
+ </StatFilterSelectorItem>
+ </div>
</template>