diff --git a/apps/renderer/src/components/user-button.tsx b/apps/renderer/src/components/user-button.tsx index 5defacfa93..8e4777df5e 100644 --- a/apps/renderer/src/components/user-button.tsx +++ b/apps/renderer/src/components/user-button.tsx @@ -1,9 +1,11 @@ import { repository } from "@pkg" +import { m } from "framer-motion" import type { FC } from "react" import { memo } from "react" import { useTranslation } from "react-i18next" import { Link } from "react-router-dom" +import { useWhoami } from "~/atoms/user" import { Avatar, AvatarFallback, AvatarImage } from "~/components/ui/avatar" import { useSignOut } from "~/hooks/biz/useSignOut" import { useAuthQuery } from "~/hooks/common" @@ -16,7 +18,9 @@ import { useAchievementModal } from "~/modules/achievement/hooks" import { LoginModalContent } from "~/modules/auth/LoginModalContent" import { usePresentUserProfileModal } from "~/modules/profile/hooks" import { useSettingModal } from "~/modules/settings/modal/hooks" +import { Balance } from "~/modules/wallet/balance" import { useSession } from "~/queries/auth" +import { useWallet } from "~/queries/wallet" import { UserArrowLeftIcon } from "./icons/user" import { ActionButton } from "./ui/button" @@ -77,23 +81,44 @@ export const ProfileButton: FC = memo((props) => { - + - - - {t("user_button.account")} + + + + + -
- -
-
{user?.name}
-
{user?.handle}
-
+
+
{user?.name}
+
{user?.handle}
+ + { + nextFrame(() => settingModalPresent("wallet")) + }} + > +
+ + +
+
+ + { presentUserProfile(user?.id) @@ -113,14 +138,6 @@ export const ProfileButton: FC = memo((props) => { - { - nextFrame(() => settingModalPresent("wallet")) - }} - icon={} - > - {t("user_button.power")} - { nextFrame(settingModalPresent) @@ -213,41 +230,27 @@ export function UserAvatar({ ) } -// const AppTheme = () => { -// const theme = useThemeAtomValue() -// const setTheme = useSetTheme() -// return ( -// -// -// -// Theme -// -// -// )} -// value={theme} -// values={[ -// { -// value: "system", -// label: "", -// icon: , -// }, -// { -// value: "light", -// label: "", -// icon: , -// }, -// { -// value: "dark", -// label: "", -// icon: , -// }, -// ]} -// onValueChanged={(value) => { -// setTheme(value as "light" | "dark" | "system") -// }} -// /> -// ) -// } +function PowerButton() { + const user = useWhoami() + const wallet = useWallet({ userId: user?.id }) + const myWallet = wallet.data?.[0] + + return ( +
+ + + {BigInt(myWallet?.dailyPowerToken || 0n) + BigInt(myWallet?.cashablePowerToken || 0n)} + +
+ ) +} + +function LevelButton() { + return ( +
+ + Lv.1 + x1 +
+ ) +} diff --git a/apps/renderer/src/modules/feed-column/header.tsx b/apps/renderer/src/modules/feed-column/header.tsx index 2d63c92422..c2cf72002c 100644 --- a/apps/renderer/src/modules/feed-column/header.tsx +++ b/apps/renderer/src/modules/feed-column/header.tsx @@ -60,7 +60,7 @@ export const FeedColumnHeader = memo(() => {
)} -
+
@@ -89,6 +89,9 @@ const LayoutActionButton = () => { }, [feedColumnShow]) const t = useI18n() + + if (feedColumnShow) return null + return ( \ No newline at end of file