banlv/cozsweet-frontend-nextjs
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
chenhang
2026-06-25 17:29:49 +08:00
parent 4140fca889 e01b0daaf3
commit a45d1d6427
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/sidebar/sidebar-screen.tsx
+1 -1
View File
@@ -55,7 +55,7 @@ export function SidebarScreen() {
sidebarState !== "guest" && user.currentUser == null; sidebarState !== "guest" && user.currentUser == null;
const name = user.currentUser?.username ?? FALLBACK_USERNAME; const name = user.currentUser?.username ?? FALLBACK_USERNAME;
const avatarUrl = user.currentUser?.avatarUrl ?? null; const avatarUrl = user.avatarUrl ?? user.currentUser?.avatarUrl ?? null;
return ( return (
<MobileShell> <MobileShell>
src/app/subscription/subscription-screen.tsx
+1 -1
View File
@@ -200,7 +200,7 @@ export function SubscriptionScreen({
selectedPlan !== null && payment.agreed && !isPaymentBusy; selectedPlan !== null && payment.agreed && !isPaymentBusy;
const name = user.currentUser?.username ?? FALLBACK_USERNAME; const name = user.currentUser?.username ?? FALLBACK_USERNAME;
const avatarUrl = user.currentUser?.avatarUrl ?? null; const avatarUrl = user.avatarUrl ?? user.currentUser?.avatarUrl ?? null;
const autoRenewCaption = payment.autoRenew const autoRenewCaption = payment.autoRenew
? "It will automatically renew upon expiration, and can be canceled at any time" ? "It will automatically renew upon expiration, and can be canceled at any time"
: "This plan is a one-time purchase and will not automatically renew"; : "This plan is a one-time purchase and will not automatically renew";