From b88f02289938ce7452080870c9190adf85fb61e2 Mon Sep 17 00:00:00 2001
From: Sim Boon Long <simboonlong@gmail.com>
Date: Mon, 7 Aug 2023 14:07:24 +0800
Subject: [PATCH] fix: v3 preview

---
 .../DynamicFormContainer/DynamicFormLayout.tsx      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/DynamicFormContainer/DynamicFormLayout.tsx b/src/components/DynamicFormContainer/DynamicFormLayout.tsx
index 8c9fc499..93f6b9d7 100644
--- a/src/components/DynamicFormContainer/DynamicFormLayout.tsx
+++ b/src/components/DynamicFormContainer/DynamicFormLayout.tsx
@@ -15,7 +15,7 @@ import { DocumentPreview } from "./DocumentPreview";
 import { DynamicForm } from "./DynamicForm";
 import { DynamicFormHeader } from "./DynamicFormHeader";
 import { FormErrorBanner } from "./FormErrorBanner";
-import { validateData, getDataToValidate } from "./../../common/utils";
+import { validateData, getDataToValidate, hasVcContext, getDataV3 } from "./../../common/utils";
 import { FormErrors } from "./../../types";
 
 export const DynamicFormLayout: FunctionComponent = () => {
@@ -113,7 +113,16 @@ export const DynamicFormLayout: FunctionComponent = () => {
     }, timeout);
   };
 
-  const currentUnwrappedData = defaultsDeep({}, currentForm.data.formData, currentFormTemplate.defaults);
+  const currentUnwrappedData = hasVcContext(currentForm.data.formData)
+    ? defaultsDeep(
+        {},
+        {
+          ...currentForm.data.formData,
+          credentialSubject: getDataV3(currentForm.data.formData),
+        },
+        currentFormTemplate.defaults
+      )
+    : defaultsDeep({}, currentForm.data.formData, currentFormTemplate.defaults);
 
   return (
     <OnCloseGuard active={activeFormIndex !== undefined}>