+
{{ $t('send') }}
@@ -10,15 +10,15 @@
{{ $t('transactions') }}
@@ -33,6 +33,7 @@
:gdt-balance="GdtBalance"
:transactions="transactions"
:transactionCount="transactionCount"
+ :pending="pending"
@update-balance="updateBalance"
@update-transactions="updateTransactions"
>
@@ -83,6 +84,7 @@ export default {
transactions: [],
bookedBalance: 0,
transactionCount: 0,
+ pending: true,
}
},
methods: {
@@ -99,6 +101,7 @@ export default {
this.$router.push('/login')
},
async updateTransactions() {
+ this.pending = true
const result = await communityAPI.transactions(this.$store.state.sessionId)
if (result.success) {
this.GdtBalance = Number(result.result.data.gdtSum)
@@ -106,7 +109,9 @@ export default {
this.balance = Number(result.result.data.decay)
this.bookedBalance = Number(result.result.data.balance)
this.transactionCount = result.result.data.count
+ this.pending = false
} else {
+ this.pending = true
// what to do when loading balance fails?
}
},
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 3ca7ef9af..12153c8e4 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -2,7 +2,12 @@
-
+
@@ -78,6 +83,10 @@ export default {
default: () => [],
},
transactionCount: { type: Number, default: 0 },
+ pending: {
+ type: Boolean,
+ default: true,
+ },
},
computed: {
showContext() {
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js b/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
index 9adc3b4ca..b414f4e93 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
@@ -24,12 +24,30 @@ describe('GddStatus', () => {
wrapper = Wrapper()
})
- it('it displays the ammount of GDD', () => {
- expect(wrapper.findAll('div.card-body').at(0).text()).toEqual('1234 GDD')
+ describe('balance is loading', () => {
+ it('it displays em-dash as the ammount of GDD', () => {
+ expect(wrapper.findAll('div.card-body').at(0).text()).toEqual('— GDD')
+ })
+
+ it('it displays em-dash as the ammount of GDT', () => {
+ expect(wrapper.findAll('div.card-body').at(1).text()).toEqual('— GDT')
+ })
})
- it('it displays the ammount of GDT', () => {
- expect(wrapper.findAll('div.card-body').at(1).text()).toEqual('9876 GDT')
+ describe('balance is loaded', () => {
+ beforeEach(() => {
+ wrapper.setProps({
+ pending: false,
+ })
+ })
+
+ it('it displays the ammount of GDD', () => {
+ expect(wrapper.findAll('div.card-body').at(0).text()).toEqual('1234 GDD')
+ })
+
+ it('it displays the ammount of GDT', () => {
+ expect(wrapper.findAll('div.card-body').at(1).text()).toEqual('9876 GDT')
+ })
})
})
})
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.vue b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
index 8698d1fdc..f1e24b09b 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
@@ -8,7 +8,7 @@
class="mb-4 h1"
style="background-color: #ebebeba3 !important"
>
- {{ $n(balance) }} GDD
+ {{ pending ? '—' : $n(balance) }} GDD
@@ -18,7 +18,7 @@
class="mb-4 h1"
style="background-color: #ebebeba3 !important"
>
- {{ $n(GdtBalance) }} GDT
+ {{ pending ? '—' : $n(GdtBalance) }} GDT
@@ -31,6 +31,10 @@ export default {
props: {
balance: { type: Number, default: 0 },
GdtBalance: { type: Number, default: 0 },
+ pending: {
+ type: Boolean,
+ default: true,
+ },
},
}