diff --git a/frontend/package.json b/frontend/package.json index 513b6b509..812735e3e 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,6 +26,7 @@ "bootstrap": "^4.5.3", "bootstrap-vue": "^2.21.2", "clipboard-polyfill": "^4.0.0-rc1", + "date-fns": "^2.29.3", "es6-promise": "^4.1.1", "eslint": "^7.25.0", "eslint-config-prettier": "^8.1.0", @@ -58,7 +59,6 @@ "vue-i18n": "^8.22.4", "vue-jest": "^3.0.7", "vue-loading-overlay": "^3.4.2", - "vue-moment": "^4.1.0", "vue-router": "^3.0.6", "vue-timers": "^2.0.4", "vue2-transitions": "^0.2.3", diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 7d2a0aae4..fae2e044a 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -130,6 +130,7 @@ import InputEmail from '@/components/Inputs/InputEmail' import InputAmount from '@/components/Inputs/InputAmount' import InputTextarea from '@/components/Inputs/InputTextarea' import { user as userQuery } from '@/graphql/queries' +import { isEmpty } from 'lodash' export default { name: 'TransactionForm', @@ -176,7 +177,8 @@ export default { this.form.amount = '' this.form.memo = '' this.$refs.formValidator.validate() - if (this.$route.query && !this.$route.query === {}) this.$router.replace({ query: undefined }) + if (this.$route.query && !isEmpty(this.$route.query)) + this.$router.replace({ query: undefined }) }, }, apollo: { diff --git a/frontend/src/components/TransactionRows/DurationRow.vue b/frontend/src/components/TransactionRows/DurationRow.vue index aa20132d7..6f62d9dc5 100644 --- a/frontend/src/components/TransactionRows/DurationRow.vue +++ b/frontend/src/components/TransactionRows/DurationRow.vue @@ -5,12 +5,17 @@