diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-02-15 10:42:40 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-02-15 10:42:40 +0100 |
| commit | a9db5d6ef3e0cb0bf1e5720ee6cd6c3ece0eba40 (patch) | |
| tree | e991ed4ed240cd78057e437dfdee1882818d749f | |
| parent | 9b0f03ddb75ad531e85a9232c1aba3822e9356e4 (diff) | |
| parent | b03fb927bcece83ed040eb1dc0f0ae4fb5b4a225 (diff) | |
| download | mullvadvpn-a9db5d6ef3e0cb0bf1e5720ee6cd6c3ece0eba40.tar.xz mullvadvpn-a9db5d6ef3e0cb0bf1e5720ee6cd6c3ece0eba40.zip | |
Merge branch 'fix-expiry-error'
| -rw-r--r-- | gui/src/renderer/components/ExpiredAccountAddTime.tsx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gui/src/renderer/components/ExpiredAccountAddTime.tsx b/gui/src/renderer/components/ExpiredAccountAddTime.tsx index 5085042c6f..fa98b1df59 100644 --- a/gui/src/renderer/components/ExpiredAccountAddTime.tsx +++ b/gui/src/renderer/components/ExpiredAccountAddTime.tsx @@ -157,7 +157,13 @@ export function TimeAdded(props: ITimeAddedProps) { const duration = props.secondsAdded !== undefined ? formatRelativeDate(props.secondsAdded * 1000, 0) : undefined; - const newExpiry = formatDate(props.newExpiry ?? expiry!, locale); + + let newExpiry = ''; + if (props.newExpiry !== undefined) { + newExpiry = formatDate(props.newExpiry, locale); + } else if (expiry !== undefined) { + newExpiry = formatDate(expiry, locale); + } return ( <Layout> |