From 30b0b1fb2b454a35054f4fb1ed453e24e81971af Mon Sep 17 00:00:00 2001
From: Esco <OfficialEsco@users.noreply.github.com>
Date: Thu, 4 Apr 2024 13:37:28 +0200
Subject: [PATCH 1/2] DefaultValue Switch and Input

---
 src/components/forms/RFFComponents.jsx              | 3 ++-
 src/views/tenant/standards/ListAppliedStandards.jsx | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/forms/RFFComponents.jsx b/src/components/forms/RFFComponents.jsx
index c1880eee88b8..b3f22f8cda14 100644
--- a/src/components/forms/RFFComponents.jsx
+++ b/src/components/forms/RFFComponents.jsx
@@ -157,10 +157,11 @@ export const RFFCFormInput = ({
   spellCheck = true,
   autoFocus = false,
   hiddenValue,
+  defaultValue,
   onChange,
 }) => {
   return (
-    <Field initialValue={hiddenValue} name={name} validate={validate}>
+    <Field defaultValue={defaultValue} initialValue={hiddenValue} name={name} validate={validate}>
       {({ input, meta }) => {
         const handleChange = onChange
           ? (e) => {
diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
index e947dd0c0386..b5c8bc3c8174 100644
--- a/src/views/tenant/standards/ListAppliedStandards.jsx
+++ b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -611,6 +611,7 @@ const ApplyNewStandard = () => {
                                                   className="mb-3"
                                                   name={component.name}
                                                   label={component.label}
+                                                  defaultValue={component.default}
                                                 />
                                               )}
                                               {component.type === 'boolean' && (

From 66e9ec4e5a91b8ed0617cb6a98a938dabb6fffc8 Mon Sep 17 00:00:00 2001
From: Esco <OfficialEsco@users.noreply.github.com>
Date: Fri, 5 Apr 2024 10:54:09 +0200
Subject: [PATCH 2/2] Added defaults from standards.json

---
 src/data/standards.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/data/standards.json b/src/data/standards.json
index fc77b81b4e4a..2766676a8ce5 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -308,7 +308,8 @@
       {
         "type": "number",
         "name": "standards.NudgeMFA.snoozeDurationInDays",
-        "label": "Number of days to allow users to skip registering Authenticator (0-14, default is 1)"
+        "label": "Number of days to allow users to skip registering Authenticator (0-14, default is 1)",
+        "default": 1
       }
     ],
     "label": "Sets the state for the request to setup Authenticator",
@@ -578,7 +579,8 @@
         "type": "number",
         "name": "standards.EnableMailTips.MailTipsLargeAudienceThreshold",
         "label": "Number of recipients to trigger the large audience MailTip (Default is 25)",
-        "placeholder": "Enter a profile name"
+        "placeholder": "Enter a profile name",
+        "default": 25
       }
     ],
     "label": "Enable all MailTips",
@@ -634,12 +636,14 @@
       {
         "type": "number",
         "name": "standards.SendReceiveLimitTenant.SendLimit",
-        "label": "Send limit in MB (Default is 35)"
+        "label": "Send limit in MB (Default is 35)",
+        "default": 35
       },
       {
         "type": "number",
         "name": "standards.SendReceiveLimitTenant.ReceiveLimit",
-        "label": "Receive Limit in MB (Default is 36)"
+        "label": "Receive Limit in MB (Default is 36)",
+        "default": 36
       }
     ],
     "label": "Set send/receive size limits",