From 56e6f3fe9f866189451cea158d77326fd3953280 Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Tue, 15 Sep 2020 12:24:07 +0800
Subject: [PATCH 1/4] feat: update secret key error

---
 .../admin/directives/verify-secret-key.client.directive.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/public/modules/forms/admin/directives/verify-secret-key.client.directive.js b/src/public/modules/forms/admin/directives/verify-secret-key.client.directive.js
index 0eb2a17b28..bdc7865490 100644
--- a/src/public/modules/forms/admin/directives/verify-secret-key.client.directive.js
+++ b/src/public/modules/forms/admin/directives/verify-secret-key.client.directive.js
@@ -54,7 +54,7 @@ function verifySecretKeyDirective(FormSgSdk) {
             case 'reader-abort':
               return 'File could not be read. Please try again.'
             case 'invalid-key':
-              return 'Form activation unsuccessful. Secret Key error, please try again.'
+              return 'Secret Key error. Please try again.'
             default:
               return 'An error occurred. Please try again.'
           }

From cfb331aa649115ea6de93becf3c110f50bb3e45e Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Tue, 15 Sep 2020 12:36:54 +0800
Subject: [PATCH 2/4] feat: update email confirmation tooltip

---
 .../admin/views/edit-fields.client.modal.html | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/public/modules/forms/admin/views/edit-fields.client.modal.html b/src/public/modules/forms/admin/views/edit-fields.client.modal.html
index ed1ebe7e34..8d518d7997 100644
--- a/src/public/modules/forms/admin/views/edit-fields.client.modal.html
+++ b/src/public/modules/forms/admin/views/edit-fields.client.modal.html
@@ -593,11 +593,20 @@ <h2 class="modal-title">
         <div class="row" ng-if="vm.field.fieldType === 'email'">
           <div class="toggle-option">
             <div class="col-xs-8 label-custom label-medium">
-              Email confirmation<i
-                class="glyphicon glyphicon-question-sign"
-                uib-tooltip="Recipients will receive an email confirmation with their submission reference number, and a customised message from you."
-                tooltip-trigger="'click mouseenter'"
-              ></i>
+              Email confirmation<span ng-switch="vm.myform.responseMode">
+                <i
+                  ng-switch-when="encrypt"
+                  class="glyphicon glyphicon-question-sign"
+                  uib-tooltip="Customised email acknowledgement to the respondent."
+                  tooltip-trigger="'click mouseenter'"
+                ></i>
+                <i
+                  ng-switch-default
+                  class="glyphicon glyphicon-question-sign"
+                  uib-tooltip="Recipients will receive an email confirmation with their submission reference number, and a customised message from you."
+                  tooltip-trigger="'click mouseenter'"
+                ></i>
+              </span>
             </div>
             <div class="col-xs-4 field-input">
               <label

From f803ce453302cc5839731c8fd20074f61e4101d9 Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Tue, 15 Sep 2020 12:39:19 +0800
Subject: [PATCH 3/4] feat: update intranet captcha messaging

---
 .../directiveViews/edit-captcha.client.view.html |  2 +-
 .../submit-form.directive.view.html              | 16 ----------------
 .../forms/services/captcha.client.service.js     |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/public/modules/forms/admin/directiveViews/edit-captcha.client.view.html b/src/public/modules/forms/admin/directiveViews/edit-captcha.client.view.html
index 658f281383..aeaa8c1b24 100644
--- a/src/public/modules/forms/admin/directiveViews/edit-captcha.client.view.html
+++ b/src/public/modules/forms/admin/directiveViews/edit-captcha.client.view.html
@@ -3,7 +3,7 @@
     Enable Captcha
     <i
       class="glyphicon glyphicon-question-sign"
-      uib-tooltip="Captcha does not work on the Intranet, and should be disabled if users submits form on Intranet."
+      uib-tooltip="Picture selection to prove respondent is human and prevent spam submission."
       tooltip-trigger="'click mouseenter'"
     ></i>
   </div>
diff --git a/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html b/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
index d98c8b1229..d51fe881d1 100644
--- a/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
+++ b/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
@@ -59,22 +59,6 @@
               ><i class="bx bx-loader bx-spin bx-lg"></i
             ></span>
           </button>
