From 0c59ce226b2ea28193dcafe9fa9b2328acf82f4a Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 7 Nov 2024 11:16:24 +0100
Subject: [PATCH] Make currentPage a required param for sendFeedback

---
 src/lib/components/feedback/feedback.svelte                   | 2 +-
 src/lib/stores/feedback.ts                                    | 4 ++--
 .../project-[project]/settings/migrations/exportModal.svelte  | 3 ++-
 src/routes/(console)/wizard/feedback/step1.svelte             | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/feedback/feedback.svelte b/src/lib/components/feedback/feedback.svelte
index 0a3d17b7c..edc645bf0 100644
--- a/src/lib/components/feedback/feedback.svelte
+++ b/src/lib/components/feedback/feedback.svelte
@@ -18,10 +18,10 @@
             await feedback.submitFeedback(
                 `feedback-${$feedback.type}`,
                 $feedbackData.message,
+                $page.url.href,
                 $user.name,
                 $user.email,
                 $organization.billingPlan,
-                $page.url.href,
                 $feedbackData.value
             );
             addNotification({
diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts
index bea970837..0ed2db35c 100644
--- a/src/lib/stores/feedback.ts
+++ b/src/lib/stores/feedback.ts
@@ -112,12 +112,12 @@ function createFeedbackStore() {
         submitFeedback: async (
             subject: string,
             message: string,
+            currentPage: string,
             name?: string,
             email?: string,
             // eslint-disable-next-line
             // @ts-expect-error
             billingPlan?: string,
-            currentPage?: string,
             value?: number
         ) => {
             if (!VARS.GROWTH_ENDPOINT) return;
@@ -133,7 +133,7 @@ function createFeedbackStore() {
                     // billingPlan,
                     firstname: name || 'Unknown',
                     customFields: [
-                        { id: '47364', value: currentPage ?? '' },
+                        { id: '47364', value: currentPage },
                         ...(value ? [{ id: '40655', value }] : [])
                     ],
                     metaFields: {
diff --git a/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte b/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte
index 1d87b13a2..d1d2cd3c7 100644
--- a/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte
+++ b/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { page } from '$app/stores';
     import { Alert, Box, Modal } from '$lib/components';
     import { Button, InputText, InputTextarea } from '$lib/elements/forms';
     import { getFormData } from '$lib/helpers/form';
@@ -52,7 +53,7 @@
         const { endpoint, feedback: message } = formData;
 
         try {
-            await feedback.submitFeedback(`feedback-${$feedback.type}`, message);
+            await feedback.submitFeedback(`feedback-${$feedback.type}`, message, $page.url.href);
         } catch (error) {
             console.error(
                 'Feedback could not be submitted, but we continue to redirect to do export.'
diff --git a/src/routes/(console)/wizard/feedback/step1.svelte b/src/routes/(console)/wizard/feedback/step1.svelte
index 17219cc26..c9572c973 100644
--- a/src/routes/(console)/wizard/feedback/step1.svelte
+++ b/src/routes/(console)/wizard/feedback/step1.svelte
@@ -18,10 +18,10 @@
             await feedback.submitFeedback(
                 `feedback-${$feedback.type}`,
                 $feedbackData.message,
+                $page.url.href,
                 $user.name,
                 $user.email,
                 $organization.billingPlan,
-                $page.url.href,
                 $feedbackData.value
             );
             addNotification({