Merge remote-tracking branch 'origin/develop' into 04-23-feat_add_ini…

…tial_vite_config_and_new_eslint_rules

# Conflicts:
#	frontend/.storybook/main.js

.husky/commit-msg

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 # Section for git-secrets
 if ! command -v git-secrets &> /dev/null
 then

.husky/pre-commit

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 # Section for git-secrets
 if ! command -v git-secrets &> /dev/null
 then

.husky/prepare-commit-msg

@@ -1,7 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-
 # Section for git-secrets
 if ! command -v git-secrets &> /dev/null
 then

CHANGELOG.md

@@ -4,10 +4,43 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v6.147.1](https://github.com/opengovsg/FormSG/compare/v6.147.0...v6.147.1)
+
+- fix: change #black to #000000 in singpass logo [`#7671`](https://github.com/opengovsg/FormSG/pull/7671)
+- build: release v6.147.0 [`#7670`](https://github.com/opengovsg/FormSG/pull/7670)
+
+#### [v6.147.0](https://github.com/opengovsg/FormSG/compare/v6.146.1...v6.147.0)
+
+> 12 September 2024
+
+- chore: standardize singpass logo svg color [`#7669`](https://github.com/opengovsg/FormSG/pull/7669)
+- chore: update upload-artifact version [`#7668`](https://github.com/opengovsg/FormSG/pull/7668)
+- test: mock date when rendering shimmer dates [`#7663`](https://github.com/opengovsg/FormSG/pull/7663)
+- fix: tighten gstatic.cn csp config [`#7666`](https://github.com/opengovsg/FormSG/pull/7666)
+- build: merge release v6.146.1 to develop [`#7664`](https://github.com/opengovsg/FormSG/pull/7664)
+- chore: remove ga injection to ejs [`#7665`](https://github.com/opengovsg/FormSG/pull/7665)
+- test: add ogp-codeql to ci [`#7667`](https://github.com/opengovsg/FormSG/pull/7667)
+- chore(deps): bump body-parser and express in /frontend [`#7662`](https://github.com/opengovsg/FormSG/pull/7662)
+- fix(deps): bump body-parser and express [`#7661`](https://github.com/opengovsg/FormSG/pull/7661)
+- test: mock date within test [`#7653`](https://github.com/opengovsg/FormSG/pull/7653)
+- fix: check existence of response id in attachment map for body v3  [`#7659`](https://github.com/opengovsg/FormSG/pull/7659)
+- fix(deps): bump libphonenumber-js from 1.11.7 to 1.11.8 in /shared [`#7660`](https://github.com/opengovsg/FormSG/pull/7660)
+- build: release v6.146.1 [`#7657`](https://github.com/opengovsg/FormSG/pull/7657)
+- chore: fix modal title typo [`#7651`](https://github.com/opengovsg/FormSG/pull/7651)
+- fix(deps): bump type-fest from 4.26.0 to 4.26.1 in /shared [`#7650`](https://github.com/opengovsg/FormSG/pull/7650)
+- chore: update dropndrag language [`#7649`](https://github.com/opengovsg/FormSG/pull/7649)
+- build: merge release v6.146.0 to develop [`#7648`](https://github.com/opengovsg/FormSG/pull/7648)
+- fix(deps): bump zod from 3.22.4 to 3.23.8 [`#7646`](https://github.com/opengovsg/FormSG/pull/7646)
+- fix(deps): bump dd-trace from 3.37.0 to 5.22.0 [`#7635`](https://github.com/opengovsg/FormSG/pull/7635)
+- chore: bump version to v6.147.0 [`378202b`](https://github.com/opengovsg/FormSG/commit/378202b194414a63bc511234048a2dab0b86c180)
+
 #### [v6.146.1](https://github.com/opengovsg/FormSG/compare/v6.146.0...v6.146.1)
 
+> 10 September 2024
+
 - fix(MRF): disable hasBeenScanned [`#7652`](https://github.com/opengovsg/FormSG/pull/7652)
 - build: release v6.146.0 [`#7644`](https://github.com/opengovsg/FormSG/pull/7644)
+- chore: bump version to v6.146.1 [`cfc3ebd`](https://github.com/opengovsg/FormSG/commit/cfc3ebd056c7d991a31cf945aa48f3713a0edf4f)
 
 #### [v6.146.0](https://github.com/opengovsg/FormSG/compare/v6.145.0...v6.146.0)
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.146.1",
+  "version": "6.147.1",
   "homepage": ".",
   "type": "module",
   "private": true,
@@ -19,7 +19,7 @@
     "@stripe/react-stripe-js": "^1.15.0",
     "@stripe/stripe-js": "^1.44.1",
     "@types/stopword": "^2.0.1",
-    "axios": "^1.6.4",
+    "axios": "^1.7.7",
     "broadcast-channel": "^4.13.0",
     "browser-image-compression": "^2.0.2",
     "comlink": "^4.3.1",

frontend/src/assets/svgrs/singpass/SingpassFullLogoSvgr.tsx

@@ -17,7 +17,7 @@ const MemoSingpassFullLogoSvgr = memo(
         />
         <path
           d="M10.3711 6.84176C11.2416 6.84176 11.9168 6.15746 11.9168 5.27518C11.9168 4.3929 11.2416 3.70862 10.3711 3.70862C9.50057 3.70862 8.82542 4.3929 8.82542 5.27518C8.82626 6.15746 9.50057 6.84176 10.3711 6.84176ZM8.70117 12.9621H12.0401L11.3298 7.36364C10.7969 7.52605 9.94439 7.52605 9.41145 7.36364L8.70117 12.9621Z"
-          fill="#black"
+          fill="#000000"
         />
       </g>
     </svg>

frontend/src/features/admin-form/responses/IndividualResponsePage/IndividualResponsePage.tsx

@@ -19,6 +19,7 @@ import Spinner from '~components/Spinner'
 
 import { useAdminForm } from '~features/admin-form/common/queries'
 import { FormActivationSvg } from '~features/admin-form/settings/components/FormActivationSvg'
+import { useUser } from '~features/user/queries'
 
 import { SecretKeyVerification } from '../components/SecretKeyVerification'
 import { useStorageResponsesContext } from '../ResponsesPage/storage'
@@ -80,6 +81,8 @@ export const IndividualResponsePage = (): JSX.Element => {
   if (!formId) throw new Error('Missing formId')
 
   const { data: form } = useAdminForm()
+
+  const { user } = useUser()
   const { secretKey } = useStorageResponsesContext()
   const { data, isLoading, isError } = useIndividualSubmission()
 
@@ -187,14 +190,15 @@ export const IndividualResponsePage = (): JSX.Element => {
               </Skeleton>
             </Stack>
           )}
-          {form?.responseMode === FormResponseMode.Multirespondent && (
-            <StackRow
-              label="Response link"
-              value={responseLinkWithKey}
-              isLoading={isLoading}
-              isError={isError}
-            />
-          )}
+          {form?.responseMode === FormResponseMode.Multirespondent &&
+            user?.betaFlags?.mrfAdminSubmissionKey && (
+              <StackRow
+                label="Response link"
+                value={responseLinkWithKey}
+                isLoading={isLoading}
+                isError={isError}
+              />
+            )}
         </Stack>
         {isLoading || isError ? (
           <LoadingDecryption />