diff --git a/CHANGELOG.md b/CHANGELOG.md index c7e9ed9ce..5ea72f44c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,15 @@ 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). +#### [v1.78.0](https://github.com/opengovsg/GoGovSG/compare/v1.77.2...v1.78.0) + +- feat: remove verify message button linking to checkwho [`#2284`](https://github.com/opengovsg/GoGovSG/pull/2284) +- [develop] 1.77.2 [`#2279`](https://github.com/opengovsg/GoGovSG/pull/2279) + #### [v1.77.2](https://github.com/opengovsg/GoGovSG/compare/v1.77.1...v1.77.2) +> 2 October 2023 + - [Snyk] Security upgrade sharp from 0.30.7 to 0.32.6 [`#2277`](https://github.com/opengovsg/GoGovSG/pull/2277) - build(deps): bump import-in-the-middle from 1.4.1 to 1.4.2 [`#2259`](https://github.com/opengovsg/GoGovSG/pull/2259) - [Develop] 1.77.1 [`#2267`](https://github.com/opengovsg/GoGovSG/pull/2267) diff --git a/package-lock.json b/package-lock.json index 125b8a16c..ceabdbcb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "GoGovSG", - "version": "1.77.2", + "version": "1.78.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "1.77.2", + "version": "1.78.0", "license": "MIT", "dependencies": { "@datadog/browser-rum": "^4.15.0", diff --git a/package.json b/package.json index 6b560107f..7adce0816 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "GoGovSG", - "version": "1.77.2", + "version": "1.78.0", "description": "Link shortener for Singapore government.", "main": "src/server/index.js", "scripts": { diff --git a/public/locales/gov/en/translation.json b/public/locales/gov/en/translation.json index 501ced066..fdac3373e 100644 --- a/public/locales/gov/en/translation.json +++ b/public/locales/gov/en/translation.json @@ -28,8 +28,7 @@ "builtBy": "https://open.gov.sg", "linkedin": "https://sg.linkedin.com/company/open-government-products", "facebook": "https://www.facebook.com/opengovsg", - "apiDoc": "https://guide.go.gov.sg/developer-guide/api-documentation", - "verifyMessages": "https://check.go.gov.sg" + "apiDoc": "https://guide.go.gov.sg/developer-guide/api-documentation" }, "builtBy": "Built by Open Government Products" }, diff --git a/src/client/app/assets/edu/components/app/base-layout/checkwho-icon.svg b/src/client/app/assets/edu/components/app/base-layout/checkwho-icon.svg deleted file mode 100644 index 235db5eff..000000000 --- a/src/client/app/assets/edu/components/app/base-layout/checkwho-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/client/app/assets/gov/components/app/base-layout/checkwho-icon.svg b/src/client/app/assets/gov/components/app/base-layout/checkwho-icon.svg deleted file mode 100644 index 235db5eff..000000000 --- a/src/client/app/assets/gov/components/app/base-layout/checkwho-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/client/app/assets/health/components/app/base-layout/checkwho-icon.svg b/src/client/app/assets/health/components/app/base-layout/checkwho-icon.svg deleted file mode 100644 index 235db5eff..000000000 --- a/src/client/app/assets/health/components/app/base-layout/checkwho-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/client/app/components/BaseLayout/BaseLayoutHeader.tsx b/src/client/app/components/BaseLayout/BaseLayoutHeader.tsx index 5ac124a6b..f26a98e63 100644 --- a/src/client/app/components/BaseLayout/BaseLayoutHeader.tsx +++ b/src/client/app/components/BaseLayout/BaseLayoutHeader.tsx @@ -18,7 +18,6 @@ import GoLogoMiniLight from '@assets/go-logo-graphics/go-main-logo-mini-light.sv import helpIcon from '@assets/shared/help-icon.svg' import logoutIcon from '@assets/components/app/base-layout/logout-icon.svg' import logoutWhiteIcon from '@assets/components/app/base-layout/logout-white-icon.svg' -import checkwhoIcon from '@assets/components/app/base-layout/checkwho-icon.svg' import directoryIcon from '@assets/components/app/base-layout/directory-icon.svg' import feedbackIcon from '@assets/components/app/base-layout/feedback-icon.svg' import githubIcon from '@assets/components/app/base-layout/github-icon.svg' @@ -28,7 +27,6 @@ import homeIcon from '@assets/components/app/base-layout/home-icon.svg' import Section from '../Section' import loginActions from '../../../login/actions' import { GoGovReduxState } from '../../reducers/types' -import assetVariant from '../../../../shared/util/asset-variant' type StyleProps = { isLoggedIn: boolean @@ -121,21 +119,6 @@ type BaseLayoutHeaderProps = { toStick: boolean } -type HeaderButtonProps = { - text: string - link: string - public: boolean - icon: string - mobileOrder?: number - internalLink?: boolean - displayNotEnabledForVariant?: string[] -} - -function isEnabledForAssetVariant(header: HeaderButtonProps) { - if (header.displayNotEnabledForVariant === undefined) return true - return !header.displayNotEnabledForVariant.includes(assetVariant) -} - const BaseLayoutHeader: FunctionComponent = ({ backgroundType, hideNavButtons = false, @@ -211,14 +194,6 @@ const BaseLayoutHeader: FunctionComponent = ({ icon: feedbackIcon, mobileOrder: 5, }, - { - text: 'Verify Messages', - link: i18next.t('general.links.verifyMessages'), - public: true, - icon: checkwhoIcon, - mobileOrder: 6, - displayNotEnabledForVariant: ['edu', 'health'], - }, ] const appBarBtn = isLoggedIn ? ( @@ -302,7 +277,6 @@ const BaseLayoutHeader: FunctionComponent = ({ {!hideNavButtons && headers.map( (header) => - isEnabledForAssetVariant(header) && (header.public ? !isLoggedIn : isLoggedIn) && (