diff --git a/src/components/desktop/CurrencySelect.vue b/src/components/desktop/CurrencySelect.vue new file mode 100644 index 00000000..592a8087 --- /dev/null +++ b/src/components/desktop/CurrencySelect.vue @@ -0,0 +1,86 @@ + + + + {{ currentCurrencyValue }} + + + + + + + + {{ item.title }} + + + {{ item.raw.currencyCode }} + + + + + + + + + diff --git a/src/desktop-main.ts b/src/desktop-main.ts index 66385044..08a9fc96 100644 --- a/src/desktop-main.ts +++ b/src/desktop-main.ts @@ -80,6 +80,7 @@ import BtnVerticalGroup from '@/components/desktop/BtnVerticalGroup.vue'; import AmountInput from '@/components/desktop/AmountInput.vue'; import LanguageSelect from '@/components/desktop/LanguageSelect.vue'; import LanguageSelectButton from '@/components/desktop/LanguageSelectButton.vue'; +import CurrencySelect from '@/components/desktop/CurrencySelect.vue'; import DateTimeSelect from '@/components/desktop/DateTimeSelect.vue'; import DateSelect from '@/components/desktop/DateSelect.vue'; import ColorSelect from '@/components/desktop/ColorSelect.vue'; @@ -454,6 +455,7 @@ app.component('BtnVerticalGroup', BtnVerticalGroup); app.component('AmountInput', AmountInput); app.component('LanguageSelect', LanguageSelect); app.component('LanguageSelectButton', LanguageSelectButton); +app.component('CurrencySelect', CurrencySelect); app.component('DateTimeSelect', DateTimeSelect); app.component('DateSelect', DateSelect); app.component('ColorSelect', ColorSelect); diff --git a/src/views/base/accounts/AccountEditPageBase.ts b/src/views/base/accounts/AccountEditPageBase.ts index 9ed09781..254225da 100644 --- a/src/views/base/accounts/AccountEditPageBase.ts +++ b/src/views/base/accounts/AccountEditPageBase.ts @@ -6,7 +6,6 @@ import { useUserStore } from '@/stores/user.ts'; import type { TypeAndDisplayName } from '@/core/base.ts'; import { AccountCategory, AccountType } from '@/core/account.ts'; -import type { LocalizedCurrencyInfo } from '@/core/currency.ts'; import type { LocalizedAccountCategory } from '@/core/account.ts'; import { Account } from '@/models/account.ts'; @@ -19,7 +18,7 @@ export interface DayAndDisplayName { } export function useAccountEditPageBaseBase() { - const { tt, getAllCurrencies, getAllAccountCategories, getAllAccountTypes, getMonthdayShortName } = useI18n(); + const { tt, getAllAccountCategories, getAllAccountTypes, getMonthdayShortName } = useI18n(); const userStore = useUserStore(); @@ -48,7 +47,6 @@ export function useAccountEditPageBaseBase() { const allAccountCategories = computed(() => getAllAccountCategories()); const allAccountTypes = computed(() => getAllAccountTypes()); - const allCurrencies = computed(() => getAllCurrencies()); const allAvailableMonthDays = computed(() => { const allAvailableDays: DayAndDisplayName[] = []; @@ -171,7 +169,6 @@ export function useAccountEditPageBaseBase() { saveButtonTitle, allAccountCategories, allAccountTypes, - allCurrencies, allAvailableMonthDays, isAccountSupportCreditCardStatementDate, // functions diff --git a/src/views/base/users/UserProfilePageBase.ts b/src/views/base/users/UserProfilePageBase.ts index b2d2c850..fad6f837 100644 --- a/src/views/base/users/UserProfilePageBase.ts +++ b/src/views/base/users/UserProfilePageBase.ts @@ -9,7 +9,6 @@ import { useOverviewStore } from '@/stores/overview.ts'; import type { TypeAndDisplayName } from '@/core/base.ts'; import { WeekDay } from '@/core/datetime.ts'; import type { LocalizedDigitGroupingType } from '@/core/numeral.ts'; -import type { LocalizedCurrencyInfo } from '@/core/currency.ts'; import { type UserBasicInfo, User } from '@/models/user.ts'; import { type CategorizedAccount, Account} from '@/models/account.ts'; @@ -22,7 +21,6 @@ export function useUserProfilePageBase() { tt, getDefaultCurrency, getDefaultFirstDayOfWeek, - getAllCurrencies, getAllWeekDays, getAllLongDateFormats, getAllShortDateFormats, @@ -53,7 +51,6 @@ export function useUserProfilePageBase() { const resending = ref(false); const saving = ref(false); - const allCurrencies = computed(() => getAllCurrencies()); const allAccounts = computed(() => accountsStore.allPlainAccounts); const allVisibleAccounts = computed(() => accountsStore.allVisiblePlainAccounts); const allVisibleCategorizedAccounts = computed(() => getCategorizedAccounts(allVisibleAccounts.value)); @@ -186,7 +183,6 @@ export function useUserProfilePageBase() { resending, saving, // computed states - allCurrencies, allAccounts, allVisibleAccounts, allVisibleCategorizedAccounts, diff --git a/src/views/desktop/SignupPage.vue b/src/views/desktop/SignupPage.vue index 3ae50b5e..49eee5f2 100644 --- a/src/views/desktop/SignupPage.vue +++ b/src/views/desktop/SignupPage.vue @@ -99,21 +99,10 @@ - - - {{ user.defaultCurrency }} - - + @@ -229,7 +218,6 @@ import { useSignupPageBase } from '@/views/base/SignupPageBase.ts'; import { useRootStore } from '@/stores/index.ts'; import type { PartialRecord, TypeAndDisplayName } from '@/core/base.ts'; -import type { LocalizedCurrencyInfo } from '@/core/currency.ts'; import { type LocalizedPresetCategory, CategoryType } from '@/core/category.ts'; import { ThemeType } from '@/core/theme.ts'; import { APPLICATION_LOGO_PATH } from '@/consts/asset.ts'; @@ -248,7 +236,7 @@ type SnackBarType = InstanceType; const router = useRouter(); const theme = useTheme(); -const { tt, getAllCurrencies, getAllWeekDays, getAllTransactionDefaultCategories } = useI18n(); +const { tt, getAllWeekDays, getAllTransactionDefaultCategories } = useI18n(); const { user, @@ -270,7 +258,6 @@ const usePresetCategories = ref(false); const finalResultMessage = ref(null); const navigateToHomePage = ref(false); -const allCurrencies = computed(() => getAllCurrencies()); const allWeekDays = computed(() => getAllWeekDays()); const allPresetCategories = computed>(() => getAllTransactionDefaultCategories(0, currentLocale.value)); const isDarkMode = computed(() => theme.global.name.value === ThemeType.Dark); diff --git a/src/views/desktop/accounts/list/dialogs/EditDialog.vue b/src/views/desktop/accounts/list/dialogs/EditDialog.vue index 055ec127..c4d9befc 100644 --- a/src/views/desktop/accounts/list/dialogs/EditDialog.vue +++ b/src/views/desktop/accounts/list/dialogs/EditDialog.vue @@ -109,22 +109,10 @@ v-model="selectedAccount.color" /> - - - {{ selectedAccount.currency }} - - + - - - {{ newProfile.defaultCurrency }} - - + @@ -361,7 +349,6 @@ const { loading, resending, saving, - allCurrencies, allVisibleAccounts, allVisibleCategorizedAccounts, allWeekDays, diff --git a/src/views/mobile/accounts/EditPage.vue b/src/views/mobile/accounts/EditPage.vue index 8e6d11be..df824563 100644 --- a/src/views/mobile/accounts/EditPage.vue +++ b/src/views/mobile/accounts/EditPage.vue @@ -506,7 +506,7 @@