From f24f72faab4238da8ef1c362e10c5961aaa024d9 Mon Sep 17 00:00:00 2001
From: mayying <mayying@open.gov.sg>
Date: Wed, 12 Jul 2023 17:38:33 +0800
Subject: [PATCH 01/10] feat: presub-change-icon-to-help (#6532)

feat/presub-change-icon-to-help
---
 .../components/FormIssueFeedback/FormIssueFeedbackButton.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/features/public-form/components/FormIssueFeedback/FormIssueFeedbackButton.tsx b/frontend/src/features/public-form/components/FormIssueFeedback/FormIssueFeedbackButton.tsx
index ed608c7666..ac4d16c17d 100644
--- a/frontend/src/features/public-form/components/FormIssueFeedback/FormIssueFeedbackButton.tsx
+++ b/frontend/src/features/public-form/components/FormIssueFeedback/FormIssueFeedbackButton.tsx
@@ -1,4 +1,4 @@
-import { BiMessage } from 'react-icons/bi'
+import { BiQuestionMark } from 'react-icons/bi'
 import { Flex, useDisclosure } from '@chakra-ui/react'
 
 import { noPrintCss } from '~utils/noPrintCss'
@@ -26,7 +26,7 @@ export const FormIssueFeedbackButton = (): JSX.Element | null => {
           variant="outline"
           cursor="pointer"
           aria-label="issue feedback"
-          icon={<BiMessage color="primary.500" />}
+          icon={<BiQuestionMark color="primary.500" />}
           onClick={onOpen}
         />
       </Tooltip>

From b1f40ca73af8e33bad8e23b7b0b14b783282653f Mon Sep 17 00:00:00 2001
From: mayying <mayying@open.gov.sg>
Date: Thu, 13 Jul 2023 09:11:27 +0800
Subject: [PATCH 02/10] fix: presub remove additional underscore (#6533)

---
 src/app/views/templates/issue-reported-notification.view.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/views/templates/issue-reported-notification.view.html b/src/app/views/templates/issue-reported-notification.view.html
index a527e92257..6451c8c005 100644
--- a/src/app/views/templates/issue-reported-notification.view.html
+++ b/src/app/views/templates/issue-reported-notification.view.html
@@ -9,8 +9,8 @@
       might be facing urgent issues relating to form submission.
     </p>
     <p>
-      <a href="<%= formResultUrl %>">Login to Forms </a> and view issues
-      reported in your results page.
+      <a href="<%= formResultUrl %>">Login to Forms</a> and view issues reported
+      in your results page.
     </p>
     <p>Regards,<br /><%= appName %> team</p>
   </body>

From 0409f5050af0c24367b3d53e97d76395d59800c4 Mon Sep 17 00:00:00 2001
From: mayying <mayying@open.gov.sg>
Date: Mon, 17 Jul 2023 13:28:05 +0800
Subject: [PATCH 03/10] feat: add description to form issue modal (#6536)

* feat: add description to form issue modal

* update based on figma change

* Remove fullstop as requested
---
 .../FormIssueFeedbackModal.tsx                | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/frontend/src/features/public-form/components/FormIssueFeedback/FormIssueFeedbackModal.tsx b/frontend/src/features/public-form/components/FormIssueFeedback/FormIssueFeedbackModal.tsx
index 31b269cb67..e4c9849e43 100644
--- a/frontend/src/features/public-form/components/FormIssueFeedback/FormIssueFeedbackModal.tsx
+++ b/frontend/src/features/public-form/components/FormIssueFeedback/FormIssueFeedbackModal.tsx
@@ -98,17 +98,23 @@ export const FormIssueFeedbackModal = ({
             pr="4rem"
           >
             <Text textStyle={{ base: '1.25rem', md: '1.5rem' }}>
-              Have trouble filling out this form?
+              Report an issue
             </Text>
           </ModalHeader>
           <ModalBody>
+            <Text pb="1.5rem" textStyle="body-2" mt="0">
+              Fill this in only{' '}
+              <span style={{ fontWeight: 'bold' }}>
+                if you are experiencing issues and are unable to submit this
+                form
+              </span>
+              . If you would like to provide feedback, you can do so after
+              submitting the form.
+            </Text>
             <Stack>
               <FormControl isInvalid={!!errors.issue}>
-                <FormLabel
-                  isRequired={true}
-                  description={'This will be sent to the form creator.'}
-                >
-                  Please describe the issue you encountered.
+                <FormLabel isRequired={true}>
+                  Please describe the issue you encountered
                 </FormLabel>
                 <Textarea
                   {...register('issue', {
@@ -121,12 +127,7 @@ export const FormIssueFeedbackModal = ({
               </FormControl>
 
               <FormControl isInvalid={!!errors.email}>
-                <FormLabel
-                  pt="1rem"
-                  description="Leave your email so the form creator can reach out to you if needed."
-                >
-                  Contact
-                </FormLabel>
+                <FormLabel pt="1rem">Contact</FormLabel>
                 <Input
                   type={BasicField.Email}
                   placeholder="me@example.com"

From 004adc48eb762687f94d817ddfd72c6e8a7ffaea Mon Sep 17 00:00:00 2001
From: Lin Huiqing <37061143+LinHuiqing@users.noreply.github.com>
Date: Tue, 18 Jul 2023 12:22:00 +0800
Subject: [PATCH 04/10] build(deps): bump winston-cloudwatch version to "6.2.0"
 (#6542)

---
 package-lock.json | 651 ++--------------------------------------------
 package.json      |   2 +-
 2 files changed, 22 insertions(+), 631 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 874c04fe51..fabbcf1847 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -130,7 +130,7 @@
         "web-streams-polyfill": "^3.2.1",
         "whatwg-fetch": "^3.6.2",
         "winston": "^3.8.2",
-        "winston-cloudwatch": "^6.1.1",
+        "winston-cloudwatch": "^6.2.0",
         "zod": "^3.21.4"
       },
       "devDependencies": {
@@ -5983,13 +5983,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.9",
       "dev": true,
@@ -10617,13 +10610,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/data-uri-to-buffer": {
-      "version": "3.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/date-fns": {
       "version": "2.30.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -10868,44 +10854,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/degenerator": {
-      "version": "3.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "ast-types": "^0.13.2",
-        "escodegen": "^1.8.1",
-        "esprima": "^4.0.0",
-        "vm2": "^3.9.8"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/degenerator/node_modules/ast-types": {
-      "version": "0.13.4",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/degenerator/node_modules/esprima": {
-      "version": "4.0.1",
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/degenerator/node_modules/tslib": {
-      "version": "2.3.1",
-      "license": "0BSD"
-    },
     "node_modules/del": {
       "version": "3.0.0",
       "dev": true,
@@ -11585,45 +11533,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/escodegen": {
-      "version": "1.14.2",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/esprima": {
-      "version": "4.0.1",
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "license": "BSD-3-Clause",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/eslint": {
       "version": "8.30.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
@@ -13093,6 +13002,7 @@
     },
     "node_modules/estraverse": {
       "version": "4.3.0",
+      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
@@ -14281,18 +14191,6 @@
       "version": "1.0.0",
       "license": "MIT"
     },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
     "node_modules/fs-minipass": {
       "version": "2.1.0",
       "license": "ISC",
@@ -14329,34 +14227,6 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/ftp": {
-      "version": "0.3.10",
-      "dependencies": {
-        "readable-stream": "1.1.x",
-        "xregexp": "2.0.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/ftp/node_modules/isarray": {
-      "version": "0.0.1",
-      "license": "MIT"
-    },
-    "node_modules/ftp/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/ftp/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "license": "MIT"
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "license": "MIT"
@@ -14687,43 +14557,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-uri": {
-      "version": "3.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "data-uri-to-buffer": "3",
-        "debug": "4",
-        "file-uri-to-path": "2",
-        "fs-extra": "^8.1.0",
-        "ftp": "^0.3.10"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/get-uri/node_modules/debug": {
-      "version": "4.3.3",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/get-uri/node_modules/file-uri-to-path": {
-      "version": "2.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/get-value": {
       "version": "2.0.6",
       "dev": true,
@@ -15418,33 +15251,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "4.3.3",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/http-reasons": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/http-reasons/-/http-reasons-0.1.0.tgz",
@@ -15736,6 +15542,7 @@
     },
     "node_modules/ip": {
       "version": "1.1.5",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/ipaddr.js": {
@@ -19061,13 +18868,6 @@
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz",
       "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w=="
     },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
     "node_modules/jsonparse": {
       "version": "1.3.1",
       "engines": [
@@ -21345,13 +21145,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/netmask": {
-      "version": "2.0.2",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/neverthrow": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/neverthrow/-/neverthrow-6.0.0.tgz",
@@ -22139,51 +21932,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/pac-proxy-agent": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4",
-        "get-uri": "3",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "5",
-        "pac-resolver": "^5.0.0",
-        "raw-body": "^2.2.0",
-        "socks-proxy-agent": "5"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/debug": {
-      "version": "4.3.3",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/pac-resolver": {
-      "version": "5.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "degenerator": "^3.0.2",
-        "ip": "^1.1.5",
-        "netmask": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/pako": {
       "version": "1.0.11",
       "license": "(MIT AND Zlib)"
@@ -23017,45 +22765,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/proxy-agent": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^6.0.0",
-        "debug": "4",
-        "http-proxy-agent": "^4.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^5.0.0",
-        "proxy-from-env": "^1.0.0",
-        "socks-proxy-agent": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/debug": {
-      "version": "4.3.3",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/proxy-agent/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "license": "MIT"
@@ -24488,14 +24197,6 @@
         "jquery": ">=1.8.0"
       }
     },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
     "node_modules/smtp-server": {
       "version": "3.11.0",
       "dev": true,
@@ -24726,49 +24427,6 @@
         }
       }
     },
-    "node_modules/socks": {
-      "version": "2.7.0",
-      "license": "MIT",
-      "dependencies": {
-        "ip": "^2.0.0",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "5.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "4",
-        "socks": "^2.3.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/socks-proxy-agent/node_modules/debug": {
-      "version": "4.3.3",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/socks/node_modules/ip": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
     "node_modules/sonic-boom": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.4.1.tgz",
@@ -27408,6 +27066,7 @@
     },
     "node_modules/universalify": {
       "version": "0.1.2",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
@@ -27764,38 +27423,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/vm2": {
-      "version": "3.9.18",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.18.tgz",
-      "integrity": "sha512-iM7PchOElv6Uv6Q+0Hq7dcgDtWWT6SizYqVcvol+1WQc+E9HlgTCnPozbQNSP3yDV9oXHQOEQu530w2q/BCVZg==",
-      "dependencies": {
-        "acorn": "^8.7.0",
-        "acorn-walk": "^8.2.0"
-      },
-      "bin": {
-        "vm2": "bin/vm2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/vm2/node_modules/acorn": {
-      "version": "8.8.0",
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/vm2/node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "dev": true,
@@ -28665,9 +28292,9 @@
       }
     },
     "node_modules/winston-cloudwatch": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-6.1.1.tgz",
-      "integrity": "sha512-5wOJhAYRU3s6I1t/XO1/3tHJLhzvUUNNxcdbAjhDbyaKnghgKHrRtoQPXO2qTlWOTdhoXS0nJqV/L3RaBBuv3A==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-6.2.0.tgz",
+      "integrity": "sha512-FcJ3x+rcAKGKr4Y9tbPjXkt39I6aiAMD//ElDYcWGMFp4GjMeXP6JYrfl1yNqvH65fzehqLD71MQMlt/5/9ZIQ==",
       "dependencies": {
         "async": "^3.1.0",
         "chalk": "^4.0.0",
@@ -28675,8 +28302,7 @@
         "lodash.assign": "^4.2.0",
         "lodash.find": "^4.6.0",
         "lodash.isempty": "^4.4.0",
-        "lodash.iserror": "^3.1.1",
-        "proxy-agent": "^5.0.0"
+        "lodash.iserror": "^3.1.1"
       },
       "peerDependencies": {
         "@aws-sdk/client-cloudwatch-logs": "^3.0.0",
@@ -28986,10 +28612,6 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/xregexp": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "dev": true,
@@ -29005,6 +28627,7 @@
     },
     "node_modules/yallist": {
       "version": "3.1.1",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
@@ -33529,9 +33152,6 @@
         "defer-to-connect": "^2.0.0"
       }
     },
-    "@tootallnate/once": {
-      "version": "1.1.2"
-    },
     "@tsconfig/node10": {
       "version": "1.0.9",
       "dev": true
@@ -36771,9 +36391,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "data-uri-to-buffer": {
-      "version": "3.0.1"
-    },
     "date-fns": {
       "version": "2.30.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -36940,29 +36557,6 @@
       "version": "1.0.1",
       "dev": true
     },
-    "degenerator": {
-      "version": "3.0.2",
-      "requires": {
-        "ast-types": "^0.13.2",
-        "escodegen": "^1.8.1",
-        "esprima": "^4.0.0",
-        "vm2": "^3.9.8"
-      },
-      "dependencies": {
-        "ast-types": {
-          "version": "0.13.4",
-          "requires": {
-            "tslib": "^2.0.1"
-          }
-        },
-        "esprima": {
-          "version": "4.0.1"
-        },
-        "tslib": {
-          "version": "2.3.1"
-        }
-      }
-    },
     "del": {
       "version": "3.0.0",
       "dev": true,
@@ -37403,25 +36997,6 @@
     "escape-string-regexp": {
       "version": "1.0.5"
     },
-    "escodegen": {
-      "version": "1.14.2",
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "4.0.1"
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "optional": true
-        }
-      }
-    },
     "eslint": {
       "version": "8.30.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
@@ -38392,7 +37967,8 @@
       }
     },
     "estraverse": {
-      "version": "4.3.0"
+      "version": "4.3.0",
+      "dev": true
     },
     "esutils": {
       "version": "2.0.3"
@@ -39233,14 +38809,6 @@
     "fs-constants": {
       "version": "1.0.0"
     },
-    "fs-extra": {
-      "version": "8.1.0",
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
     "fs-minipass": {
       "version": "2.1.0",
       "requires": {
@@ -39264,30 +38832,6 @@
       "version": "2.3.2",
       "optional": true
     },
-    "ftp": {
-      "version": "0.3.10",
-      "requires": {
-        "readable-stream": "1.1.x",
-        "xregexp": "2.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1"
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31"
-        }
-      }
-    },
     "function-bind": {
       "version": "1.1.1"
     },
@@ -39489,28 +39033,6 @@
         "get-intrinsic": "^1.1.1"
       }
     },
-    "get-uri": {
-      "version": "3.0.2",
-      "requires": {
-        "@tootallnate/once": "1",
-        "data-uri-to-buffer": "3",
-        "debug": "4",
-        "file-uri-to-path": "2",
-        "fs-extra": "^8.1.0",
-        "ftp": "^0.3.10"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "file-uri-to-path": {
-          "version": "2.0.0"
-        }
-      }
-    },
     "get-value": {
       "version": "2.0.6",
       "dev": true
@@ -39980,22 +39502,6 @@
         "toidentifier": "1.0.1"
       }
     },
-    "http-proxy-agent": {
-      "version": "4.0.1",
-      "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
     "http-reasons": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/http-reasons/-/http-reasons-0.1.0.tgz",
@@ -40183,7 +39689,8 @@
       "integrity": "sha512-Rq2BsYmtwS5vVttie4rqrOCIfHCS9TgpRLFpKQCM1wZBBRY9nWVGmEvm2FnDbSE2un1UE39DvFpTR5UL47YDcA=="
     },
     "ip": {
-      "version": "1.1.5"
+      "version": "1.1.5",
+      "dev": true
     },
     "ipaddr.js": {
       "version": "1.9.1"
@@ -42507,12 +42014,6 @@
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz",
       "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w=="
     },
-    "jsonfile": {
-      "version": "4.0.0",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
     "jsonparse": {
       "version": "1.3.1"
     },
@@ -44030,9 +43531,6 @@
       "version": "2.6.1",
       "dev": true
     },
-    "netmask": {
-      "version": "2.0.2"
-    },
     "neverthrow": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/neverthrow/-/neverthrow-6.0.0.tgz",
@@ -44569,36 +44067,6 @@
     "p-try": {
       "version": "2.2.0"
     },
-    "pac-proxy-agent": {
-      "version": "5.0.0",
-      "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4",
-        "get-uri": "3",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "5",
-        "pac-resolver": "^5.0.0",
-        "raw-body": "^2.2.0",
-        "socks-proxy-agent": "5"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
-    "pac-resolver": {
-      "version": "5.0.1",
-      "requires": {
-        "degenerator": "^3.0.2",
-        "ip": "^1.1.5",
-        "netmask": "^2.0.2"
-      }
-    },
     "pako": {
       "version": "1.0.11"
     },
@@ -45167,33 +44635,6 @@
         "ipaddr.js": "1.9.1"
       }
     },
-    "proxy-agent": {
-      "version": "5.0.0",
-      "requires": {
-        "agent-base": "^6.0.0",
-        "debug": "4",
-        "http-proxy-agent": "^4.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^5.0.0",
-        "proxy-from-env": "^1.0.0",
-        "socks-proxy-agent": "^5.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        }
-      }
-    },
     "proxy-from-env": {
       "version": "1.1.0"
     },
@@ -46188,9 +45629,6 @@
     "slick-carousel": {
       "version": "1.8.1"
     },
-    "smart-buffer": {
-      "version": "4.2.0"
-    },
     "smtp-server": {
       "version": "3.11.0",
       "dev": true,
@@ -46354,34 +45792,6 @@
         }
       }
     },
-    "socks": {
-      "version": "2.7.0",
-      "requires": {
-        "ip": "^2.0.0",
-        "smart-buffer": "^4.2.0"
-      },
-      "dependencies": {
-        "ip": {
-          "version": "2.0.0"
-        }
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "5.0.1",
-      "requires": {
-        "agent-base": "^6.0.2",
-        "debug": "4",
-        "socks": "^2.3.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
     "sonic-boom": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.4.1.tgz",
@@ -48165,7 +47575,8 @@
       }
     },
     "universalify": {
-      "version": "0.1.2"
+      "version": "0.1.2",
+      "dev": true
     },
     "unix-dgram": {
       "version": "2.0.4",
@@ -48410,23 +47821,6 @@
       "version": "1.1.2",
       "dev": true
     },
-    "vm2": {
-      "version": "3.9.18",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.18.tgz",
-      "integrity": "sha512-iM7PchOElv6Uv6Q+0Hq7dcgDtWWT6SizYqVcvol+1WQc+E9HlgTCnPozbQNSP3yDV9oXHQOEQu530w2q/BCVZg==",
-      "requires": {
-        "acorn": "^8.7.0",
-        "acorn-walk": "^8.2.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "8.8.0"
-        },
-        "acorn-walk": {
-          "version": "8.2.0"
-        }
-      }
-    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "dev": true,
@@ -49075,9 +48469,9 @@
       }
     },
     "winston-cloudwatch": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-6.1.1.tgz",
-      "integrity": "sha512-5wOJhAYRU3s6I1t/XO1/3tHJLhzvUUNNxcdbAjhDbyaKnghgKHrRtoQPXO2qTlWOTdhoXS0nJqV/L3RaBBuv3A==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-6.2.0.tgz",
+      "integrity": "sha512-FcJ3x+rcAKGKr4Y9tbPjXkt39I6aiAMD//ElDYcWGMFp4GjMeXP6JYrfl1yNqvH65fzehqLD71MQMlt/5/9ZIQ==",
       "requires": {
         "async": "^3.1.0",
         "chalk": "^4.0.0",
@@ -49085,8 +48479,7 @@
         "lodash.assign": "^4.2.0",
         "lodash.find": "^4.6.0",
         "lodash.isempty": "^4.4.0",
-        "lodash.iserror": "^3.1.1",
-        "proxy-agent": "^5.0.0"
+        "lodash.iserror": "^3.1.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -49274,9 +48667,6 @@
       "version": "0.0.32",
       "dev": true
     },
-    "xregexp": {
-      "version": "2.0.0"
-    },
     "xtend": {
       "version": "4.0.2",
       "dev": true
@@ -49286,7 +48676,8 @@
       "dev": true
     },
     "yallist": {
-      "version": "3.1.1"
+      "version": "3.1.1",
+      "dev": true
     },
     "yaml": {
       "version": "1.10.2",
diff --git a/package.json b/package.json
index 69650d55a0..b5353a35d3 100644
--- a/package.json
+++ b/package.json
@@ -173,7 +173,7 @@
     "web-streams-polyfill": "^3.2.1",
     "whatwg-fetch": "^3.6.2",
     "winston": "^3.8.2",
-    "winston-cloudwatch": "^6.1.1",
+    "winston-cloudwatch": "^6.2.0",
     "zod": "^3.21.4"
   },
   "devDependencies": {

From 590f2557eddc687bb0ae85a189c18f8e56f2c228 Mon Sep 17 00:00:00 2001
From: sebastianwzq <136435307+sebastianwzq@users.noreply.github.com>
Date: Tue, 18 Jul 2023 16:04:35 +0800
Subject: [PATCH 05/10] fix: updating csp to fix bypass (#6535)

* removed gtm and gstatic from csp headers

* removed gtm and gstatic from csp headers

* loading specific files for recaptcha

* corrected path

* corrected path

* test defer

* add tags

* reverted hardcoded tracking id

* reverted changes to gtm

* added gtm

* updated csp

* added comments

* updated comments
---
 src/app/loaders/express/__tests__/helmet.spec.ts | 8 ++++----
 src/app/loaders/express/helmet.ts                | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/loaders/express/__tests__/helmet.spec.ts b/src/app/loaders/express/__tests__/helmet.spec.ts
index e76cb017be..4e8d216d2b 100644
--- a/src/app/loaders/express/__tests__/helmet.spec.ts
+++ b/src/app/loaders/express/__tests__/helmet.spec.ts
@@ -31,17 +31,17 @@ describe('helmetMiddlewares', () => {
     fontSrc: ["'self'", 'data:', 'https://fonts.gstatic.com/'],
     scriptSrc: [
       "'self'",
-      'https://www.googletagmanager.com/',
       'https://ssl.google-analytics.com/',
       'https://www.google-analytics.com/',
       'https://www.tagmanager.google.com/',
       'https://www.google.com/recaptcha/',
       'https://www.recaptcha.net/recaptcha/',
-      'https://www.gstatic.com/recaptcha/',
+      'https://www.gstatic.com/recaptcha/releases/',
       'https://challenges.cloudflare.com',
       'https://js.stripe.com/v3',
-      'https://www.gstatic.cn/',
-      'https://*.googletagmanager.com',
+      // GA4 https://developers.google.com/tag-platform/tag-manager/web/csp
+      // not actively used yet, loading specific file due to CSP bypass issue
+      'https://*.googletagmanager.com/gtag/',
     ],
     connectSrc: [
       "'self'",
diff --git a/src/app/loaders/express/helmet.ts b/src/app/loaders/express/helmet.ts
index f48b6a7285..ba054e08a7 100644
--- a/src/app/loaders/express/helmet.ts
+++ b/src/app/loaders/express/helmet.ts
@@ -44,17 +44,17 @@ const helmetMiddlewares = () => {
     fontSrc: ["'self'", 'data:', 'https://fonts.gstatic.com/'],
     scriptSrc: [
       "'self'",
-      'https://www.googletagmanager.com/',
       'https://ssl.google-analytics.com/',
       'https://www.google-analytics.com/',
       'https://www.tagmanager.google.com/',
       'https://www.google.com/recaptcha/',
       'https://www.recaptcha.net/recaptcha/',
-      'https://www.gstatic.com/recaptcha/',
+      'https://www.gstatic.com/recaptcha/releases/',
       'https://challenges.cloudflare.com',
       'https://js.stripe.com/v3',
-      'https://www.gstatic.cn/',
-      'https://*.googletagmanager.com', // GA4 https://developers.google.com/tag-platform/tag-manager/web/csp
+      // GA4 https://developers.google.com/tag-platform/tag-manager/web/csp
+      // not actively used yet, loading specific files due to CSP bypass issue
+      'https://*.googletagmanager.com/gtag/',
     ],
     connectSrc: [
       "'self'",

From 922a1de29fb0e3e5fa8126f5ebc01c90f6b1060e Mon Sep 17 00:00:00 2001
From: Ken Lee Shu Ming <ken@open.gov.sg>
Date: Tue, 18 Jul 2023 16:07:45 +0800
Subject: [PATCH 06/10] chore: reduce max payment limit (#6543)

* chore: lower max payment amount cents to 200k

* fix: variable amounts to draw max payment amount from env
---
 .../VariablePaymentAmountField.tsx            | 20 +++++++++++--------
 src/app/config/features/payment.config.ts     |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/PaymentsInputPanel/VariablePaymentAmountField.tsx b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/PaymentsInputPanel/VariablePaymentAmountField.tsx
index ee4742b1e9..bce9785704 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/PaymentsInputPanel/VariablePaymentAmountField.tsx
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/PaymentsInputPanel/VariablePaymentAmountField.tsx
@@ -32,23 +32,27 @@ export const VariablePaymentAmountField = ({
       minPaymentAmountCents = Number.MIN_SAFE_INTEGER,
     } = {},
   } = useEnv()
+
+  const minAmountInDollars = `S${formatCurrency(
+    Number(centsToDollars(minPaymentAmountCents)),
+  )}`
+  const maxAmountInDollars = `S${formatCurrency(
+    Number(centsToDollars(maxPaymentAmountCents)),
+  )}`
+
   const minAmountValidation: RegisterOptions<
     FormPaymentsInput,
     typeof MIN_FIELD_KEY
   > = usePaymentFieldValidation<FormPaymentsInput, typeof MIN_FIELD_KEY>({
     lesserThanCents: dollarsToCents(input[MAX_FIELD_KEY] || ''),
-    msgWhenEmpty: `The minimum amount is S${formatCurrency(
-      Number(centsToDollars(minPaymentAmountCents)),
-    )}`,
+    msgWhenEmpty: `The minimum amount is ${minAmountInDollars}`,
   })
   const maxAmountValidation: RegisterOptions<
     FormPaymentsInput,
     typeof MAX_FIELD_KEY
   > = usePaymentFieldValidation<FormPaymentsInput, typeof MAX_FIELD_KEY>({
     greaterThanCents: dollarsToCents(input[MIN_FIELD_KEY] || ''),
-    msgWhenEmpty: `The maximum amount is S${formatCurrency(
-      Number(centsToDollars(maxPaymentAmountCents)),
-    )}`,
+    msgWhenEmpty: `The maximum amount is ${maxAmountInDollars}`,
   })
   return (
     <FormControl
@@ -77,7 +81,7 @@ export const VariablePaymentAmountField = ({
                 flex={1}
                 step={0}
                 inputMode="decimal"
-                placeholder="S$0.50"
+                placeholder={minAmountInDollars}
                 {...field}
               />
             )}
@@ -97,7 +101,7 @@ export const VariablePaymentAmountField = ({
                 flex={1}
                 step={0}
                 inputMode="decimal"
-                placeholder="S$1,000,000"
+                placeholder={maxAmountInDollars}
                 {...field}
               />
             )}
diff --git a/src/app/config/features/payment.config.ts b/src/app/config/features/payment.config.ts
index fd4af25159..aeb069ca44 100644
--- a/src/app/config/features/payment.config.ts
+++ b/src/app/config/features/payment.config.ts
@@ -53,7 +53,7 @@ const paymentFeature: Schema<IPaymentFeature> = {
   maxPaymentAmountCents: {
     doc: 'Maximum amount that can be paid for a form',
     format: Number,
-    default: 100000000, // Arbitrary large payment amount we should be concerned about
+    default: 200 * 1000 * 100, // 200k, this is the maximum limit for paynow transactions
     env: 'PAYMENT_MAX_PAYMENT_AMOUNT_CENTS',
   },
   minPaymentAmountCents: {

From 8b6905026057b3cc077401f38a9c1c3f909e1afe Mon Sep 17 00:00:00 2001
From: wanlingt <56983748+wanlingt@users.noreply.github.com>
Date: Tue, 18 Jul 2023 16:15:54 +0800
Subject: [PATCH 07/10] feat: indicate if GST has been applied to a payment
 transaction (#6538)

* feat: add gst_enabled flag to form definition

* feat: add gst_enabled flag to payment model

* feat: add validation check for gst_enabled flag when updating payment

* feat: add gstEnabled field when a new payment is created

* feat: modify invoice according to whether GST is enabled

* fix: edit invoice format

* test: add gstEnabled to payments tests

* test: fix more tests

* feat: add datafix script

* docs: refine description of script

* feat: add GST toggle to payment settings page

* fix: remove GST Reg No and Business Address descriptions

* fix: UI changes

* fix: set gst_enabled default in form model to true

* fix: update test

* fix: update db script
---
 .../admin-form/settings/SettingsService.ts    |  9 +++
 .../BusinessInfoSection.tsx                   | 30 +++-----
 .../GstToggleSection.tsx                      | 50 +++++++++++++
 .../PaymentSettingsSection.tsx                |  2 +
 .../features/admin-form/settings/mutations.ts | 16 +++++
 .../set-gst-enabled-flag.js                   | 70 +++++++++++++++++++
 shared/types/form/form.ts                     |  1 +
 shared/types/payment.ts                       |  1 +
 .../__tests__/form.server.model.spec.ts       |  1 +
 src/app/models/form.server.model.ts           |  4 ++
 src/app/models/payment.server.model.ts        |  4 ++
 .../form/admin-form/admin-form.middlewares.ts |  1 +
 .../admin-form.payments.controller.ts         |  4 ++
 .../__tests__/payments.controller.spec.ts     |  4 ++
 .../__tests__/payments.service.spec.ts        |  5 ++
 .../__tests__/stripe.controller.spec.ts       |  3 +
 .../payments/__tests__/stripe.service.spec.ts |  1 +
 src/app/modules/payments/stripe.service.ts    |  1 +
 src/app/modules/payments/stripe.utils.ts      | 29 +++++---
 .../encrypt-submission.controller.ts          |  1 +
 .../admin-forms.submissions.routes.spec.ts    |  2 +
 21 files changed, 210 insertions(+), 29 deletions(-)
 create mode 100644 frontend/src/features/admin-form/settings/components/PaymentSettingsSection/GstToggleSection.tsx
 create mode 100644 scripts/20230718_set-gst-enabled-flag/set-gst-enabled-flag.js

diff --git a/frontend/src/features/admin-form/settings/SettingsService.ts b/frontend/src/features/admin-form/settings/SettingsService.ts
index 2ddb570426..5b8f6b8729 100644
--- a/frontend/src/features/admin-form/settings/SettingsService.ts
+++ b/frontend/src/features/admin-form/settings/SettingsService.ts
@@ -119,6 +119,15 @@ export const updateBusinessInfo: UpdateStorageFormFn<'business'> = async (
   return updateFormSettings(formId, { business: newBusinessField })
 }
 
+export const updateGstEnabledFlag = async (
+  formId: string,
+  gstEnabledFlag: StorageFormSettings['payments_field']['gst_enabled'],
+) => {
+  return updateFormSettings(formId, {
+    payments_field: { gst_enabled: gstEnabledFlag },
+  })
+}
+
 /**
  * Internal function that calls the PATCH API.
  * @param formId the id of the form to update
diff --git a/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/BusinessInfoSection.tsx b/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/BusinessInfoSection.tsx
index 575a7ce078..b03a9bceec 100644
--- a/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/BusinessInfoSection.tsx
+++ b/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/BusinessInfoSection.tsx
@@ -88,26 +88,18 @@ const BusinessInfoBlock = ({
   }
   return (
     <>
+      {settings.payments_field.gst_enabled ? (
+        <FormControl mb="2.5rem" isReadOnly={mutateFormBusiness.isLoading}>
+          <FormLabel isRequired>GST Registration Number</FormLabel>
+          <BusinessFieldInput
+            placeholder={agencyDefaults?.gstRegNo || ''}
+            initialValue={settings.business?.gstRegNo || ''}
+            handleMutation={handleGstRegNoMutation}
+          />
+        </FormControl>
+      ) : null}
       <FormControl mb="2.5rem" isReadOnly={mutateFormBusiness.isLoading}>
-        <FormLabel
-          description="Leave blank to use your agency's GST Registration Number"
-          isRequired
-        >
-          GST Registration Number
-        </FormLabel>
-        <BusinessFieldInput
-          placeholder={agencyDefaults?.gstRegNo || ''}
-          initialValue={settings.business?.gstRegNo || ''}
-          handleMutation={handleGstRegNoMutation}
-        />
-      </FormControl>
-      <FormControl mb="2.5rem" isReadOnly={mutateFormBusiness.isLoading}>
-        <FormLabel
-          description="Leave blank to use your agency's business address"
-          isRequired
-        >
-          Business Address
-        </FormLabel>
+        <FormLabel isRequired>Business Address</FormLabel>
         <BusinessFieldInput
           placeholder={agencyDefaults?.address || ''}
           initialValue={settings.business?.address || ''}
diff --git a/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/GstToggleSection.tsx b/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/GstToggleSection.tsx
new file mode 100644
index 0000000000..b63e01d064
--- /dev/null
+++ b/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/GstToggleSection.tsx
@@ -0,0 +1,50 @@
+import { useCallback, useMemo } from 'react'
+import { Skeleton } from '@chakra-ui/react'
+
+import { FormResponseMode } from '~shared/types'
+
+import Toggle from '~components/Toggle'
+
+import { useMutateFormSettings } from '../../mutations'
+import { useAdminFormSettings } from '../../queries'
+
+export const GstToggleSection = (): JSX.Element => {
+  const { data: settings, isLoading: isLoadingSettings } =
+    useAdminFormSettings()
+
+  const hasGST = useMemo(
+    () =>
+      settings &&
+      settings.responseMode === FormResponseMode.Encrypt &&
+      settings?.payments_field.gst_enabled,
+    [settings],
+  )
+
+  const { mutateGST } = useMutateFormSettings()
+
+  const handleToggleGST = useCallback(() => {
+    if (
+      !settings ||
+      isLoadingSettings ||
+      mutateGST.isLoading ||
+      settings.responseMode !== FormResponseMode.Encrypt
+    ) {
+      return
+    }
+    const nextHasGst = !settings.payments_field.gst_enabled
+    return mutateGST.mutate(nextHasGst)
+  }, [isLoadingSettings, mutateGST, settings])
+
+  return (
+    <Skeleton isLoaded={!isLoadingSettings && !!settings}>
+      <Toggle
+        mb="2.5rem"
+        isLoading={mutateGST.isLoading}
+        isChecked={hasGST}
+        label="GST applicable"
+        description="GST will be mentioned in proof of payment"
+        onChange={() => handleToggleGST()}
+      />
+    </Skeleton>
+  )
+}
diff --git a/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/PaymentSettingsSection.tsx b/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/PaymentSettingsSection.tsx
index 71e1746f09..4a503f48e9 100644
--- a/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/PaymentSettingsSection.tsx
+++ b/frontend/src/features/admin-form/settings/components/PaymentSettingsSection/PaymentSettingsSection.tsx
@@ -24,6 +24,7 @@ import { useEnv } from '~features/env/queries'
 import { useAdminFormPayments, useAdminFormSettings } from '../../queries'
 
 import { BusinessInfoSection } from './BusinessInfoSection'
+import { GstToggleSection } from './GstToggleSection'
 import { usePaymentGuideLink } from './queries'
 import {
   StripeConnectButton,
@@ -231,6 +232,7 @@ export const PaymentSettingsSection = (): JSX.Element => {
           {hasPaymentCapabilities && (
             <>
               <Divider my="2.5rem" />
+              <GstToggleSection />
               <BusinessInfoSection />
             </>
           )}
diff --git a/frontend/src/features/admin-form/settings/mutations.ts b/frontend/src/features/admin-form/settings/mutations.ts
index fe985ee436..ce03163b7e 100644
--- a/frontend/src/features/admin-form/settings/mutations.ts
+++ b/frontend/src/features/admin-form/settings/mutations.ts
@@ -37,6 +37,7 @@ import {
   updateFormTitle,
   updateFormWebhookRetries,
   updateFormWebhookUrl,
+  updateGstEnabledFlag,
   updateTwilioCredentials,
 } from './SettingsService'
 
@@ -303,6 +304,20 @@ export const useMutateFormSettings = () => {
     },
   )
 
+  const mutateGST = useMutation(
+    (gstEnabledFlag: StorageFormSettings['payments_field']['gst_enabled']) =>
+      updateGstEnabledFlag(formId, gstEnabledFlag),
+    {
+      onSuccess: (newData) => {
+        handleSuccess({
+          newData,
+          toastDescription: `GST setting has been updated.`,
+        })
+      },
+      onError: handleError,
+    },
+  )
+
   return {
     mutateWebhookRetries,
     mutateFormWebhookUrl,
@@ -315,6 +330,7 @@ export const useMutateFormSettings = () => {
     mutateFormAuthType,
     mutateFormEsrvcId,
     mutateFormBusiness,
+    mutateGST,
   }
 }
 
diff --git a/scripts/20230718_set-gst-enabled-flag/set-gst-enabled-flag.js b/scripts/20230718_set-gst-enabled-flag/set-gst-enabled-flag.js
new file mode 100644
index 0000000000..c637213ba4
--- /dev/null
+++ b/scripts/20230718_set-gst-enabled-flag/set-gst-enabled-flag.js
@@ -0,0 +1,70 @@
+/* eslint-disable */
+
+/**
+ * This script adds the `gstEnabled` flag to the payments collection and sets the flag for all existing documents to true. 
+ * It also adds the `gst_enabled` flag to the `payments_field` in the form collection, and sets the flag for all existing
+ * documents with a `payments_field` to true. 
+ */
+
+// PAYMENTS COLLECTION
+// BEFORE
+// Count total number of payments.
+db.getCollection('payments').countDocuments({})
+
+// Count total number of payments with no gstEnabled flag value. This should be equal to the total number of payments.
+db
+  .getCollection('payments')
+  .countDocuments({ gstEnabled: { $exists: false } })
+
+// UPDATE
+db.getCollection('payments').updateMany({}, [
+  { $set: { gstEnabled: true } },
+])
+
+// AFTER
+// Count total number of payments with gstEnabled flag value. This should be equal to the total number of payments.
+db
+  .getCollection('payments')
+  .countDocuments({ gstEnabled: { $exists: true } })
+
+// Count total number of payments with no gstEnabled flag value. This should be equal to 0
+db
+  .getCollection('payments')
+  .countDocuments({ gstEnabled: { $exists: false } })
+
+
+// FORM COLLECTION
+// BEFORE
+
+// Count number of forms that contains the payments_field property
+db.getCollection("forms").find(
+    {payments_field: {$ne: null }},
+).count()
+
+// Count total number of forms with no gstEnabled flag value. This should be equal to 0.
+db.getCollection('forms')
+  .find({ 'payments_field.gst_enabled': { $exists: true } })
+  .count()
+
+// UPDATE all forms (with payment fields) gst_enabled flag to true
+db.getCollection('forms').updateMany({ payments_field: { $ne: null } },  [
+  { $set: { payments_field: { gst_enabled: true } } },
+])
+
+// AFTER
+// Count total number of forms with gstEnabled flag value. This should be equal to the total number of forms with payments_fields.
+db.getCollection('forms')
+  .find({ 'payments_field.gst_enabled': { $exists: true } })
+  .count()
+
+// Count total number of forms with payments_field property and no gstEnabled flag value. This should be equal to 0
+
+db.getCollection('forms')
+  .find({
+    $and: [
+      { payments_field: { $ne: null } },
+      { payments_field: {gst_enabled: { $ne: null }} },
+    ],
+  })
+  .count()
+
diff --git a/shared/types/form/form.ts b/shared/types/form/form.ts
index 8feb7ebaa2..1888056b17 100644
--- a/shared/types/form/form.ts
+++ b/shared/types/form/form.ts
@@ -99,6 +99,7 @@ export type FormPaymentsField =
       enabled: boolean
       description?: string
       name?: string
+      gst_enabled?: boolean
     } & (VariablePaymentsField | FixedPaymentField)
 
 export type FormBusinessField = {
diff --git a/shared/types/payment.ts b/shared/types/payment.ts
index 0347a4906a..5a6486f80f 100644
--- a/shared/types/payment.ts
+++ b/shared/types/payment.ts
@@ -43,6 +43,7 @@ export type Payment = {
   email: string
   amount: number
   paymentIntentId: string
+  gstEnabled: boolean
 
   // Payment status tracking
   webhookLog: Stripe.Event[]
diff --git a/src/app/models/__tests__/form.server.model.spec.ts b/src/app/models/__tests__/form.server.model.spec.ts
index d6f1fd23ad..cdedd7e90e 100644
--- a/src/app/models/__tests__/form.server.model.spec.ts
+++ b/src/app/models/__tests__/form.server.model.spec.ts
@@ -104,6 +104,7 @@ const PAYMENTS_DEFAULTS = {
     min_amount: 0,
     max_amount: 0,
     payment_type: PaymentType.Fixed,
+    gst_enabled: true,
   },
 }
 
diff --git a/src/app/models/form.server.model.ts b/src/app/models/form.server.model.ts
index d44ef59c0f..d55394ac29 100644
--- a/src/app/models/form.server.model.ts
+++ b/src/app/models/form.server.model.ts
@@ -200,6 +200,10 @@ const EncryptedFormSchema = new Schema<IEncryptedFormSchema>({
       enum: Object.values(PaymentType),
       default: PaymentType.Fixed,
     },
+    gst_enabled: {
+      type: Boolean,
+      default: true,
+    },
   },
 
   business: {
diff --git a/src/app/models/payment.server.model.ts b/src/app/models/payment.server.model.ts
index ba8748afa0..2c865740ca 100644
--- a/src/app/models/payment.server.model.ts
+++ b/src/app/models/payment.server.model.ts
@@ -38,6 +38,10 @@ const PaymentSchema = new Schema<IPaymentSchema, IPaymentModel>(
       type: String,
       required: true,
     },
+    gstEnabled: {
+      type: Boolean,
+      required: true,
+    },
     responses: [],
 
     webhookLog: [],
diff --git a/src/app/modules/form/admin-form/admin-form.middlewares.ts b/src/app/modules/form/admin-form/admin-form.middlewares.ts
index cd03eb51bb..0c3a1f5aba 100644
--- a/src/app/modules/form/admin-form/admin-form.middlewares.ts
+++ b/src/app/modules/form/admin-form/admin-form.middlewares.ts
@@ -32,6 +32,7 @@ export const updateSettingsValidator = celebrate({
       address: Joi.string().allow(''),
       gstRegNo: Joi.string().allow(''),
     }),
+    payments_field: Joi.object({ gst_enabled: Joi.boolean() }),
   })
     .min(1)
     .custom((value, helpers) => verifyValidUnicodeString(value, helpers)),
diff --git a/src/app/modules/form/admin-form/admin-form.payments.controller.ts b/src/app/modules/form/admin-form/admin-form.payments.controller.ts
index ff18967ba7..74f31cffa4 100644
--- a/src/app/modules/form/admin-form/admin-form.payments.controller.ts
+++ b/src/app/modules/form/admin-form/admin-form.payments.controller.ts
@@ -371,6 +371,10 @@ const updatePaymentsValidator = celebrate({
       then: Joi.string().trim().required(),
       otherwise: Joi.string().trim().allow(''),
     }),
+    gst_enabled: Joi.when('enabled', {
+      is: Joi.equal(true),
+      then: Joi.boolean().required(),
+    }),
   },
 })
 
diff --git a/src/app/modules/payments/__tests__/payments.controller.spec.ts b/src/app/modules/payments/__tests__/payments.controller.spec.ts
index 7608f145a5..74f919b95b 100644
--- a/src/app/modules/payments/__tests__/payments.controller.spec.ts
+++ b/src/app/modules/payments/__tests__/payments.controller.spec.ts
@@ -42,6 +42,7 @@ describe('payments.controller', () => {
         completedPayment: {
           receiptUrl: 'http://form.gov.sg',
         },
+        gstEnabled: false,
       })
 
       const mockReq = expressHandler.mockRequest({
@@ -72,6 +73,7 @@ describe('payments.controller', () => {
         completedPayment: {
           receiptUrl: 'http://form.gov.sg',
         },
+        gstEnabled: false,
       })
 
       const mockReq = expressHandler.mockRequest({
@@ -101,6 +103,7 @@ describe('payments.controller', () => {
         completedPayment: {
           receiptUrl: 'http://form.gov.sg',
         },
+        gstEnabled: false,
       })
 
       const mockReq = expressHandler.mockRequest({
@@ -130,6 +133,7 @@ describe('payments.controller', () => {
         completedPayment: {
           receiptUrl: 'http://form.gov.sg',
         },
+        gstEnabled: false,
       })
 
       const mockReq = expressHandler.mockRequest({
diff --git a/src/app/modules/payments/__tests__/payments.service.spec.ts b/src/app/modules/payments/__tests__/payments.service.spec.ts
index 4844c09d0a..78ba5e2764 100644
--- a/src/app/modules/payments/__tests__/payments.service.spec.ts
+++ b/src/app/modules/payments/__tests__/payments.service.spec.ts
@@ -44,6 +44,7 @@ describe('payments.service', () => {
         paymentIntentId: 'somePaymentIntentId',
         amount: 314159,
         email: 'someone@mail.com',
+        gstEnabled: false,
       })
 
       // Act
@@ -86,6 +87,7 @@ describe('payments.service', () => {
         amount: 314159,
         email: email,
         status: PaymentStatus.Succeeded,
+        gstEnabled: false,
       })
     })
     afterEach(() => jest.clearAllMocks())
@@ -114,6 +116,7 @@ describe('payments.service', () => {
         amount: 314159,
         email: email,
         status: PaymentStatus.Succeeded,
+        gstEnabled: false,
       })
       const result =
         await PaymentsService.findLatestSuccessfulPaymentByEmailAndFormId(
@@ -163,6 +166,7 @@ describe('payments.service', () => {
         amount: 314159,
         email: newEmail,
         status: PaymentStatus.Pending,
+        gstEnabled: false,
       })
       const result =
         await PaymentsService.findLatestSuccessfulPaymentByEmailAndFormId(
@@ -197,6 +201,7 @@ describe('payments.service', () => {
         targetAccountId: 'acct_MOCK_ID',
         formId: new ObjectId(),
         pendingSubmissionId: new ObjectId(),
+        gstEnabled: false,
       }
 
       await Payment.create({
diff --git a/src/app/modules/payments/__tests__/stripe.controller.spec.ts b/src/app/modules/payments/__tests__/stripe.controller.spec.ts
index 553f4562ad..ce2f0bf4fc 100644
--- a/src/app/modules/payments/__tests__/stripe.controller.spec.ts
+++ b/src/app/modules/payments/__tests__/stripe.controller.spec.ts
@@ -76,6 +76,7 @@ describe('stripe.controller', () => {
       ...mockBusinessInfo,
       formTitle: mockFormTitle,
       submissionId: mockSubmissionId,
+      gstEnabled: false,
     }
     const mockForm = {
       _id: MOCK_FORM_ID,
@@ -111,6 +112,7 @@ describe('stripe.controller', () => {
           receiptUrl: 'http://form.gov.sg',
           submissionId: mockSubmissionId,
         },
+        gstEnabled: false,
       })
     })
     it('should generate return a pdf file when receipt url is present', async () => {
@@ -213,6 +215,7 @@ describe('stripe.controller', () => {
         completedPayment: {
           receiptUrl: 'http://form.gov.sg',
         },
+        gstEnabled: false,
       })
 
       const mockReq = expressHandler.mockRequest({
diff --git a/src/app/modules/payments/__tests__/stripe.service.spec.ts b/src/app/modules/payments/__tests__/stripe.service.spec.ts
index acd39d743f..6c46c7a530 100644
--- a/src/app/modules/payments/__tests__/stripe.service.spec.ts
+++ b/src/app/modules/payments/__tests__/stripe.service.spec.ts
@@ -281,6 +281,7 @@ describe('stripe.service', () => {
         status: PaymentStatus.Pending,
         paymentIntentId: 'pi_MOCK_PAYMENT_INTENT',
         email: 'formsg@tech.gov.sg',
+        gstEnabled: false,
       })
       await pendingSubmission.updateOne({
         paymentId: payment._id,
diff --git a/src/app/modules/payments/stripe.service.ts b/src/app/modules/payments/stripe.service.ts
index 9c4c489bc5..dbe0a69b5a 100644
--- a/src/app/modules/payments/stripe.service.ts
+++ b/src/app/modules/payments/stripe.service.ts
@@ -999,6 +999,7 @@ export const generatePaymentInvoice = (
       gstRegNo: businessGstRegNo || '',
       formTitle: populatedForm.title,
       submissionId: payment.completedPayment?.submissionId || '',
+      gstEnabled: payment.gstEnabled,
     })
 
     return ResultAsync.fromPromise(
diff --git a/src/app/modules/payments/stripe.utils.ts b/src/app/modules/payments/stripe.utils.ts
index 8e52ccef5d..47743d34d7 100644
--- a/src/app/modules/payments/stripe.utils.ts
+++ b/src/app/modules/payments/stripe.utils.ts
@@ -409,30 +409,24 @@ export const convertToInvoiceFormat = (
     gstRegNo,
     formTitle,
     submissionId,
+    gstEnabled,
   }: {
     address: string
     gstRegNo: string
     formTitle: string
     submissionId: string
+    gstEnabled: boolean
   },
 ) => {
   // handle special characters in addresses
   const ADDRESS = encode(address)
   const GST_REG_NO = encode(gstRegNo)
 
-  const edited = receiptHtmlSource
+  const commonEdits = receiptHtmlSource
     .replace(/(<title>.*?)receipt(.*?<\/title>)/, '$1invoice$2')
     .replace(/Receipt from /g, 'Invoice from ')
-    .replace(
-      /Receipt (#[0-9-]+)/,
-      `Invoice $1<br /><br />GST Reg No: ${GST_REG_NO}<br />Address: ${ADDRESS}`,
-    )
     .replace(/Date paid/g, 'Invoice Date')
     .replace(/<br>\(This amount is inclusive of GST\)/, '')
-    .replace(
-      '<strong>Amount charged</strong>',
-      '<strong>Amount charged</strong> <i>(includes GST)</i>',
-    )
     .replace(
       /Something wrong with the email\? <a.+a>/,
       `FormSG Form: ${encode(formTitle)}<br />Response ID: ${submissionId}`,
@@ -442,7 +436,22 @@ export const convertToInvoiceFormat = (
       '<td class="st-Spacer st-Spacer--gutter" width="48"></td>',
     )
 
-  const dom = new JSDOM(edited)
+  const gstDependentEdits = gstEnabled
+    ? commonEdits
+        .replace(
+          /Receipt (#[0-9-]+)/,
+          `Invoice $1<br /><br />GST Reg No: ${GST_REG_NO}<br />Address: ${ADDRESS}`,
+        )
+        .replace(
+          '<strong>Amount charged</strong>',
+          `<strong>Amount charged</strong> <i>(includes GST)</i>`,
+        )
+    : commonEdits.replace(
+        /Receipt (#[0-9-]+)/,
+        `Invoice $1<br /><br />Address: ${ADDRESS}`,
+      )
+
+  const dom = new JSDOM(gstDependentEdits)
   const { document } = dom.window
 
   // select last 3 tables to remove, n = last index
diff --git a/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts b/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts
index 611a8c245f..054707b4ea 100644
--- a/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts
+++ b/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts
@@ -429,6 +429,7 @@ const submitEncryptModeForm: ControllerHandler<
       amount,
       email: paymentReceiptEmail,
       responses: incomingSubmission.responses,
+      gstEnabled: form.payments_field.gst_enabled,
     })
     const paymentId = payment.id
 
diff --git a/src/app/routes/api/v3/admin/forms/__tests__/admin-forms.submissions.routes.spec.ts b/src/app/routes/api/v3/admin/forms/__tests__/admin-forms.submissions.routes.spec.ts
index 5fea4ed92b..93f298767c 100644
--- a/src/app/routes/api/v3/admin/forms/__tests__/admin-forms.submissions.routes.spec.ts
+++ b/src/app/routes/api/v3/admin/forms/__tests__/admin-forms.submissions.routes.spec.ts
@@ -1242,6 +1242,7 @@ describe('admin-form.submissions.routes', () => {
         paymentIntentId: 'somePaymentIntentId',
         amount: 314159,
         email: 'someone@mail.com',
+        gstEnabled: false,
       })
       // Create 3 submissions
       const submissions = await Promise.all(
@@ -1355,6 +1356,7 @@ describe('admin-form.submissions.routes', () => {
         paymentIntentId: 'somePaymentIntentId',
         amount: 314159,
         email: 'someone@mail.com',
+        gstEnabled: false,
       })
       // Create 3 submissions
       const submissions = await Promise.all(

From 6d03b5663c03731b6727f0e67bf6209335b3c861 Mon Sep 17 00:00:00 2001
From: Yuan Ruo <yuanruo@data.gov.sg>
Date: Tue, 18 Jul 2023 16:25:56 +0800
Subject: [PATCH 08/10] fix(deps): [Snyk] Security upgrade mongoose from
 5.13.15 to 5.13.20 (#6541)

* fix: package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MONGOOSE-5777721

* build: update package-lock.json

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Justyn Oh <justynoh@gmail.com>
---
 package-lock.json | 24 +++++++++++++++---------
 package.json      |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fabbcf1847..90828ce35d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -92,7 +92,7 @@
         "moment-timezone": "0.5.41",
         "mongodb-memory-server-core": "^6.9.6",
         "mongodb-uri": "^0.9.7",
-        "mongoose": "^5.13.15",
+        "mongoose": "^5.13.20",
         "multiparty": ">=4.2.3",
         "nan": "^2.17.0",
         "neverthrow": "^6.0.0",
@@ -20642,8 +20642,9 @@
       }
     },
     "node_modules/mongodb": {
-      "version": "3.7.3",
-      "license": "Apache-2.0",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.4.tgz",
+      "integrity": "sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==",
       "dependencies": {
         "bl": "^2.2.1",
         "bson": "^1.1.4",
@@ -20915,14 +20916,15 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "5.13.15",
-      "license": "MIT",
+      "version": "5.13.20",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.20.tgz",
+      "integrity": "sha512-TjGFa/XnJYt+wLmn8y9ssjyO2OhBMeEBtOHb9iJM16EWu2Du6L1Q6zSiEK2ziyYQM8agb4tumNIQFzqbxId7MA==",
       "dependencies": {
         "@types/bson": "1.x || 4.0.x",
         "@types/mongodb": "^3.5.27",
         "bson": "^1.1.4",
         "kareem": "2.3.2",
-        "mongodb": "3.7.3",
+        "mongodb": "3.7.4",
         "mongoose-legacy-pluralize": "1.0.2",
         "mpath": "0.8.4",
         "mquery": "3.2.5",
@@ -43215,7 +43217,9 @@
       }
     },
     "mongodb": {
-      "version": "3.7.3",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.4.tgz",
+      "integrity": "sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==",
       "requires": {
         "bl": "^2.2.1",
         "bson": "^1.1.4",
@@ -43362,13 +43366,15 @@
       "version": "0.9.7"
     },
     "mongoose": {
-      "version": "5.13.15",
+      "version": "5.13.20",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.20.tgz",
+      "integrity": "sha512-TjGFa/XnJYt+wLmn8y9ssjyO2OhBMeEBtOHb9iJM16EWu2Du6L1Q6zSiEK2ziyYQM8agb4tumNIQFzqbxId7MA==",
       "requires": {
         "@types/bson": "1.x || 4.0.x",
         "@types/mongodb": "^3.5.27",
         "bson": "^1.1.4",
         "kareem": "2.3.2",
-        "mongodb": "3.7.3",
+        "mongodb": "3.7.4",
         "mongoose-legacy-pluralize": "1.0.2",
         "mpath": "0.8.4",
         "mquery": "3.2.5",
diff --git a/package.json b/package.json
index b5353a35d3..f879344a73 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "moment-timezone": "0.5.41",
     "mongodb-memory-server-core": "^6.9.6",
     "mongodb-uri": "^0.9.7",
-    "mongoose": "^5.13.15",
+    "mongoose": "^5.13.20",
     "multiparty": ">=4.2.3",
     "nan": "^2.17.0",
     "neverthrow": "^6.0.0",

From b3a9818762e334bc7126c029cdba63156bac85ed Mon Sep 17 00:00:00 2001
From: LinHuiqing <huiqing@open.gov.sg>
Date: Tue, 18 Jul 2023 16:27:46 +0800
Subject: [PATCH 09/10] chore: bump version to v6.66.0

---
 CHANGELOG.md               | 30 ++++++++++++++++++++----------
 frontend/package-lock.json |  4 ++--
 frontend/package.json      |  2 +-
 package-lock.json          |  4 ++--
 package.json               |  2 +-
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 733e5bcb0f..f5f5bc8762 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,24 @@ 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.66.0](https://github.com/opengovsg/FormSG/compare/v6.65.0...v6.66.0)
+
+- fix(deps): [Snyk] Security upgrade mongoose from 5.13.15 to 5.13.20 [`#6541`](https://github.com/opengovsg/FormSG/pull/6541)
+- feat: indicate if GST has been applied to a payment transaction [`#6538`](https://github.com/opengovsg/FormSG/pull/6538)
+- chore: reduce max payment limit [`#6543`](https://github.com/opengovsg/FormSG/pull/6543)
+- fix: updating csp to fix bypass [`#6535`](https://github.com/opengovsg/FormSG/pull/6535)
+- build(deps): bump winston-cloudwatch version to "6.2.0" [`#6542`](https://github.com/opengovsg/FormSG/pull/6542)
+- feat: add description to form issue modal [`#6536`](https://github.com/opengovsg/FormSG/pull/6536)
+- fix: presub remove additional underscore [`#6533`](https://github.com/opengovsg/FormSG/pull/6533)
+- feat: presub-change-icon-to-help [`#6532`](https://github.com/opengovsg/FormSG/pull/6532)
+- build: merge v6.65.0 into develop [`#6531`](https://github.com/opengovsg/FormSG/pull/6531)
+- build: release v6.65.0 [`#6528`](https://github.com/opengovsg/FormSG/pull/6528)
+- fix: add FE validation rule that email domains must be non empty [`#6529`](https://github.com/opengovsg/FormSG/pull/6529)
+
 #### [v6.65.0](https://github.com/opengovsg/FormSG/compare/v6.64.0...v6.65.0)
 
+> 11 July 2023
+
 - fix: issue report icon for mobile [`#6527`](https://github.com/opengovsg/FormSG/pull/6527)
 - feat: Create issue feedback UI on public form interface [`#6452`](https://github.com/opengovsg/FormSG/pull/6452)
 - chore: variable payments UI review changes [`#6524`](https://github.com/opengovsg/FormSG/pull/6524)
@@ -26,6 +42,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build: release v6.64.0 [`#6509`](https://github.com/opengovsg/FormSG/pull/6509)
 - chore: fix typo maxmium -&gt; maximum [`#6510`](https://github.com/opengovsg/FormSG/pull/6510)
 - feat: deep link myinfo settings message in builder [`#6503`](https://github.com/opengovsg/FormSG/pull/6503)
+- chore: bump version to v6.65.0 [`3ca3ca7`](https://github.com/opengovsg/FormSG/commit/3ca3ca76a7d347953ea5b4153de4575c2f4be3c0)
 
 #### [v6.64.0](https://github.com/opengovsg/FormSG/compare/v6.63.0...v6.64.0)
 
@@ -352,7 +369,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix: only return previous payment id [`#6210`](https://github.com/opengovsg/FormSG/pull/6210)
 - build: merge release v6.45.0 to develop [`#6205`](https://github.com/opengovsg/FormSG/pull/6205)
 - build: release v6.45.0 [`#6200`](https://github.com/opengovsg/FormSG/pull/6200)
-- chore: bump version to v6.46.0 [`767e7e5`](https://github.com/opengovsg/FormSG/commit/767e7e55c3e8f058963e890b1c249704d6db1459)
+- chore: bump version to v6.46.0 [`87fda0e`](https://github.com/opengovsg/FormSG/commit/87fda0e0ec4c937350ebd013a4a9762f4acee802)
 
 #### [v6.45.0](https://github.com/opengovsg/FormSG/compare/v6.44.1...v6.45.0)
 
@@ -515,7 +532,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build: merge v6.37.0 into develop  [`#5989`](https://github.com/opengovsg/FormSG/pull/5989)
 - build: release v6.37.0 [`#5988`](https://github.com/opengovsg/FormSG/pull/5988)
 
-#### [v6.37.0](https://github.com/opengovsg/FormSG/compare/v6.36.1...v6.37.0)
+#### [v6.37.0](https://github.com/opengovsg/FormSG/compare/v6.36.0...v6.37.0)
 
 > 24 March 2023
 
@@ -545,17 +562,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps-dev): bump @typescript-eslint/parser from 5.54.1 to 5.55.0 in /shared [`#5922`](https://github.com/opengovsg/FormSG/pull/5922)
 - test(e2e/email): add form auth tests [`#5876`](https://github.com/opengovsg/FormSG/pull/5876)
 - build: merge v6.36.0 into develop [`#5914`](https://github.com/opengovsg/FormSG/pull/5914)
+- build: release v6.36.0 [`#5913`](https://github.com/opengovsg/FormSG/pull/5913)
 - chore: bump version to v6.37.0 [`b4d24eb`](https://github.com/opengovsg/FormSG/commit/b4d24eb14f8a80bff56d19e6fa23975d5661cce9)
 - chore: bump version to 6.36.1 [`faf75b5`](https://github.com/opengovsg/FormSG/commit/faf75b5a7d0d12745e9a0104c541fb66cca17258)
 
-#### [v6.36.1](https://github.com/opengovsg/FormSG/compare/v6.36.0...v6.36.1)
-
-> 17 March 2023
-
-- build: release v6.36.0 [`#5913`](https://github.com/opengovsg/FormSG/pull/5913)
-- chore: bump version to 6.36.1 [`7bc8b06`](https://github.com/opengovsg/FormSG/commit/7bc8b0669b29565be1d7a8b4cb8b76801a9a44ba)
-- fix: trim dropdown options for logic check [`25e197a`](https://github.com/opengovsg/FormSG/commit/25e197a22eecec527b2b284aee0b95ccb1cd3797)
-
 #### [v6.36.0](https://github.com/opengovsg/FormSG/compare/v6.35.0...v6.36.0)
 
 > 9 March 2023
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 777a7261ba..3c94369445 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "form-frontend",
-  "version": "6.65.0",
+  "version": "6.66.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "form-frontend",
-      "version": "6.65.0",
+      "version": "6.66.0",
       "hasInstallScript": true,
       "dependencies": {
         "@chakra-ui/react": "^1.8.6",
diff --git a/frontend/package.json b/frontend/package.json
index da97e2c36d..14a19eb5e7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.65.0",
+  "version": "6.66.0",
   "homepage": ".",
   "private": true,
   "dependencies": {
diff --git a/package-lock.json b/package-lock.json
index 90828ce35d..0f8909e60d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "FormSG",
-  "version": "6.65.0",
+  "version": "6.66.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "FormSG",
-      "version": "6.65.0",
+      "version": "6.66.0",
       "hasInstallScript": true,
       "dependencies": {
         "@aws-sdk/client-cloudwatch-logs": "^3.347.1",
diff --git a/package.json b/package.json
index f879344a73..210ea3d84c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.65.0",
+  "version": "6.66.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"

From 790c797acde6246d341cc3d5877bcd392a561bdf Mon Sep 17 00:00:00 2001
From: LinHuiqing <huiqing@open.gov.sg>
Date: Tue, 18 Jul 2023 19:47:36 +0800
Subject: [PATCH 10/10] revert: build(deps): bump winston-cloudwatch version to
 6.2.0 (#6542)

This reverts commit 004adc48eb762687f94d817ddfd72c6e8a7ffaea.
---
 package-lock.json | 651 ++++++++++++++++++++++++++++++++++++++++++++--
 package.json      |   2 +-
 2 files changed, 631 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0f8909e60d..3066a712e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -130,7 +130,7 @@
         "web-streams-polyfill": "^3.2.1",
         "whatwg-fetch": "^3.6.2",
         "winston": "^3.8.2",
-        "winston-cloudwatch": "^6.2.0",
+        "winston-cloudwatch": "^6.1.1",
         "zod": "^3.21.4"
       },
       "devDependencies": {
@@ -5983,6 +5983,13 @@
         "node": ">=10"
       }
     },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.9",
       "dev": true,
@@ -10610,6 +10617,13 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "3.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/date-fns": {
       "version": "2.30.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -10854,6 +10868,44 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/degenerator": {
+      "version": "3.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.13.2",
+        "escodegen": "^1.8.1",
+        "esprima": "^4.0.0",
+        "vm2": "^3.9.8"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/degenerator/node_modules/ast-types": {
+      "version": "0.13.4",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/degenerator/node_modules/esprima": {
+      "version": "4.0.1",
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/degenerator/node_modules/tslib": {
+      "version": "2.3.1",
+      "license": "0BSD"
+    },
     "node_modules/del": {
       "version": "3.0.0",
       "dev": true,
@@ -11533,6 +11585,45 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/escodegen": {
+      "version": "1.14.2",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/esprima": {
+      "version": "4.0.1",
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/eslint": {
       "version": "8.30.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
@@ -13002,7 +13093,6 @@
     },
     "node_modules/estraverse": {
       "version": "4.3.0",
-      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
@@ -14191,6 +14281,18 @@
       "version": "1.0.0",
       "license": "MIT"
     },
+    "node_modules/fs-extra": {
+      "version": "8.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
     "node_modules/fs-minipass": {
       "version": "2.1.0",
       "license": "ISC",
@@ -14227,6 +14329,34 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/ftp": {
+      "version": "0.3.10",
+      "dependencies": {
+        "readable-stream": "1.1.x",
+        "xregexp": "2.0.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ftp/node_modules/isarray": {
+      "version": "0.0.1",
+      "license": "MIT"
+    },
+    "node_modules/ftp/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ftp/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "license": "MIT"
+    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "license": "MIT"
@@ -14557,6 +14687,43 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-uri": {
+      "version": "3.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "data-uri-to-buffer": "3",
+        "debug": "4",
+        "file-uri-to-path": "2",
+        "fs-extra": "^8.1.0",
+        "ftp": "^0.3.10"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/get-uri/node_modules/debug": {
+      "version": "4.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/get-uri/node_modules/file-uri-to-path": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/get-value": {
       "version": "2.0.6",
       "dev": true,
@@ -15251,6 +15418,33 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-proxy-agent/node_modules/debug": {
+      "version": "4.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/http-reasons": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/http-reasons/-/http-reasons-0.1.0.tgz",
@@ -15542,7 +15736,6 @@
     },
     "node_modules/ip": {
       "version": "1.1.5",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/ipaddr.js": {
@@ -18868,6 +19061,13 @@
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz",
       "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w=="
     },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "node_modules/jsonparse": {
       "version": "1.3.1",
       "engines": [
@@ -21147,6 +21347,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/neverthrow": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/neverthrow/-/neverthrow-6.0.0.tgz",
@@ -21934,6 +22141,51 @@
         "node": ">=6"
       }
     },
+    "node_modules/pac-proxy-agent": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4",
+        "get-uri": "3",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "5",
+        "pac-resolver": "^5.0.0",
+        "raw-body": "^2.2.0",
+        "socks-proxy-agent": "5"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/debug": {
+      "version": "4.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "degenerator": "^3.0.2",
+        "ip": "^1.1.5",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/pako": {
       "version": "1.0.11",
       "license": "(MIT AND Zlib)"
@@ -22767,6 +23019,45 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-agent": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^6.0.0",
+        "debug": "4",
+        "http-proxy-agent": "^4.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "lru-cache": "^5.1.1",
+        "pac-proxy-agent": "^5.0.0",
+        "proxy-from-env": "^1.0.0",
+        "socks-proxy-agent": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/debug": {
+      "version": "4.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "license": "MIT"
@@ -24199,6 +24490,14 @@
         "jquery": ">=1.8.0"
       }
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/smtp-server": {
       "version": "3.11.0",
       "dev": true,
@@ -24429,6 +24728,49 @@
         }
       }
     },
+    "node_modules/socks": {
+      "version": "2.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/debug": {
+      "version": "4.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socks/node_modules/ip": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
     "node_modules/sonic-boom": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.4.1.tgz",
@@ -27068,7 +27410,6 @@
     },
     "node_modules/universalify": {
       "version": "0.1.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
@@ -27425,6 +27766,38 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/vm2": {
+      "version": "3.9.18",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.18.tgz",
+      "integrity": "sha512-iM7PchOElv6Uv6Q+0Hq7dcgDtWWT6SizYqVcvol+1WQc+E9HlgTCnPozbQNSP3yDV9oXHQOEQu530w2q/BCVZg==",
+      "dependencies": {
+        "acorn": "^8.7.0",
+        "acorn-walk": "^8.2.0"
+      },
+      "bin": {
+        "vm2": "bin/vm2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/vm2/node_modules/acorn": {
+      "version": "8.8.0",
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/vm2/node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "dev": true,
@@ -28294,9 +28667,9 @@
       }
     },
     "node_modules/winston-cloudwatch": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-6.2.0.tgz",
-      "integrity": "sha512-FcJ3x+rcAKGKr4Y9tbPjXkt39I6aiAMD//ElDYcWGMFp4GjMeXP6JYrfl1yNqvH65fzehqLD71MQMlt/5/9ZIQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-6.1.1.tgz",
+      "integrity": "sha512-5wOJhAYRU3s6I1t/XO1/3tHJLhzvUUNNxcdbAjhDbyaKnghgKHrRtoQPXO2qTlWOTdhoXS0nJqV/L3RaBBuv3A==",
       "dependencies": {
         "async": "^3.1.0",
         "chalk": "^4.0.0",
@@ -28304,7 +28677,8 @@
         "lodash.assign": "^4.2.0",
         "lodash.find": "^4.6.0",
         "lodash.isempty": "^4.4.0",
-        "lodash.iserror": "^3.1.1"
+        "lodash.iserror": "^3.1.1",
+        "proxy-agent": "^5.0.0"
       },
       "peerDependencies": {
         "@aws-sdk/client-cloudwatch-logs": "^3.0.0",
@@ -28614,6 +28988,10 @@
         "node": ">=0.6.0"
       }
     },
+    "node_modules/xregexp": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "dev": true,
@@ -28629,7 +29007,6 @@
     },
     "node_modules/yallist": {
       "version": "3.1.1",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
@@ -33154,6 +33531,9 @@
         "defer-to-connect": "^2.0.0"
       }
     },
+    "@tootallnate/once": {
+      "version": "1.1.2"
+    },
     "@tsconfig/node10": {
       "version": "1.0.9",
       "dev": true
@@ -36393,6 +36773,9 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "data-uri-to-buffer": {
+      "version": "3.0.1"
+    },
     "date-fns": {
       "version": "2.30.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -36559,6 +36942,29 @@
       "version": "1.0.1",
       "dev": true
     },
+    "degenerator": {
+      "version": "3.0.2",
+      "requires": {
+        "ast-types": "^0.13.2",
+        "escodegen": "^1.8.1",
+        "esprima": "^4.0.0",
+        "vm2": "^3.9.8"
+      },
+      "dependencies": {
+        "ast-types": {
+          "version": "0.13.4",
+          "requires": {
+            "tslib": "^2.0.1"
+          }
+        },
+        "esprima": {
+          "version": "4.0.1"
+        },
+        "tslib": {
+          "version": "2.3.1"
+        }
+      }
+    },
     "del": {
       "version": "3.0.0",
       "dev": true,
@@ -36999,6 +37405,25 @@
     "escape-string-regexp": {
       "version": "1.0.5"
     },
+    "escodegen": {
+      "version": "1.14.2",
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1"
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "optional": true
+        }
+      }
+    },
     "eslint": {
       "version": "8.30.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
@@ -37969,8 +38394,7 @@
       }
     },
     "estraverse": {
-      "version": "4.3.0",
-      "dev": true
+      "version": "4.3.0"
     },
     "esutils": {
       "version": "2.0.3"
@@ -38811,6 +39235,14 @@
     "fs-constants": {
       "version": "1.0.0"
     },
+    "fs-extra": {
+      "version": "8.1.0",
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
     "fs-minipass": {
       "version": "2.1.0",
       "requires": {
@@ -38834,6 +39266,30 @@
       "version": "2.3.2",
       "optional": true
     },
+    "ftp": {
+      "version": "0.3.10",
+      "requires": {
+        "readable-stream": "1.1.x",
+        "xregexp": "2.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1"
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31"
+        }
+      }
+    },
     "function-bind": {
       "version": "1.1.1"
     },
@@ -39035,6 +39491,28 @@
         "get-intrinsic": "^1.1.1"
       }
     },
+    "get-uri": {
+      "version": "3.0.2",
+      "requires": {
+        "@tootallnate/once": "1",
+        "data-uri-to-buffer": "3",
+        "debug": "4",
+        "file-uri-to-path": "2",
+        "fs-extra": "^8.1.0",
+        "ftp": "^0.3.10"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.3",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "file-uri-to-path": {
+          "version": "2.0.0"
+        }
+      }
+    },
     "get-value": {
       "version": "2.0.6",
       "dev": true
@@ -39504,6 +39982,22 @@
         "toidentifier": "1.0.1"
       }
     },
+    "http-proxy-agent": {
+      "version": "4.0.1",
+      "requires": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.3",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
+      }
+    },
     "http-reasons": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/http-reasons/-/http-reasons-0.1.0.tgz",
@@ -39691,8 +40185,7 @@
       "integrity": "sha512-Rq2BsYmtwS5vVttie4rqrOCIfHCS9TgpRLFpKQCM1wZBBRY9nWVGmEvm2FnDbSE2un1UE39DvFpTR5UL47YDcA=="
     },
     "ip": {
-      "version": "1.1.5",
-      "dev": true
+      "version": "1.1.5"
     },
     "ipaddr.js": {
       "version": "1.9.1"
@@ -42016,6 +42509,12 @@
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz",
       "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w=="
     },
+    "jsonfile": {
+      "version": "4.0.0",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "jsonparse": {
       "version": "1.3.1"
     },
@@ -43537,6 +44036,9 @@
       "version": "2.6.1",
       "dev": true
     },
+    "netmask": {
+      "version": "2.0.2"
+    },
     "neverthrow": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/neverthrow/-/neverthrow-6.0.0.tgz",
@@ -44073,6 +44575,36 @@
     "p-try": {
       "version": "2.2.0"
     },
+    "pac-proxy-agent": {
+      "version": "5.0.0",
+      "requires": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4",
+        "get-uri": "3",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "5",
+        "pac-resolver": "^5.0.0",
+        "raw-body": "^2.2.0",
+        "socks-proxy-agent": "5"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.3",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
+      }
+    },
+    "pac-resolver": {
+      "version": "5.0.1",
+      "requires": {
+        "degenerator": "^3.0.2",
+        "ip": "^1.1.5",
+        "netmask": "^2.0.2"
+      }
+    },
     "pako": {
       "version": "1.0.11"
     },
@@ -44641,6 +45173,33 @@
         "ipaddr.js": "1.9.1"
       }
     },
+    "proxy-agent": {
+      "version": "5.0.0",
+      "requires": {
+        "agent-base": "^6.0.0",
+        "debug": "4",
+        "http-proxy-agent": "^4.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "lru-cache": "^5.1.1",
+        "pac-proxy-agent": "^5.0.0",
+        "proxy-from-env": "^1.0.0",
+        "socks-proxy-agent": "^5.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.3",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        }
+      }
+    },
     "proxy-from-env": {
       "version": "1.1.0"
     },
@@ -45635,6 +46194,9 @@
     "slick-carousel": {
       "version": "1.8.1"
     },
+    "smart-buffer": {
+      "version": "4.2.0"
+    },
     "smtp-server": {
       "version": "3.11.0",
       "dev": true,
@@ -45798,6 +46360,34 @@
         }
       }
     },
+    "socks": {
+      "version": "2.7.0",
+      "requires": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      },
+      "dependencies": {
+        "ip": {
+          "version": "2.0.0"
+        }
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "5.0.1",
+      "requires": {
+        "agent-base": "^6.0.2",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.3",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
+      }
+    },
     "sonic-boom": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.4.1.tgz",
@@ -47581,8 +48171,7 @@
       }
     },
     "universalify": {
-      "version": "0.1.2",
-      "dev": true
+      "version": "0.1.2"
     },
     "unix-dgram": {
       "version": "2.0.4",
@@ -47827,6 +48416,23 @@
       "version": "1.1.2",
       "dev": true
     },
+    "vm2": {
+      "version": "3.9.18",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.18.tgz",
+      "integrity": "sha512-iM7PchOElv6Uv6Q+0Hq7dcgDtWWT6SizYqVcvol+1WQc+E9HlgTCnPozbQNSP3yDV9oXHQOEQu530w2q/BCVZg==",
+      "requires": {
+        "acorn": "^8.7.0",
+        "acorn-walk": "^8.2.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.8.0"
+        },
+        "acorn-walk": {
+          "version": "8.2.0"
+        }
+      }
+    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "dev": true,
@@ -48475,9 +49081,9 @@
       }
     },
     "winston-cloudwatch": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-6.2.0.tgz",
-      "integrity": "sha512-FcJ3x+rcAKGKr4Y9tbPjXkt39I6aiAMD//ElDYcWGMFp4GjMeXP6JYrfl1yNqvH65fzehqLD71MQMlt/5/9ZIQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-6.1.1.tgz",
+      "integrity": "sha512-5wOJhAYRU3s6I1t/XO1/3tHJLhzvUUNNxcdbAjhDbyaKnghgKHrRtoQPXO2qTlWOTdhoXS0nJqV/L3RaBBuv3A==",
       "requires": {
         "async": "^3.1.0",
         "chalk": "^4.0.0",
@@ -48485,7 +49091,8 @@
         "lodash.assign": "^4.2.0",
         "lodash.find": "^4.6.0",
         "lodash.isempty": "^4.4.0",
-        "lodash.iserror": "^3.1.1"
+        "lodash.iserror": "^3.1.1",
+        "proxy-agent": "^5.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -48673,6 +49280,9 @@
       "version": "0.0.32",
       "dev": true
     },
+    "xregexp": {
+      "version": "2.0.0"
+    },
     "xtend": {
       "version": "4.0.2",
       "dev": true
@@ -48682,8 +49292,7 @@
       "dev": true
     },
     "yallist": {
-      "version": "3.1.1",
-      "dev": true
+      "version": "3.1.1"
     },
     "yaml": {
       "version": "1.10.2",
diff --git a/package.json b/package.json
index 210ea3d84c..5d8f737359 100644
--- a/package.json
+++ b/package.json
@@ -173,7 +173,7 @@
     "web-streams-polyfill": "^3.2.1",
     "whatwg-fetch": "^3.6.2",
     "winston": "^3.8.2",
-    "winston-cloudwatch": "^6.2.0",
+    "winston-cloudwatch": "^6.1.1",
     "zod": "^3.21.4"
   },
   "devDependencies": {