From 7bf13d5dc588399f4476c8bc61f306c8e454f538 Mon Sep 17 00:00:00 2001
From: Konstantinos Paparas <kelsos86@gmail.com>
Date: Fri, 13 Dec 2024 10:49:07 +0100
Subject: [PATCH] fix: properly update VAT before doing a check

---
 components/account/home/AccountInformation.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/account/home/AccountInformation.vue b/components/account/home/AccountInformation.vue
index e0203338..aa3ba761 100644
--- a/components/account/home/AccountInformation.vue
+++ b/components/account/home/AccountInformation.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useVuelidate } from '@vuelidate/core';
-import { required } from '@vuelidate/validators';
+import { requiredUnless } from '@vuelidate/validators';
 import { get, objectOmit, set } from '@vueuse/core';
 import { storeToRefs } from 'pinia';
 import { useVatCheck } from '~/composables/use-vat-check';
@@ -29,9 +29,11 @@ const remainingTime = ref<number>(0);
 
 const { account } = storeToRefs(store);
 
+const movedOffline = computed<boolean>(() => get(account)?.address.movedOffline ?? false);
+
 const rules = {
-  firstName: { required },
-  lastName: { required },
+  firstName: { required: requiredUnless(movedOffline) },
+  lastName: { required: requiredUnless(movedOffline) },
   companyName: {},
   vatId: {},
 };
@@ -59,7 +61,6 @@ const {
   },
 } = useRuntimeConfig();
 
-const movedOffline = computed<boolean>(() => get(account)?.address.movedOffline ?? false);
 const isVatIdValid = computed<boolean>(() => get(account)?.vatIdStatus === VatIdStatus.VALID || false);
 
 const vatHint = computed<string>(() => {
@@ -140,6 +141,7 @@ async function update() {
 
 async function handleCheckVATClick() {
   set(loadingCheck, true);
+  await update();
   const checkResult = await checkVAT();
   await refreshVATCheckStatus();