-          <div feature-toggle feature-name="captcha">
-            <div
-              id="preview-captcha-notice"
-              class="alert-info alert-custom"
-              ng-if="form.isPreview && form.hasCaptcha"
-            >
-              <i class="bx bx-exclamation bx-md icon-spacing"></i>
-              <div class="alert-msg">
-                You are submitting a form with
-                <strong>captcha enabled</strong> while in
-                <strong>preview mode</strong>. Captcha is not supported on the
-                intranet. Respondents on intranet may not be able to submit this
-                form.
-              </div>
-            </div>
-          </div>
         </div>
       </div>
     </div>
diff --git a/src/public/modules/forms/services/captcha.client.service.js b/src/public/modules/forms/services/captcha.client.service.js
index c8551a3ac6..e7e50e2ea2 100644
--- a/src/public/modules/forms/services/captcha.client.service.js
+++ b/src/public/modules/forms/services/captcha.client.service.js
@@ -93,7 +93,7 @@ function captchaService($window, vcRecaptchaService, Toastr) {
       vcRecaptchaService.execute(this.widgetId)
     } catch (err) {
       // If https://www.google.com/recaptcha/api.js?onload=vcRecaptchaApiLoaded&render=explicit
-      // could not loaded (eg, while on intranet). vcRecaptchaService throws an error.
+      // could not loaded. vcRecaptchaService throws an error.
       Toastr.error(
         'Please ensure you have internet connectivity for CAPTCHA to load on this form.',
       )

From a9481f58061416f4da2c11ebadaedc0a217d4a35 Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Tue, 15 Sep 2020 13:09:33 +0800
Subject: [PATCH 4/4] feat: update privacy policy

---
 .../views/static/privacy.client.view.html     | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/public/modules/users/views/static/privacy.client.view.html b/src/public/modules/users/views/static/privacy.client.view.html
index 3335290f28..a8b2c6eda9 100644
--- a/src/public/modules/users/views/static/privacy.client.view.html
+++ b/src/public/modules/users/views/static/privacy.client.view.html
@@ -137,8 +137,9 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">
     </p>
 
     <p>
-      4. safeguard your personal data, all electronic storage and transmission
-      of personal data is secured with appropriate security technologies.
+      4. To safeguard your personal data, all electronic storage and
+      transmission of personal data is secured with appropriate security
+      technologies.
     </p>
 
     <p>
@@ -156,18 +157,40 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">
       consult the privacy notices of those sites.
     </p>
 
-    <p>7. Please contact formsg@tech.gov.sg if you:</p>
+    <p>7. Please see the Annex for additional terms/notices.</p>
+
+    <p>8. Please contact formsg@tech.gov.sg if you:</p>
     <ul>
       <li>
-        7.1. have any enquires or feedback on our data protection policies and
+        8.1. have any enquires or feedback on our data protection policies and
         procedures; or
       </li>
       <li>
-        7.2. need more information on or access to data which you have provided
+        8.2. need more information on or access to data which you have provided
         to us in the past.
       </li>
     </ul>
     <br /><br /><br />
-    <center>This Privacy Policy is dated 1 Jun 2020.</center>
+    <center>This Privacy Policy is dated 15 Sep 2020.</center>
+    <h1 class="hidden-xs static-view-header">Annex</h1>
+    <h2 class="hidden-sm hidden-md hidden-lg static-view-header">Annex</h2>
+    <p><strong>Name of Service:</strong> form.gov.sg</p>
+    <p>
+      1. If you are a form creator, please note that GovTech will collect your
+      email address and other contact details. As GovTech may collect, store
+      and/or process data requested by you from the form respondents, please
+      ensure that your privacy policy adequately provides the respondents with
+      notice of the same and that your privacy policy complies with applicable
+      rules/laws.
+    </p>
+    <p>
+      2. If you are a form respondent, please note that GovTech may collect,
+      store and/or process data that you submit in accordance with this Privacy
+      Policy (which applies in addition to the privacy policy of the form
+      creator) and disclose the data to the form creator, or process the data
+      for the form creator. If you have questions on the use of your data,
+      please consult the privacy policy of the form creator or contact the form
+      creator directly.
+    </p>
   </div>
 </section>