diff --git a/src/components/desktop/TwoColumnSelect.vue b/src/components/desktop/TwoColumnSelect.vue index 2f5dc8a2..8edbd9bc 100644 --- a/src/components/desktop/TwoColumnSelect.vue +++ b/src/components/desktop/TwoColumnSelect.vue @@ -11,14 +11,15 @@ > @@ -85,6 +86,7 @@ export default { 'disabled', 'readonly', 'label', + 'selectionText', 'showPrimaryName', 'showSecondaryIcon', 'primaryKeyField', diff --git a/src/views/desktop/transactions/list/dialogs/EditDialog.vue b/src/views/desktop/transactions/list/dialogs/EditDialog.vue index 05002ce9..9ce09291 100644 --- a/src/views/desktop/transactions/list/dialogs/EditDialog.vue +++ b/src/views/desktop/transactions/list/dialogs/EditDialog.vue @@ -130,7 +130,7 @@ secondary-icon-field="icon" secondary-icon-type="account" secondary-color-field="color" :readonly="mode === 'view'" :disabled="loading || submitting || !allVisibleAccounts.length" - :show-secondary-icon="true" + :selection-text="sourceAccountName" :label="$t(sourceAccountTitle)" :placeholder="$t(sourceAccountTitle)" :items="categorizedAccounts" @@ -148,7 +148,7 @@ secondary-icon-field="icon" secondary-icon-type="account" secondary-color-field="color" :readonly="mode === 'view'" :disabled="loading || submitting || !allVisibleAccounts.length" - :show-secondary-icon="true" + :selection-text="destinationAccountName" :label="$t('Destination Account')" :placeholder="$t('Destination Account')" :items="categorizedAccounts" @@ -316,6 +316,9 @@ import { useExchangeRatesStore } from '@/stores/exchangeRates.js'; import categoryConstants from '@/consts/category.js'; import transactionConstants from '@/consts/transaction.js'; import logger from '@/lib/logger.js'; +import { + getNameByKeyValue +} from '@/lib/common.js'; import { getUtcOffsetByUtcOffsetMinutes, getTimezoneOffsetMinutes, @@ -475,6 +478,20 @@ export default { const firstAvailableCategoryId = getFirstAvailableCategoryId(this.allCategories[this.allCategoryTypes.Transfer]); return firstAvailableCategoryId !== ''; }, + sourceAccountName() { + if (this.transaction.sourceAccountId) { + return getNameByKeyValue(this.allAccounts, this.transaction.sourceAccountId, 'id', 'name'); + } else { + return this.$t('None'); + } + }, + destinationAccountName() { + if (this.transaction.destinationAccountId) { + return getNameByKeyValue(this.allAccounts, this.transaction.destinationAccountId, 'id', 'name'); + } else { + return this.$t('None'); + } + }, transactionDisplayTimezone() { return `UTC${getUtcOffsetByUtcOffsetMinutes(this.transaction.utcOffset)}`; },