fix: confirm modal valid start (workaround!)

Signed-off-by: Svetoslav Borislavov <[email protected]>
hashgraph · Jan 22, 2025 · a6ba313 · a6ba313
1 parent 6db8e13
commit a6ba313
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/front-end/src/renderer/components/Transaction/TransactionGroupProcessor.vue b/front-end/src/renderer/components/Transaction/TransactionGroupProcessor.vue
@@ -59,6 +59,11 @@ const props = defineProps<{
   watchExecutedModalShown?: (shown: boolean) => void;
 }>();
 
+/* Emits */
+defineEmits<{
+  (event: 'abort'): void;
+}>();
+
 /* Stores */
 const user = useUserStore();
 const network = useNetworkStore();
@@ -434,7 +439,10 @@ defineExpose({
       <template #header>
         <div class="d-flex flex-column w-100">
           <div>
-            <i class="bi bi-x-lg cursor-pointer" @click="isConfirmShown = false"></i>
+            <i
+              class="bi bi-x-lg cursor-pointer"
+              @click="((isConfirmShown = false), $emit('abort'))"
+            ></i>
           </div>
           <div class="text-center">
             <i class="bi bi-arrow-left-right large-icon"></i>
@@ -468,7 +476,10 @@ defineExpose({
         <hr class="separator m-5" />
 
         <div class="flex-between-centered gap-4 w-100 px-5 pb-5">
-          <AppButton type="button" color="borderless" @click="isConfirmShown = false"
+          <AppButton
+            type="button"
+            color="borderless"
+            @click="((isConfirmShown = false), $emit('abort'))"
             >Cancel</AppButton
           >
           <AppButton

diff --git a/front-end/src/renderer/pages/CreateTransactionGroup/CreateTransactionGroup.vue b/front-end/src/renderer/pages/CreateTransactionGroup/CreateTransactionGroup.vue
@@ -50,6 +50,7 @@ const transactionGroupProcessor = ref<typeof TransactionGroupProcessor | null>(n
 const file = ref<HTMLInputElement | null>(null);
 const wantToDeleteModalShown = ref(false);
 const showAreYouSure = ref(false);
+const updateValidStarts = ref(true);
 
 const groupEmpty = computed(() => transactionGroup.groupItems.length == 0);
 
@@ -167,8 +168,10 @@ async function handleSignSubmit() {
     }
     const requiredKey = new KeyList(ownerKeys);
 
+    updateValidStarts.value = false;
     await transactionGroupProcessor.value?.process(requiredKey);
   } catch (error) {
+    updateValidStarts.value = true;
     toast.error(getErrorMessage(error, 'Failed to create transaction'));
   }
 }
@@ -300,7 +303,9 @@ async function handleOnFileChanged(e: Event) {
 
 function updateGroupValidStart(newDate: Date) {
   transactionGroup.groupValidStart = newDate;
-  transactionGroup.updateTransactionValidStarts(transactionGroup.groupValidStart);
+  if (updateValidStarts.value) {
+    transactionGroup.updateTransactionValidStarts(transactionGroup.groupValidStart);
+  }
 }
 
 /* Functions */
@@ -528,6 +533,7 @@ onBeforeRouteLeave(async to => {
         :on-close-success-modal-click="handleClose"
         :on-executed="handleExecuted"
         :on-submitted="handleSubmit"
+        @abort="updateValidStarts = true"
       >
         <template #successHeading>Transaction Group Executed Successfully</template>
       </TransactionGroupProcessor>