diff --git a/apps/desktop/layer/renderer/src/modules/ai-memory/query.ts b/apps/desktop/layer/renderer/src/modules/ai-memory/query.ts
index c39f867ad..2319f5bfc 100644
--- a/apps/desktop/layer/renderer/src/modules/ai-memory/query.ts
+++ b/apps/desktop/layer/renderer/src/modules/ai-memory/query.ts
@@ -42,6 +42,7 @@ export const useAIMemoryListQuery = (params: MemoryListQuery = {}) => {
       const response = await followApi.ai.memory.list({
         ...params,
         limit,
+        // @ts-expect-error TODO: fix type
         before: pageParam ?? undefined,
       })
 
diff --git a/apps/desktop/layer/renderer/src/modules/new-user-guide/feeds-selection-list.tsx b/apps/desktop/layer/renderer/src/modules/new-user-guide/feeds-selection-list.tsx
index c3b356ac4..90bf01fe2 100644
--- a/apps/desktop/layer/renderer/src/modules/new-user-guide/feeds-selection-list.tsx
+++ b/apps/desktop/layer/renderer/src/modules/new-user-guide/feeds-selection-list.tsx
@@ -49,7 +49,7 @@ function FeedSelectionOperationScreen() {
       .findLast((m) => m.parts?.some((p) => p.type === "tool-onboardingGetTrendingFeeds"))
       ?.parts?.findLast((p) => p.type === "tool-onboardingGetTrendingFeeds")?.output
 
-    return output ? (decode(output) as FeedToSelect[]) : []
+    return typeof output === "string" ? (decode(output) as any[]) : []
   }, [chatMessages])
 
   const store = useStore()
diff --git a/apps/ssr/client/components/ui/user-avatar.tsx b/apps/ssr/client/components/ui/user-avatar.tsx
index 2b927a56a..b9ce3da7f 100644
--- a/apps/ssr/client/components/ui/user-avatar.tsx
+++ b/apps/ssr/client/components/ui/user-avatar.tsx
@@ -42,6 +42,8 @@ export const UserAvatar = ({ className }: { className?: string }) => {
         updatedAt: new Date().toISOString(),
         twoFactorEnabled: false,
         deleted: false,
+        inactive: false,
+        lastLoginMethod: "github",
       }
     } else {
       return null
diff --git a/packages/internal/store/src/morph/api.ts b/packages/internal/store/src/morph/api.ts
index 4b6e6346d..d3f570213 100644
--- a/packages/internal/store/src/morph/api.ts
+++ b/packages/internal/store/src/morph/api.ts
@@ -278,6 +278,8 @@ class APIMorph {
       roleEndAt: data.roleEndAt,
       deleted: data.deleted,
       stripeCustomerId: data.stripeCustomerId,
+      inactive: data.inactive,
+      lastLoginMethod: data.lastLoginMethod,
     }
   }
 }