Skip to content

Commit

Permalink
Merge pull request #6291 from opengovsg/release_v6.48.0
Browse files Browse the repository at this point in the history
build: release v6.48.0
  • Loading branch information
wanlingt authored May 9, 2023
2 parents 77edf16 + 074746f commit dc0b538
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 25 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,19 @@ 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.48.0](https://github.com/opengovsg/FormSG/compare/v6.47.0...v6.48.0)

- feat: update sms copy to remove link (policy) [`#6289`](https://github.com/opengovsg/FormSG/pull/6289)
- chore(deps-dev): bump @typescript-eslint/parser from 5.59.2 to 5.59.5 in /shared [`#6287`](https://github.com/opengovsg/FormSG/pull/6287)
- build: merge release v6.47.0 to develop [`#6281`](https://github.com/opengovsg/FormSG/pull/6281)
- fix: add missing env var in docker_compose.yml [`#6284`](https://github.com/opengovsg/FormSG/pull/6284)
- build: release v6.47.0 [`#6279`](https://github.com/opengovsg/FormSG/pull/6279)
- chore: bump version to v6.47.0 [`002b8b6`](https://github.com/opengovsg/FormSG/commit/002b8b6b66c6cc199921311a2ea1800644bcc332)

#### [v6.47.0](https://github.com/opengovsg/FormSG/compare/v6.46.0...v6.47.0)

> 8 May 2023

- fix(deps): bump libphonenumber-js from 1.10.28 to 1.10.30 in /shared [`#6278`](https://github.com/opengovsg/FormSG/pull/6278)
- feat: add frontend datadog logging to CSV responses download [`#6266`](https://github.com/opengovsg/FormSG/pull/6266)
- fix: migrate to withTransaction for retries [`#6263`](https://github.com/opengovsg/FormSG/pull/6263)
Expand All @@ -18,6 +29,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- feat: payment preview banner [`#6230`](https://github.com/opengovsg/FormSG/pull/6230)
- build: merge release v6.46.0 to develop [`#6256`](https://github.com/opengovsg/FormSG/pull/6256)
- * fix: only return previous payment id (#6210) [`#6254`](https://github.com/opengovsg/FormSG/pull/6254)
- chore: bump version to v6.46.0 [`be1e65f`](https://github.com/opengovsg/FormSG/commit/be1e65f2923ec97fd6457f2637557af2afc50996)
- chore: bump version to v6.47.0 [`29b56cc`](https://github.com/opengovsg/FormSG/commit/29b56cc5423160e55a2e041ff57fec9e91f02bdb)

#### [v6.46.0](https://github.com/opengovsg/FormSG/compare/v6.45.0...v6.46.0)
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ services:
- PAYMENT_STRIPE_WEBHOOK_SECRET=webhookSecret
- PAYMENT_MAX_PAYMENT_AMOUNT_CENTS=100000
- PAYMENT_MIN_PAYMENT_AMOUNT_CENTS=50
- SSM_ENV_SITE_NAME=development

mockpass:
build: https://github.com/opengovsg/mockpass.git
Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "form-frontend",
"version": "6.47.0",
"version": "6.48.0",
"homepage": ".",
"private": true,
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FormSG",
"description": "Form Manager for Government",
"version": "6.47.0",
"version": "6.48.0",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <formsg@data.gov.sg>"
Expand Down
141 changes: 129 additions & 12 deletions shared/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions src/app/services/sms/sms.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,7 @@ export const sendVerificationOtp = (
TwilioConfig,
SmsSendError | InvalidNumberError
>(getTwilio(otpData.msgSrvcName, defaultConfig)).andThen((twilioConfig) => {
const message = renderVerificationSms(
otp,
otpPrefix,
new URL(config.app.appUrl).host,
)
const message = renderVerificationSms(otp, otpPrefix)

return sendSms(
twilioConfig,
Expand Down
3 changes: 1 addition & 2 deletions src/app/services/sms/sms.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export const renderBouncedSubmissionSms = (formTitle: string): string => dedent`
export const renderVerificationSms = (
otp: string,
otpPrefix: string,
appHost: string,
): string => dedent`Use the OTP ${otpPrefix}-${otp} to submit on ${appHost}.
): string => dedent`Use the OTP ${otpPrefix}-${otp} to submit on FormSG.
Never share your OTP with anyone else. If you did not request this OTP, you can safely ignore this SMS.`

0 comments on commit dc0b538

Please sign in to comment.