From 93d0c08955f1281be449511e649aa1768e917859 Mon Sep 17 00:00:00 2001 From: Zack Spear Date: Tue, 30 Jan 2024 16:33:28 -0800 Subject: [PATCH] fix: check update response modal expired key button styles --- web/_data/serverState.ts | 3 ++- .../UpdateOs/CheckUpdateResponseModal.vue | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/web/_data/serverState.ts b/web/_data/serverState.ts index 9d2cfeffb..59cc3f585 100644 --- a/web/_data/serverState.ts +++ b/web/_data/serverState.ts @@ -34,6 +34,7 @@ const staticGuid = '1111-1111-5GDB-123412341234'; const uptime = Date.now() - 60 * 60 * 1000; // 1 hour ago const twentyDaysAgo = Date.now() - 20 * 24 * 60 * 60 * 1000; // 20 days ago +const ninetyDaysAgo = Date.now() - 90 * 24 * 60 * 60 * 1000; // 90 days ago const twoDaysAgo = Date.now() - 2 * 24 * 60 * 60 * 1000; // 2 days ago // const oneDayAgo = Date.now() - 24 * 60 * 60 * 1000; // 1 day ago const oneHourFromNow = Date.now() + 60 * 60 * 1000; // 1 hour from now @@ -83,7 +84,7 @@ switch (state) { regDev = 4; // regExp = oneHourFromNow; // regExp = oneDayFromNow; - regExp = twentyDaysAgo; + regExp = ninetyDaysAgo; // regExp = uptime; // regExp = 1696363920000; // nori.local's expiration // @ts-ignore diff --git a/web/components/UpdateOs/CheckUpdateResponseModal.vue b/web/components/UpdateOs/CheckUpdateResponseModal.vue index 24137798b..ad635d8fd 100644 --- a/web/components/UpdateOs/CheckUpdateResponseModal.vue +++ b/web/components/UpdateOs/CheckUpdateResponseModal.vue @@ -110,12 +110,17 @@ const actionButtons = computed((): ButtonProps[] | null => { return buttons; } - // update available and stable branch - open changelog to commence update + // update available - open changelog to commence update if (available.value) { buttons.push({ + btnStyle: availableWithRenewal.value + ? 'outline' + : undefined, click: async () => await updateOsChangelogStore.setReleaseForUpdate(updateOsResponse.value ?? null), icon: EyeIcon, - text: availableWithRenewal.value ? props.t('View Changelog') : props.t('View Changelog to Start Update'), + text: availableWithRenewal.value + ? props.t('View Changelog') + : props.t('View Changelog to Start Update'), }); } @@ -125,7 +130,7 @@ const actionButtons = computed((): ButtonProps[] | null => { click: async () => await purchaseStore.renew(), icon: KeyIcon, iconRight: ArrowTopRightOnSquareIcon, - iconRightHoverDisplay: true, + iconRightHoverDisplay: false, text: props.t('Extend Key'), title: props.t('Pay your annual fee to continue receiving OS updates.'), }); @@ -229,9 +234,10 @@ onBeforeMount(() => { :text="t('Close')" @click="close" /> -
+