diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-10-05 13:00:55 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-10-05 13:00:55 +0200 |
| commit | 2bbc3b3e1e9f129282a1882cfbcd2be68a2579ee (patch) | |
| tree | 8ff5054c19d5066f7e31d386dfaf1c6685a5e4ad | |
| parent | 49540e65075efea7864f3ddb65732ce8db4114e3 (diff) | |
| parent | aed2c2a28975a47946fd3ec0ba03cd1b34096714 (diff) | |
| download | mullvadvpn-2bbc3b3e1e9f129282a1882cfbcd2be68a2579ee.tar.xz mullvadvpn-2bbc3b3e1e9f129282a1882cfbcd2be68a2579ee.zip | |
Merge branch 'prevent-key-generated-in-future'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | gui/src/renderer/components/WireguardKeys.tsx | 3 | ||||
| -rw-r--r-- | gui/src/shared/date-helper.ts | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 57634b5690..de1fa6ce59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,6 +74,7 @@ Line wrap the file at 100 chars. Th - Improve responsiveness of the controls and status text in the main view in the desktop app. - Read macOS scrollbar visibility settings to decide wheter or not the scrollbars should hide when not scrolling. +- Fix desktop app showing a future date for when WireGuard key was generated. #### Linux - Make offline monitor aware of routing table changes. diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx index 4a45d58d36..3201e0a708 100644 --- a/gui/src/renderer/components/WireguardKeys.tsx +++ b/gui/src/renderer/components/WireguardKeys.tsx @@ -279,7 +279,8 @@ export default class WireguardKeys extends React.Component<IProps, IState> { switch (keyState.type) { case 'key-set': case 'being-verified': { - return formatRelativeDate(new Date(), keyState.key.created, true); + const createdDate = Math.min(Date.parse(keyState.key.created), Date.now()); + return formatRelativeDate(new Date(), createdDate, true); } default: return '-'; diff --git a/gui/src/shared/date-helper.ts b/gui/src/shared/date-helper.ts index 0011ed8fc2..36353c9b44 100644 --- a/gui/src/shared/date-helper.ts +++ b/gui/src/shared/date-helper.ts @@ -1,7 +1,7 @@ import { sprintf } from 'sprintf-js'; import { messages } from './gettext'; -export type DateType = Date | string; +export type DateType = Date | string | number; export enum DateComponent { day, |