diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-06-13 18:37:53 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-06-28 09:13:18 +0200 |
| commit | ee8c6577f91ddf60ffe944624091ceaa6a81ca34 (patch) | |
| tree | 524c2c4b1af129851d832f1c992f076e0ab1aa2d /gui/src/renderer/components | |
| parent | 0f2e3c95e88f5eab0fe30ca842b2bc4b12a179bb (diff) | |
| download | mullvadvpn-ee8c6577f91ddf60ffe944624091ceaa6a81ca34.tar.xz mullvadvpn-ee8c6577f91ddf60ffe944624091ceaa6a81ca34.zip | |
Refactor time left calculations
Diffstat (limited to 'gui/src/renderer/components')
| -rw-r--r-- | gui/src/renderer/components/ExpiredAccountAddTime.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/RedeemVoucher.tsx | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gui/src/renderer/components/ExpiredAccountAddTime.tsx b/gui/src/renderer/components/ExpiredAccountAddTime.tsx index 2c593217b8..3b54642978 100644 --- a/gui/src/renderer/components/ExpiredAccountAddTime.tsx +++ b/gui/src/renderer/components/ExpiredAccountAddTime.tsx @@ -151,7 +151,9 @@ export function TimeAdded(props: ITimeAddedProps) { }, [history, finish]); const duration = - props.secondsAdded !== undefined ? formatRelativeDate(props.secondsAdded * 1000, 0) : undefined; + props.secondsAdded !== undefined + ? formatRelativeDate(0, props.secondsAdded * 1000, { capitalize: true, displayMonths: true }) + : undefined; let newExpiry = ''; if (props.newExpiry !== undefined) { diff --git a/gui/src/renderer/components/RedeemVoucher.tsx b/gui/src/renderer/components/RedeemVoucher.tsx index 34cc89c4b0..7f637ab125 100644 --- a/gui/src/renderer/components/RedeemVoucher.tsx +++ b/gui/src/renderer/components/RedeemVoucher.tsx @@ -217,7 +217,10 @@ export function RedeemVoucherAlert(props: IRedeemVoucherAlertProps) { const locale = useSelector((state) => state.userInterface.locale); if (response?.type === 'success') { - const duration = formatRelativeDate(response.secondsAdded * 1000, 0); + const duration = formatRelativeDate(0, response.secondsAdded * 1000, { + capitalize: true, + displayMonths: true, + }); const expiry = formatDate(response.newExpiry, locale); return ( |