Fix currency code error then more than 3 symbols used, account's amount editing error highlight, license year update

Author: isKONSTANTIN

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 FinWave App
+Copyright (c) 2025 FinWave App
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

components/accounts/entry.vue

@@ -37,6 +37,7 @@ import HideButton from "~/components/buttons/hideButton.vue";
 import EditButton from "~/components/buttons/editButton.vue";
 import DeleteButton from "~/components/buttons/deleteButton.vue";
 import WalletButton from "~/components/buttons/walletButton.vue";
+import {useCurrencyFormatter} from "~/composables/useCurrencyFormatter";
 
 const emit = defineEmits(['edit-modal', 'accumulation-modal']);
 
@@ -55,13 +56,7 @@ const { $currenciesApi, $accountsApi, $toastsManager } = useNuxtApp();
 const currency = $currenciesApi.getCurrencies().value.find(c => c.currencyId === props.account.currencyId)
 
 const formatAmount = (delta) => {
-  const formatter = Intl.NumberFormat(locale.value, {
-    style: 'currency',
-    currency: currency.code,
-    minimumFractionDigits: 2,
-    maximumFractionDigits: currency.decimals
-  });
-  return formatter.format(delta).replace(currency.code + " ", currency.symbol).replace(" " + currency.code, " " + currency.symbol);
+  return useCurrencyFormatter(delta, currency, locale.value);
 }
 
 const hide = () => {

components/accounts/summary.vue

@@ -16,20 +16,16 @@
 </template>
 
 <script setup>
+import {useCurrencyFormatter} from "~/composables/useCurrencyFormatter";
+
 const {$accountsApi, $currenciesApi} = useNuxtApp();
 const { t, locale } = useI18n();
 
 const accounts = $accountsApi.getAccounts();
 const currencyMap = $currenciesApi.getCurrenciesMap();
 
 const formatAmount = (delta, currency) => {
-  const formatter = Intl.NumberFormat(locale.value, {
-    style: 'currency',
-    currency: currency.code,
-    minimumFractionDigits: 2,
-    maximumFractionDigits: currency.decimals
-  });
-  return formatter.format(delta).replace(currency.code + " ", currency.symbol).replace(" " + currency.code, " " + currency.symbol);
+  return useCurrencyFormatter(delta, currency, locale.value);
 }
 
 const map = computed(() => {

components/analytics/categoriesAnalytics.vue

@@ -29,6 +29,8 @@
 </template>
 
 <script setup>
+import {useCurrencyFormatter} from "~/composables/useCurrencyFormatter";
+
 const { t, locale } = useI18n();
 
 const props = defineProps({
@@ -79,11 +81,8 @@ const budgetsMap = $categoriesBudgetApi.getBudgetsMap();
 
 const formatAmount = (delta, currencyId) => {
   const currency = currenciesMap.value.get(currencyId);
-  const formatter = Intl.NumberFormat(locale.value, {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: currency.decimals
-  });
-  return formatter.format(delta);
+
+  return useCurrencyFormatter(delta, currency, locale.value);
 }
 
 const fetchData = async () => {

components/analytics/pie.vue

@@ -45,6 +45,7 @@ import ApexChart from "vue3-apexcharts";
 import {TransactionsFilter} from "~/libs/api/transactions/TransactionsFilter";
 import Datepicker from "@vuepic/vue-datepicker";
 import {useColor} from "~/composables/useColor";
+import {useCurrencyFormatter} from "~/composables/useCurrencyFormatter";
 
 const props = defineProps({
   sign: {
@@ -145,14 +146,7 @@ $transactionsApi.registerUpdateListener(() => {
 const formatAmount = (delta) => {
   const currencyObject = currenciesMap.value.get(currency.value);
 
-  const formatter = Intl.NumberFormat(locale.value, {
-    style: 'currency',
-    currency: currencyObject.code,
-    minimumFractionDigits: 2,
-    maximumFractionDigits: currencyObject.decimals
-  });
-
-  return formatter.format(delta).replace(currencyObject.code + " ", currencyObject.symbol).replace(" " + currencyObject.code, " " + currencyObject.symbol);
+  return useCurrencyFormatter(delta, currencyObject, locale.value);
 }
 
 const formatter = (value) => {

components/analytics/totalByPeriod.vue

@@ -11,6 +11,7 @@
 
 import ApexChart from "vue3-apexcharts";
 import {TransactionsFilter} from "~/libs/api/transactions/TransactionsFilter";
+import {useCurrencyFormatter} from "~/composables/useCurrencyFormatter";
 
 const { $analyticsApi, $transactionsApi, $transactionsCategoriesApi, $currenciesApi, $serverConfigs } = useNuxtApp();
 const { t, locale } = useI18n();
@@ -58,14 +59,7 @@ const chartOptions = ref({
 });
 
 const formatAmount = (delta) => {
-  const formatter = Intl.NumberFormat(locale.value, {
-    style: 'currency',
-    currency: currency.value.code,
-    minimumFractionDigits: 2,
-    maximumFractionDigits: currency.value.decimals
-  });
-
-  return formatter.format(delta).replace(currency.value.code + " ", currency.value.symbol).replace(" " + currency.value.code, " " + currency.value.symbol);
+  return useCurrencyFormatter(delta, currency.value, locale.value);
 }
 
 const fetchData = async () => {

components/fw-footer.vue

@@ -19,7 +19,7 @@
       </svg>
       <div class="flex flex-col gap-1 flex-wrap">
         <p class="opacity-60 font-bold text-sm">
-          Copyright © 2024 <a href="https://finwave.app" target="_blank" class="underline">FinWave Project</a>. All rights reserved
+          Copyright © 2025 <a href="https://finwave.app" target="_blank" class="underline">FinWave Project</a>. All rights reserved
         </p>
         <p class="opacity-60 font-bold text-sm">
           This project is licensed under the <a href="/license.txt" target="_blank" class="underline">MIT License</a>.

components/misc/categoriesBudgetSummary.vue

@@ -66,6 +66,8 @@
 
 <script setup>
 
+import {useCurrencyFormatter} from "~/composables/useCurrencyFormatter";
+
 const { t, locale } = useI18n();
 const { $transactionsCategoriesApi, $categoriesBudgetApi, $currenciesApi } = useNuxtApp();
 
@@ -79,13 +81,8 @@ const expectExpanses = ref([]);
 
 const formatDelta = (delta, currencyId) => {
   const currency = currenciesMap.value.get(currencyId);
-  const formatter = Intl.NumberFormat(locale.value, {
-    style: 'currency',
-    currency: currency.code,
-    minimumFractionDigits: 2,
-    maximumFractionDigits: currency.decimals
-  });
-  return formatter.format(delta).replace(currency.code + " ", currency.symbol).replace(" " + currency.code, " " + currency.symbol);
+
+  return useCurrencyFormatter(delta, currency, locale.value);
 }
 
 const capitalizeFirstLetter = (string) => {

components/modal/account/edit.vue

@@ -46,6 +46,7 @@
     <div v-else-if="tab === 1" class="w-full flex flex-col gap-2">
       <select-transaction-category class="w-full"
                               v-model.number="category"
+                              :class="{'input-error' : highlightErrors && !category }"
                               :searchable="true"
                               :can-be-without-parent="false"
                               :categories-tree="categoriesTree"
@@ -60,6 +61,7 @@
 
         <input type="number"
                class="input input-bordered join-item w-full"
+               :class="{'input-error' : highlightErrors && newAmount === props.account.amount }"
                :placeholder="$t('modals.editAccount.placeholders.amount')"
                v-model="newAmount"
         >
@@ -111,6 +113,7 @@ const description = ref();
 const folder = ref();
 
 const newAmount = ref(0);
+const highlightErrors = ref(false);
 const allValid = computed(() => props.account && category.value && newAmount.value !== props.account.amount)
 
 const nameSyncStatus = ref(1);
@@ -204,8 +207,11 @@ const syncFolder = () => {
 }
 
 const applyNewAmount = () => {
-  if (!allValid.value)
+  if (!allValid.value) {
+    highlightErrors.value = true;
     return
+  }
+  highlightErrors.value = false;
 
   close();
 

components/transactions/table/tableEntry.vue

@@ -119,6 +119,8 @@
 </template>
 
 <script setup>
+import {useCurrencyFormatter} from "~/composables/useCurrencyFormatter";
+
 const props = defineProps({
   transaction: {
     required: true
@@ -139,13 +141,7 @@ const exchangeRateMode = ref(false);
 
 const formatDelta = (delta, currencyId) => {
   const currency = currenciesMap.value.get(currencyId);
-  const formatter = Intl.NumberFormat(locale.value, {
-    style: 'currency',
-    currency: currency.code,
-    minimumFractionDigits: 2,
-    maximumFractionDigits: currency.decimals
-  });
-  return formatter.format(delta).replace(currency.code + " ", currency.symbol).replace(" " + currency.code, " " + currency.symbol);
+  return useCurrencyFormatter(delta, currency, locale.value);
 }
 
 const formatExchangeRate = (transaction, mode) => {