Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.78 #2286

Merged
merged 3 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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,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": {
Expand Down
3 changes: 1 addition & 2 deletions public/locales/gov/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions src/client/app/components/BaseLayout/BaseLayoutHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down Expand Up @@ -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<BaseLayoutHeaderProps> = ({
backgroundType,
hideNavButtons = false,
Expand Down Expand Up @@ -211,14 +194,6 @@ const BaseLayoutHeader: FunctionComponent<BaseLayoutHeaderProps> = ({
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 ? (
Expand Down Expand Up @@ -302,7 +277,6 @@ const BaseLayoutHeader: FunctionComponent<BaseLayoutHeaderProps> = ({
{!hideNavButtons &&
headers.map(
(header) =>
isEnabledForAssetVariant(header) &&
(header.public ? !isLoggedIn : isLoggedIn) && (
<Button
href={
Expand Down
Loading