feat: update loading state for submissionsecretkey and fix imports to…

… relative
opengovsg · Feb 28, 2025 · 4bd6739 · 4bd6739
1 parent ded597f
commit 4bd6739
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/...m/responses/ResponsesPage/storage/UnlockedResponses/ResponsesTable/SendReminderButton.tsx b/...m/responses/ResponsesPage/storage/UnlockedResponses/ResponsesTable/SendReminderButton.tsx
@@ -21,7 +21,7 @@ export const SendReminderButton = ({
 
   const [isSent, setIsSent] = useState(false)
 
-  const { data: submissionData, isLoading } =
+  const { data: submissionData, isLoading: isLoadingSubmissionData } =
     useGetIndividualDecryptedSubmission({
       formId,
       submissionId,
@@ -33,14 +33,14 @@ export const SendReminderButton = ({
     ? 'storybook-test-dummy-key'
     : submissionData?.submissionSecretKey
 
-  if (!formId || (!isLoading && !submissionSecretKey)) {
+  if (!formId || (!isLoadingSubmissionData && !submissionSecretKey)) {
     return null
   }
 
   return !isSent ? (
     <Button
-      isLoading={isLoading}
-      loadingText="Sending"
+      isLoading={isLoadingSubmissionData}
+      loadingText={isLoadingSubmissionData ? 'Loading' : 'Sending'}
       m="0"
       p="0"
       variant="clear"

diff --git a/src/app/routes/api/v3/admin/forms/admin-forms.submissions.routes.ts b/src/app/routes/api/v3/admin/forms/admin-forms.submissions.routes.ts
@@ -1,8 +1,7 @@
 import { Router } from 'express'
 
-import { rateLimitConfig } from 'src/app/config/config'
-import { limitRate } from 'src/app/utils/limit-rate'
-
+import { rateLimitConfig } from '../../../../../../app/config/config'
+import { limitRate } from '../../../../../../app/utils/limit-rate'
 import * as AdminFormController from '../../../../../modules/form/admin-form/admin-form.controller'
 import * as EncryptSubmissionController from '../../../../../modules/submission/encrypt-submission/encrypt-submission.controller'
 import * as MultirespondentSubmissionController from '../../../../../modules/submission/multirespondent-submission/multirespondent-submission.controller'