fix: merge conflicts

impress-org · Aug 23, 2023 · 226a76a · 226a76a
1 parent f118deb
commit 226a76a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ces/js/form-builder/src/settings/email/template-options/components/send-preview-email.tsx b/...ces/js/form-builder/src/settings/email/template-options/components/send-preview-email.tsx
@@ -2,7 +2,7 @@ import {useState} from 'react';
 import {useFormState} from '@givewp/form-builder/stores/form-state';
 import {Button, TextControl} from '@wordpress/components';
 import {__} from '@wordpress/i18n';
-import {getStorageData} from '@givewp/form-builder/common/getWindowData';
+import {getFormBuilderWindowData} from '@givewp/form-builder/common/getWindowData';
 
 export default ({emailType, defaultEmailAddress}) => {
     const [emailAddress, setEmailAddress] = useState<string>(defaultEmailAddress);
@@ -11,7 +11,7 @@ export default ({emailType, defaultEmailAddress}) => {
         settings: {emailTemplateOptions, emailTemplate, emailLogo, emailFromName, emailFromEmail},
     } = useFormState();
 
-    const {formId, emailPreviewURL} = getStorageData();
+    const {formId, emailPreviewURL, nonce} = getFormBuilderWindowData();
 
     const sendTestEmail = () => {
         // @ts-ignore

diff --git a/src/FormBuilder/resources/js/form-builder/src/settings/email/template-options/index.tsx b/src/FormBuilder/resources/js/form-builder/src/settings/email/template-options/index.tsx
@@ -5,7 +5,6 @@ import {useState} from 'react';
 import TabPanel from '@givewp/form-builder/components/sidebar/TabPanel';
 import EmailTemplateSettings from './settings';
 import CopyToClipboardButton from './components/copy-to-clipboard-button';
-
 import {getFormBuilderWindowData} from '@givewp/form-builder/common/getWindowData';
 import SendPreviewEmail from './components/send-preview-email';
 import EmailPreviewContent from './components/email-preview-content';