diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index e72fbb1c4..53a296713 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -52,7 +52,6 @@ // Bootstrap-vue (2.21.1) scss @import "~bootstrap-vue/src/index"; - .alert-success { color: #155724; background-color: #d4edda; diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue index caf6ddbbc..239eddfb7 100644 --- a/frontend/src/components/ClipboardCopy.vue +++ b/frontend/src/components/ClipboardCopy.vue @@ -18,7 +18,7 @@ export default { }, data() { return { - url: `http://localhost/redeem/${this.code}`, + url: `${window.location.origin}/redeem/${this.code}`, } }, methods: { diff --git a/frontend/src/components/GddSend/TransactionConfirmation.vue b/frontend/src/components/GddSend/TransactionConfirmation.vue index da454518d..71ecc88d7 100644 --- a/frontend/src/components/GddSend/TransactionConfirmation.vue +++ b/frontend/src/components/GddSend/TransactionConfirmation.vue @@ -26,7 +26,7 @@
GDD
-
{{ $n(amount, 'decimal') }}
+
{{ amount | GDD }}

@@ -45,14 +45,14 @@
{{ $t('advanced-calculation') }}
{{ $t('form.current_balance') }} - {{ $n(balance, 'decimal') }} + {{ balance | GDD }} {{ $t('form.your_amount') }} - - {{ $n(amount, 'decimal') }} + - {{ amount | GDD }} @@ -60,7 +60,7 @@ Vergänglichkeit für 14 Tage - - {{ $n(amount * 0.028, 'decimal') }} + ~ {{ $n(amount * 0.028, 'decimal') }} @@ -88,12 +88,12 @@ export default { name: 'TransactionConfirmation', props: { - balance: { type: Number, default: 0, required: true }, - email: { type: String, default: '', required: false }, - amount: { type: Number, default: 0, required: true }, - memo: { type: String, default: '', required: true }, - loading: { type: Boolean, default: false, required: true }, - selected: { type: String, default: 'send', required: true }, + balance: { type: Number, required: true }, + email: { type: String, required: false, default: '' }, + amount: { type: Number, required: true }, + memo: { type: String, required: true }, + loading: { type: Boolean, required: true }, + selected: { type: String, required: true }, }, } diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js index 635b1f811..49b2174e0 100644 --- a/frontend/src/components/GddSend/TransactionForm.spec.js +++ b/frontend/src/components/GddSend/TransactionForm.spec.js @@ -69,7 +69,7 @@ describe('GddSend', () => { }) describe('transaction form show because balance 100,0 GDD', () => { it('has no warning message ', () => { - expect(wrapper.find('.text-danger').exists()).toBeFalsy() + expect(wrapper.find('.errors').exists()).toBeFalsy() }) it('has a reset button', () => { expect(wrapper.find('.test-buttons').findAll('button').at(0).attributes('type')).toBe( diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 32696c41f..ac7187318 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -238,8 +238,7 @@ }, "transaction-link": { "button": "einlösen", - "send_you": "sendet dir", - "subtitle": "subtitle" + "send_you": "sendet dir" }, "transactions": "Transaktionen", "whitepaper": "Whitepaper" diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 2b76d660a..7ec2d5100 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -238,8 +238,7 @@ }, "transaction-link": { "button": "redeem", - "send_you": "wants to send you", - "subtitle": "subtitle" + "send_you": "wants to send you" }, "transactions": "Transactions", "whitepaper": "Whitepaper" diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js index d3d9acb91..e71d71d2d 100644 --- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js +++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js @@ -18,9 +18,6 @@ const createMockObject = (code) => { $i18n: { locale: () => 'en', }, - $store: { - // commit: stateCommitMock, - }, $apollo: { query: queryTransactionLink, }, diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue index 050657d95..d99ef29bb 100644 --- a/frontend/src/pages/ShowTransactionLinkInformations.vue +++ b/frontend/src/pages/ShowTransactionLinkInformations.vue @@ -5,7 +5,7 @@

- {{ username }} + {{ displaySetup.user.firstName }} {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}

{{ displaySetup.memo }}

@@ -51,11 +51,6 @@ export default { }) }, }, - computed: { - username() { - return this.displaySetup.user.firstName + ' ' + this.displaySetup.user.lastName - }, - }, created() { this.setTransactionLinkInformation() }, diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js index cfb2bdb0d..4c454a9b4 100644 --- a/frontend/src/routes/router.test.js +++ b/frontend/src/routes/router.test.js @@ -49,7 +49,7 @@ describe('router', () => { expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' }) }) - it('has sixteen routes defined', () => { + it('has seventeen routes defined', () => { expect(routes).toHaveLength(17) })