IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-03-01 12:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

change conflicts fixed

Browse Source
This commit is contained in:
ogerly 2022-02-08 15:06:26 +01:00
parent 55573ea2ce
commit 9b22b42457
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
View File

@ -31,7 +31,11 @@
>
<!-- Collaps Button -->
<div
v-if="(type !== 'decay' && decay) || firstTransaction"
v-if="
(type != 'decay' && decay) ||
firstTransaction ||
(!firstTransaction && decay === null)
"
class="text-right"
style="width: 95%; position: absolute"
>
@ -123,7 +127,11 @@
<!-- Collaps Start -->
<b-collapse
v-if="(type !== 'decay' && decay) || firstTransaction"
v-if="
(type != 'decay' && decay) ||
firstTransaction ||
(!firstTransaction && decay === null)
"
class="pb-4"
:id="'decay-' + transactionId"
>
@ -138,6 +146,10 @@
<div v-if="firstTransaction" class="mt-3 mb-3 text-center">
<b>{{ $t('decay.first_transaction') }}</b>
</div>
<div v-if="!firstTransaction && decay === null" class="mt-3 mb-3 text-center">
<b>{{ $t('decay.first_transaction') }}</b>
</div>
</div>
</b-collapse>