diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 6b744ff69..ff3314e94 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -152,10 +152,7 @@ class AppRequestsController extends AppController if($result !== true) { return $this->returnJson($result); } - $required_fields = $this->checkAndCopyRequiredFields(['target_date'], $params, $data); - if($required_fields !== true) { - return $this->returnJson($required_fields); - } + if(!isset($params['memo']) || strlen($params['memo']) < 5 || strlen($params['memo']) > 150) { return $this->returnJson(['state' => 'error', 'msg' => 'memo is not set or not in expected range [5;150]']); } diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue index 561edbf9c..35490e093 100644 --- a/frontend/src/views/Pages/AccountOverview.vue +++ b/frontend/src/views/Pages/AccountOverview.vue @@ -17,7 +17,6 @@ :email="transactionData.email" :amount="transactionData.amount" :memo="transactionData.memo" - :date="transactionData.target_date" :loading="loading" @send-transaction="sendTransaction" @on-reset="onReset" @@ -54,7 +53,6 @@ const EMPTY_TRANSACTION_DATA = { email: '', amount: 0, memo: '', - target_date: '', } export default { @@ -96,7 +94,6 @@ export default { }, methods: { setTransaction(data) { - data.target_date = new Date(Date.now()).toISOString() this.transactionData = data this.currentTransactionStep = 1 }, diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue index b4852df48..d81311b79 100644 --- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue @@ -16,10 +16,6 @@ {{ memo ? memo : '-' }} {{ $t('form.message') }} - - {{ $d($moment(date), 'long') }} - {{ $t('form.date') }} - @@ -42,7 +38,6 @@ export default { email: { type: String, default: '' }, amount: { type: Number, default: 0 }, memo: { type: String, default: '' }, - date: { type: String, default: '' }, loading: { type: Boolean, default: false }, }, } diff --git a/frontend/src/views/Pages/UserProfile.spec.js b/frontend/src/views/Pages/UserProfile.spec.js new file mode 100644 index 000000000..7716be9cf --- /dev/null +++ b/frontend/src/views/Pages/UserProfile.spec.js @@ -0,0 +1,23 @@ +import { shallowMount } from '@vue/test-utils' + +import UserProfile from './UserProfile' + +const localVue = global.localVue + +describe('UserProfile', () => { + let wrapper + + const Wrapper = () => { + return shallowMount(UserProfile, { localVue }) + } + + describe('shallowMount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('renders the component', () => { + expect(wrapper.findComponent({ name: 'user-card' }).exists()).toBeTruthy() + }) + }) +})