From 1984b99e040d7d38e48510fd55765e04512de301 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 9 Jan 2025 22:25:46 +0200
Subject: [PATCH] fix formula with conditions

---
 app/javascript/submission_form/area.vue | 5 ++++-
 lib/submitters/submit_values.rb         | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/javascript/submission_form/area.vue b/app/javascript/submission_form/area.vue
index d3f7015e..1c705228 100644
--- a/app/javascript/submission_form/area.vue
+++ b/app/javascript/submission_form/area.vue
@@ -197,7 +197,10 @@
       <span v-else-if="field.type === 'date'">
         {{ formattedDate }}
       </span>
-      <span v-else-if="field.type === 'number'">
+      <span
+        v-else-if="field.type === 'number'"
+        class="w-full"
+      >
         {{ formatNumber(modelValue, field.preferences?.format) }}
       </span>
       <span
diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb
index ff710d59..a68ce73f 100644
--- a/lib/submitters/submit_values.rb
+++ b/lib/submitters/submit_values.rb
@@ -54,8 +54,8 @@ module Submitters
       submitter.ip = request.remote_ip
       submitter.ua = request.user_agent
       submitter.values = merge_default_values(submitter)
-      submitter.values = merge_formula_values(submitter)
       submitter.values = maybe_remove_condition_values(submitter)
+      submitter.values = merge_formula_values(submitter)
       submitter.values = submitter.values.transform_values do |v|
         v == '{{date}}' ? Time.current.in_time_zone(submitter.account.timezone).to_date.to_s : v
       end