feat: misc UX fixes

src/public/modules/forms/admin/directiveViews/verify-secret-key-activation.client.view.html

@@ -60,10 +60,9 @@
       Key safely:
     </div>
     <div class="instructions-caption">
-      <b class="agree-text no-select"
-        >I understand the consequences and have<br />
-        stored my secret key in 2 other places</b
-      >
+      <b class="agree-text no-select">
+        I have shared my secret key with a colleague
+      </b>
     </div>
     <div ng-form name="acknowledgementForm">
       <input
@@ -72,7 +71,7 @@
         name="acknowledgementInput"
         type="text"
         autocomplete="off"
-        placeholder="I understand the consequences and have stored my secret key in 2 other places"
+        placeholder="I have shared my secret key with a colleague"
         ng-paste="$event.preventDefault()"
         ng-model="inputAcknowledgement"
       />

src/public/modules/forms/admin/directives/settings-form.client.directive.js

@@ -18,6 +18,9 @@ const createTempSettings = (myform) => {
   let tempForm = {}
   SETTINGS_PATH.forEach((path) => set(tempForm, path, get(myform, path)))
   tempForm.mode = 'edit'
+  if (Array.isArray(tempForm.emails)) {
+    tempForm.emails = tempForm.emails.join(', ')
+  }
   return tempForm
 }
 

src/public/modules/forms/admin/directives/verify-secret-key.client.directive.js

@@ -68,8 +68,7 @@ function verifySecretKeyDirective(FormSgSdk) {
               .toLowerCase()
               .replace(/\./g, '')
               .replace(/  +/g, ' ')
-              .trim() !==
-            'i understand the consequences and have stored my secret key in 2 other places'
+              .trim() !== 'i have shared my secret key with a colleague'
           )
           //Allow regardless of whether user types in upper / lowercase, ignore full stops and multiple spaces
         }
@@ -86,9 +85,7 @@ function verifySecretKeyDirective(FormSgSdk) {
           }
 
           const encryptionKey = createEncryptionKey($scope.publicKey, secretKey)
-          if (encryptionKey !== null) {
-            Toastr.success('Verified!')
-          } else {
+          if (!encryptionKey) {
             Toastr.error(getErrorMessage('invalid-key'))
           }
           $scope.callback({ encryptionKey })

src/public/modules/forms/admin/views/create-form.client.modal.html

@@ -115,11 +115,11 @@
           <div class="alert-msg">
             <span class="alert-content">
               <b>Ways to safekeep</b>
-              <a
+              (<a
                 translate-attr="{ href: 'LINKS.GUIDE.SECRET_KEY_SAFEKEEPING' }"
                 target="_blank"
-                >(guide)</a
-              >
+                >guide</a
+              >)
               <ul>
                 <li>
                   <a

tests/end-to-end/helpers/util.js

@@ -630,7 +630,7 @@ async function addSettings(t, formOptions, captchaEnabled, webhookUrl) {
       .typeText(activateFormModal.secretKeyInput, formOptions.secretKey)
       .typeText(
         activateFormModal.acknowledgementInput,
-        'I understand the consequences and have stored my secret key in 2 other places',
+        'I have shared my secret key with a colleague',
       )
       .click(activateFormModal.activateFormBtn)
   } else if (formOptions.authType !== 'NIL') {