From 03a06bd84928c1639b580f25894ac9eb9f484614 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Sat, 28 Jan 2023 03:36:38 -0800
Subject: [PATCH] Restructure avatar in User definitions

---
 types/User.d.ts        | 3 +--
 utils/accountState.tsx | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/types/User.d.ts b/types/User.d.ts
index fdfcedd3..b79e76f2 100644
--- a/types/User.d.ts
+++ b/types/User.d.ts
@@ -1,11 +1,10 @@
 interface User {
   id: string
   username: string
-  granblueId: number
+  granblueId: string
   avatar: {
     picture: string
     element: string
   }
   gender: number
-  private: boolean
 }
diff --git a/utils/accountState.tsx b/utils/accountState.tsx
index fe2d3249..ffe3cb60 100644
--- a/utils/accountState.tsx
+++ b/utils/accountState.tsx
@@ -2,9 +2,12 @@ import { proxy } from 'valtio'
 
 export type UserState = {
   id: string
+  granblueId: string
   username: string
-  picture: string
-  element: string
+  avatar: {
+    picture: string
+    element: string
+  }
   gender: number
   language: string
   theme: string