diff --git a/backend/src/graphql/model/Balance.ts b/backend/src/graphql/model/Balance.ts index 6a93a5b63..619d9b242 100644 --- a/backend/src/graphql/model/Balance.ts +++ b/backend/src/graphql/model/Balance.ts @@ -1,6 +1,5 @@ import { ObjectType, Field } from 'type-graphql' import Decimal from 'decimal.js-light' -import CONFIG from '@/config' @ObjectType() export class Balance { @@ -11,7 +10,6 @@ export class Balance { balanceGDT: number | null count: number linkCount: number - decayStartBlock?: Date lastBookedDate?: Date | null }) { this.balance = data.balance @@ -20,7 +18,6 @@ export class Balance { this.balanceGDT = data.balanceGDT || null this.count = data.count this.linkCount = data.linkCount - this.decayStartBlock = data.decayStartBlock || CONFIG.DECAY_START_TIME this.lastBookedDate = data.lastBookedDate || null } @@ -46,9 +43,6 @@ export class Balance { @Field(() => Number) linkCount: number - @Field(() => Date) - decayStartBlock: Date - // may be null as there may be no transaction @Field(() => Date, { nullable: true }) lastBookedDate: Date | null diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts index 04f849727..11a675eeb 100644 --- a/backend/src/seeds/graphql/queries.ts +++ b/backend/src/seeds/graphql/queries.ts @@ -59,7 +59,6 @@ export const transactionsQuery = gql` balanceGDT count balance - decayStartBlock transactions { id typeId diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index 53a296713..68577d0b5 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -168,6 +168,10 @@ a, background-color: #ebebeba3 !important; } +.gradido-shadow-inset { + box-shadow: inset 0.3em rgba(241 187 187 / 100%); +} + .gradido-max-width { width: 100%; } diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js index b533c6aa1..4fc527e39 100644 --- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js +++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js @@ -9,6 +9,7 @@ const mocks = { }, $tc: jest.fn((tc) => tc), $t: jest.fn((t) => t), + $d: jest.fn((d) => d), } const propsData = { diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue index 5802bfb4b..3d42f11f8 100644 --- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue +++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue @@ -50,7 +50,6 @@ export default { name: 'DecayInformation-StartBlock', props: { balanceDate: { type: String }, - decayStartBlock: { type: Date }, amount: { type: String, }, diff --git a/frontend/src/components/DecayInformations/DecayInformation.vue b/frontend/src/components/DecayInformations/DecayInformation.vue index ae76a5bb4..690f6532b 100644 --- a/frontend/src/components/DecayInformations/DecayInformation.vue +++ b/frontend/src/components/DecayInformations/DecayInformation.vue @@ -14,6 +14,7 @@ import DecayInformationLong from '../DecayInformations/DecayInformation-Long' import DecayInformationBeforeStartblock from '../DecayInformations/DecayInformation-BeforeStartblock' import DecayInformationDecayStartblock from '../DecayInformations/DecayInformation-DecayStartblock' +import CONFIG from '@/config' export default { components: { @@ -34,14 +35,10 @@ export default { type: String, required: true, }, - decayStartBlock: { - type: Date, - required: true, - }, }, computed: { isStartBlock() { - return new Date(this.decay.start).getTime() === this.decayStartBlock.getTime() + return new Date(this.decay.start).getTime() === CONFIG.DECAY_START_TIME.getTime() }, }, } diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue index 4498034e9..34f7c24ab 100644 --- a/frontend/src/components/GddTransactionList.vue +++ b/frontend/src/components/GddTransactionList.vue @@ -26,7 +26,6 @@ @@ -36,7 +35,6 @@ @@ -46,7 +44,6 @@ @@ -105,7 +102,6 @@ export default { } }, props: { - decayStartBlock: { type: Date }, transactions: { default: () => [] }, pageSize: { type: Number, default: 25 }, timestamp: { type: Number, default: 0 }, diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js index f019a0ee1..4a2bb7b3c 100644 --- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js +++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js @@ -13,6 +13,7 @@ const mocks = { locale: 'en', }, $t: jest.fn((t) => t), + $d: jest.fn((d) => d), $tc: jest.fn((tc) => tc), $apollo: { mutate: mockAPIcall, diff --git a/frontend/src/components/TransactionRows/DateRow.vue b/frontend/src/components/TransactionRows/DateRow.vue index 7f93656f7..5f526caaf 100644 --- a/frontend/src/components/TransactionRows/DateRow.vue +++ b/frontend/src/components/TransactionRows/DateRow.vue @@ -8,7 +8,7 @@
- {{ dateString }} + {{ $d(new Date(this.date), 'long') }}
@@ -28,12 +28,5 @@ export default { default: false, }, }, - computed: { - dateString() { - return this.diffNow - ? this.$moment(this.date).locale(this.$i18n.locale).fromNow() - : this.$d(new Date(this.date), 'long') - }, - }, } diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue index dce11307b..694d907ed 100644 --- a/frontend/src/components/Transactions/TransactionCreation.vue +++ b/frontend/src/components/Transactions/TransactionCreation.vue @@ -27,12 +27,7 @@ - + @@ -82,10 +77,6 @@ export default { type: String, required: true, }, - decayStartBlock: { - type: Date, - required: true, - }, previousBookedBalance: { type: String, required: true, diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js index 1f2a4388c..078ce6f97 100644 --- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js +++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js @@ -12,6 +12,7 @@ const mocks = { locale: 'en', }, $t: jest.fn((t) => t), + $d: jest.fn((d) => d), $tc: jest.fn((tc) => tc), $apollo: { query: apolloQueryMock, diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.vue b/frontend/src/components/Transactions/TransactionLinkSummary.vue index 3f80bfd18..7807a5bf7 100644 --- a/frontend/src/components/Transactions/TransactionLinkSummary.vue +++ b/frontend/src/components/Transactions/TransactionLinkSummary.vue @@ -1,5 +1,5 @@