Skip to content

Commit

Permalink
Merge pull request #7050 from opengovsg/chore/update-tou
Browse files Browse the repository at this point in the history
build: release v6.104.0
  • Loading branch information
KenLSM authored Jan 30, 2024
2 parents ef921bb + 54ce533 commit 8f0b76b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 10 deletions.
12 changes: 7 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@ 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.103.0](https://github.com/opengovsg/FormSG/compare/v6.103.0...v6.103.0)
#### [v6.104.0](https://github.com/opengovsg/FormSG/compare/v6.103.0...v6.104.0)

- build: merge release v6.102.0 into develop [`#7039`](https://github.com/opengovsg/FormSG/pull/7039)
- build: release v6.102.0 [`#7023`](https://github.com/opengovsg/FormSG/pull/7023)
- chore: bump version to v6.102.0 [`f0dccf3`](https://github.com/opengovsg/FormSG/commit/f0dccf347309b60884dd0b4fd1091170cbbad416)
- chore: credits update [`#7042`](https://github.com/opengovsg/FormSG/pull/7042)
- build: release v6.103.0 [`#7040`](https://github.com/opengovsg/FormSG/pull/7040)
- chore: update banner for TOU [`9547227`](https://github.com/opengovsg/FormSG/commit/95472277ce76427dc64eac7977170643c0264762)

#### [v6.103.0](https://github.com/opengovsg/FormSG/compare/v6.102.0...v6.103.0)

> 24 January 2024

- build: merge release v6.102.0 into develop [`#7039`](https://github.com/opengovsg/FormSG/pull/7039)
- fix: add patch to feed default ValidationOptions on table shorttext [`#7029`](https://github.com/opengovsg/FormSG/pull/7029)
- build: merge release v6.102.0 into develop [`#7028`](https://github.com/opengovsg/FormSG/pull/7028)
- chore: update architecture docs [`#7033`](https://github.com/opengovsg/FormSG/pull/7033)
- chore: bump version to v6.103.0 [`2ada612`](https://github.com/opengovsg/FormSG/commit/2ada612987e7aa8f0fe4607f305c707a09ad531f)
- build: release v6.102.0 [`#7023`](https://github.com/opengovsg/FormSG/pull/7023)
- chore: bump version to v6.103.0 [`edf5b4f`](https://github.com/opengovsg/FormSG/commit/edf5b4fc958ec98a195bffe7afdd70b27679c1e4)

#### [v6.102.0](https://github.com/opengovsg/FormSG/compare/v6.101.0...v6.102.0)

Expand Down
12 changes: 10 additions & 2 deletions frontend/src/pages/Landing/Home/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ import {
OGP_FORMSG_COLLATE,
OGP_FORMSG_REPO,
} from '~constants/links'
import { LANDING_PAYMENTS_ROUTE, LOGIN_ROUTE } from '~constants/routes'
import {
LANDING_PAYMENTS_ROUTE,

Check warning on line 43 in frontend/src/pages/Landing/Home/LandingPage.tsx

View workflow job for this annotation

GitHub Actions / frontend_lint

'LANDING_PAYMENTS_ROUTE' is defined but never used

Check warning on line 43 in frontend/src/pages/Landing/Home/LandingPage.tsx

View workflow job for this annotation

GitHub Actions / frontend_lint

'LANDING_PAYMENTS_ROUTE' is defined but never used
LOGIN_ROUTE,
TOU_ROUTE,
} from '~constants/routes'
import { useIsMobile } from '~hooks/useIsMobile'
import { useMdComponents } from '~hooks/useMdComponents'
import Button from '~components/Button'
Expand Down Expand Up @@ -91,10 +95,14 @@ export const LandingPage = (): JSX.Element => {

return (
<>
<FeatureBanner
{/* <FeatureBanner
title="Introducing Payments"
body="Respondents can now pay for fees and services directly on your form!"
learnMoreLink={LANDING_PAYMENTS_ROUTE}
/> */}
<FeatureBanner
body="We have updated FormSG's Terms of Use and Privacy Policy"
learnMoreLink={TOU_ROUTE}
/>
<AppPublicHeader />
<LandingSection bg="primary.100" pt={{ base: '2rem', md: 0 }} px="0">
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.103.0",
"version": "6.104.0",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <[email protected]>"
Expand Down

0 comments on commit 8f0b76b

Please sign in to comment.