mirror of
https://github.com/hydralauncher/hydra.git
synced 2026-01-24 11:21:02 +00:00
Merge branch 'main' into feat/auto-install-on-linux-and-friend-request-notification
# Conflicts: # src/locales/pt-PT/translation.json
This commit is contained in:
@@ -15,7 +15,6 @@ import type {
|
||||
} from "@types";
|
||||
import * as Sentry from "@sentry/react";
|
||||
import { UserFriendModalTab } from "@renderer/pages/shared-modals/user-friend-modal";
|
||||
import { isFuture, isToday } from "date-fns";
|
||||
|
||||
export function useUserDetails() {
|
||||
const dispatch = useAppDispatch();
|
||||
@@ -146,8 +145,8 @@ export function useUserDetails() {
|
||||
const unblockUser = (userId: string) => window.electron.unblockUser(userId);
|
||||
|
||||
const hasActiveSubscription = useMemo(() => {
|
||||
const expiresAt = userDetails?.subscription?.expiresAt;
|
||||
return expiresAt && (isFuture(expiresAt) || isToday(expiresAt));
|
||||
const expiresAt = new Date(userDetails?.subscription?.expiresAt ?? 0);
|
||||
return expiresAt > new Date();
|
||||
}, [userDetails]);
|
||||
|
||||
return {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
@use "../../scss/globals.scss";
|
||||
@use "sass:color";
|
||||
|
||||
.theme-editor {
|
||||
display: flex;
|
||||
@@ -58,7 +59,10 @@
|
||||
gap: 8px;
|
||||
|
||||
.active {
|
||||
background-color: darken(globals.$dark-background-color, 2%);
|
||||
background-color: color.adjust(
|
||||
globals.$dark-background-color,
|
||||
$lightness: -2%
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user