Merge branch 'dev' into test

src/app/sidebar/sidebar-screen.tsx

@@ -55,7 +55,7 @@ export function SidebarScreen() {
     sidebarState !== "guest" && user.currentUser == null;
 
   const name = user.currentUser?.username ?? FALLBACK_USERNAME;
-  const avatarUrl = user.currentUser?.avatarUrl ?? null;
+  const avatarUrl = user.avatarUrl ?? user.currentUser?.avatarUrl ?? null;
 
   return (
     <MobileShell>

src/app/subscription/subscription-screen.tsx

@@ -200,7 +200,7 @@ export function SubscriptionScreen({
     selectedPlan !== null && payment.agreed && !isPaymentBusy;
 
   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
     ? "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";