diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue index 37605711c..55a11063c 100644 --- a/frontend/src/components/GddTransactionList.vue +++ b/frontend/src/components/GddTransactionList.vue @@ -70,7 +70,8 @@ :total-rows="transactionCount" >
- {{ $t('transaction.nullTransactions') }} + +
{{ $t('transaction.nullTransactions') }}
@@ -108,6 +109,7 @@ export default { transactionCount: { type: Number, default: 0 }, transactionLinkCount: { type: Number, default: 0 }, showPagination: { type: Boolean, default: false }, + pending: { type: Boolean }, }, methods: { updateTransactions() { diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 3542c1cd1..f998783f7 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -10,7 +10,10 @@ - {{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }} + + +
{{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }}
+
{{ $store.state.firstName }} {{ $store.state.lastName }} diff --git a/frontend/src/components/Status.spec.js b/frontend/src/components/Status.spec.js index ba7b03fa4..64a15deb1 100644 --- a/frontend/src/components/Status.spec.js +++ b/frontend/src/components/Status.spec.js @@ -26,8 +26,8 @@ describe('Status', () => { }) describe('balance is pending', () => { - it('it displays an en-dash', () => { - expect(wrapper.find('div.gdd-status-div').text()).toEqual('em-dash GDD') + it('displays an animation icon test-pending-icon', () => { + expect(wrapper.find('.test-pending-icon').exists()).toBe(true) }) }) @@ -38,6 +38,10 @@ describe('Status', () => { }) }) + it('does not display an animation icon test-pending-icon', () => { + expect(wrapper.find('.test-pending-icon').exists()).toBe(false) + }) + it('it displays the ammount of GDD', () => { expect(wrapper.find('div.gdd-status-div').text()).toEqual('1234 GDD') }) diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue index 9ebe48e09..14d470fb3 100644 --- a/frontend/src/components/Status.vue +++ b/frontend/src/components/Status.vue @@ -1,7 +1,10 @@ diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue index d42576bf8..9723f6ade 100644 --- a/frontend/src/pages/Overview.vue +++ b/frontend/src/pages/Overview.vue @@ -21,6 +21,7 @@ :decayStartBlock="decayStartBlock" :transaction-count="transactionCount" :transactionLinkCount="transactionLinkCount" + :pending="pending" @update-transactions="updateTransactions" v-on="$listeners" />