Merge branch 'main' into staging

resources/js/types/models/user-model.ts

@@ -2,7 +2,9 @@ export type UserModel = {
     id: number;
     name: string;
     email: string;
-    avatar?: string;
+    avatar: string | null;
+    avatar_color: string | null;
+    avatar_is_generated: boolean;
     email_verified_at: string | null;
     must_change_password_on_next_login: boolean;
     created_at: string;

resources/js/types/page-props.ts

@@ -226,6 +226,11 @@ export type SettingsGitConnectionsPageProps = {
     status?: string | null;
 };
 
+export type SettingsProfilePageProps = {
+    mustVerifyEmail: boolean;
+    status?: string | null;
+};
+
 export type SettingsApplicationsPageProps = {
     applicationKey?: string | null;
     applications: UserApplicationModel[];