Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list

2025-12-13 07:45:54 +00:00 · 2022-04-05 09:43:18 +02:00 · 2022-04-05 09:43:18 +02:00 · fd5dca7eba
commit fd5dca7eba
parent 227f81f35a 3da5b458c2
13 changed files with 37 additions and 24 deletions
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@ -39,10 +39,10 @@

    <b-row class="mt-4">
      <b-col>
-        <b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
+        <b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
      </b-col>
      <b-col class="text-right">
-        <b-button variant="success" :disabled="disabled" @click="$emit('send-transaction')">
+        <b-button variant="primary" :disabled="disabled" @click="$emit('send-transaction')">
          {{ $t('form.generate_now') }}
        </b-button>
      </b-col>
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
@ -53,7 +53,7 @@ describe('GddSend confirm', () => {

        describe('single click', () => {
          beforeEach(async () => {
-            await wrapper.find('button.btn-success').trigger('click')
+            await wrapper.find('button.btn-primary').trigger('click')
          })

          it('emits send transaction one time', () => {
@ -63,8 +63,8 @@ describe('GddSend confirm', () => {

        describe('double click', () => {
          beforeEach(async () => {
-            await wrapper.find('button.btn-success').trigger('click')
-            await wrapper.find('button.btn-success').trigger('click')
+            await wrapper.find('button.btn-primary').trigger('click')
+            await wrapper.find('button.btn-primary').trigger('click')
          })

          it('emits send transaction one time', () => {
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@ -55,11 +55,11 @@

    <b-row class="mt-4">
      <b-col>
-        <b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
+        <b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
      </b-col>
      <b-col class="text-right">
        <b-button
-          variant="success"
+          variant="primary"
          :disabled="disabled"
          @click="$emit('send-transaction'), (disabled = true)"
        >
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@ -249,7 +249,7 @@ Die ganze Welt bezwingen.“`)
          })

          it('has the text "form.cancel"', () => {
-            expect(wrapper.find('button[type="reset"]').text()).toBe('form.reset')
+            expect(wrapper.find('button[type="reset"]').text()).toBe('form.cancel')
          })

          it('clears all fields on click', async () => {
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@ -139,14 +139,12 @@
            <b-row v-else class="test-buttons">
              <b-col>
                <b-button type="reset" variant="secondary" @click="onReset">
-                  {{ $t('form.reset') }}
+                  {{ $t('form.cancel') }}
                </b-button>
              </b-col>
              <b-col class="text-right">
-                <b-button type="submit" variant="success">
-                  {{
-                    radioSelected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now')
-                  }}
+                <b-button type="submit" variant="primary">
+                  {{ $t('form.check_now') }}
                </b-button>
              </b-col>
            </b-row>
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@ -70,7 +70,8 @@
      :total-rows="transactionCount"
    ></pagination-buttons>
    <div v-if="transactionCount <= 0" class="mt-4 text-center">
-      <span>{{ $t('transaction.nullTransactions') }}</span>
+      <b-icon v-if="pending" icon="three-dots" animation="cylon"></b-icon>
+      <div v-else>{{ $t('transaction.nullTransactions') }}</div>
    </div>
  </div>
 </template>
@ -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() {
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@ -10,7 +10,10 @@
      </div>

      <b-navbar-nav class="ml-auto" is-nav>
-        <b-nav-item>{{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }}</b-nav-item>
+        <b-nav-item>
+          <b-icon v-if="pending" icon="three-dots" animation="cylon"></b-icon>
+          <div v-else>{{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }}</div>
+        </b-nav-item>
        <b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
          <small>
            {{ $store.state.firstName }} {{ $store.state.lastName }}
--- 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')
      })
--- a/frontend/src/components/Status.vue
+++ b/frontend/src/components/Status.vue
@ -1,7 +1,10 @@
 <template>
  <div class="gdd-status">
    <div class="p-0 gdd-status-div">
-      {{ pending || balance === null ? $t('em-dash') : $n(balance, 'decimal') }} {{ statusText }}
+      <b-icon v-if="pending" icon="three-dots" animation="cylon" class="test-pending-icon"></b-icon>
+      <div v-else>
+        {{ pending || balance === null ? $t('em-dash') : $n(balance, 'decimal') }} {{ statusText }}
+      </div>
    </div>
  </div>
 </template>
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@ -52,6 +52,7 @@
    "amount": "Betrag",
    "at": "am",
    "cancel": "Abbrechen",
+    "check_now": "Jetzt prüfen",
    "close": "Schließen",
    "current_balance": "Aktueller Kontostand",
    "date": "Datum",
@ -60,7 +61,7 @@
    "email": "E-Mail",
    "firstname": "Vorname",
    "from": "Von",
-    "generate_now": "jetzt generieren",
+    "generate_now": "Jetzt generieren",
    "lastname": "Nachname",
    "memo": "Nachricht",
    "message": "Nachricht",
@ -95,7 +96,7 @@
  },
  "GDD": "GDD",
  "gdd_per_link": {
-    "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
+    "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
    "copy": "kopieren",
    "created": "Der Link wurde erstellt!",
    "decay-14-day": "Vergänglichkeit für 14 Tage",
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@ -52,6 +52,7 @@
    "amount": "Amount",
    "at": "at",
    "cancel": "Cancel",
+    "check_now": "Check now",
    "close": "Close",
    "current_balance": "Current Balance",
    "date": "Date",
--- 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"
      />
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@ -101,7 +101,7 @@ describe('Send', () => {
            jest.clearAllMocks()
            await wrapper
              .findComponent({ name: 'TransactionConfirmationSend' })
-              .find('button.btn-success')
+              .find('button.btn-primary')
              .trigger('click')
          })

@ -135,7 +135,7 @@ describe('Send', () => {
            apolloMutationMock.mockRejectedValue({ message: 'recipient not known' })
            await wrapper
              .findComponent({ name: 'TransactionConfirmationSend' })
-              .find('button.btn-success')
+              .find('button.btn-primary')
              .trigger('click')
          })

@ -182,7 +182,7 @@ describe('Send', () => {
          jest.clearAllMocks()
          await wrapper
            .findComponent({ name: 'TransactionConfirmationLink' })
-            .find('button.btn-success')
+            .find('button.btn-primary')
            .trigger('click')
        })

@ -264,7 +264,7 @@ describe('Send', () => {
          apolloMutationMock.mockRejectedValue({ message: 'OUCH!' })
          await wrapper
            .findComponent({ name: 'TransactionConfirmationLink' })
-            .find('button.btn-success')
+            .find('button.btn-primary')
            .trigger('click')
        })