fix: update allowing file type condition for signature (#7601)

* fix: update allowing file type condition for signature * chore: update allowedFileFormat prop type for signature
opencrvs · Sep 12, 2024 · 36f0128 · 36f0128
1 parent c38d100
commit 36f0128
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/packages/client/src/components/form/SignatureField/SignatureUploader.tsx b/packages/client/src/components/form/SignatureField/SignatureUploader.tsx
@@ -71,7 +71,7 @@ export function SignatureUploader({
   onChange,
   modalTitle,
   maxSizeMb = 2,
-  allowedFileFormats = ['png'],
+  allowedFileFormats = ['image/png'],
   ...props
 }: SignatureUploaderProps) {
   const [signatureDialogOpen, setSignatureDialogOpen] = useState(false)
@@ -117,13 +117,16 @@ export function SignatureUploader({
                   return
                 }
                 if (
-                  !allowedFileFormats.includes(
-                    file.type as (typeof allowedFileFormats)[0]
+                  !allowedFileFormats.some((format) =>
+                    file.type.includes(format)
                   )
                 ) {
+                  const formattedFileTypesOfSignatures = allowedFileFormats.map(
+                    (val) => val.split('/')[1]
+                  )
                   setSignatureError(
                     intl.formatMessage(formMessages.fileUploadError, {
-                      type: allowedFileFormats.join(', ')
+                      type: formattedFileTypesOfSignatures.join(', ')
                     })
                   )
                   return

diff --git a/packages/client/src/forms/index.ts b/packages/client/src/forms/index.ts
@@ -715,7 +715,12 @@ export interface INidVerificationButton extends IFormFieldBase {
 export interface ISignatureFormField extends IFormFieldBase {
   type: typeof SIGNATURE
   maxSizeMb?: number
-  allowedFileFormats?: ('png' | 'jpg' | 'jpeg' | 'svg')[]
+  allowedFileFormats?: (
+    | 'image/png'
+    | 'image/jpg'
+    | 'image/jpeg'
+    | 'image/svg'
+  )[]
 }
 
 export type IFormField =
@@ -1209,7 +1214,12 @@ export interface Ii18nTimeFormField extends Ii18nFormFieldBase {
 export interface Ii18nSignatureField extends Ii18nFormFieldBase {
   type: typeof SIGNATURE
   maxSizeMb?: number
-  allowedFileFormats?: ('png' | 'jpg' | 'jpeg' | 'svg')[]
+  allowedFileFormats?: (
+    | 'image/png'
+    | 'image/jpg'
+    | 'image/jpeg'
+    | 'image/svg'
+  )[]
 }
 
 export type Ii18nFormField =