refactor: Refactor profile management. Remove profile cache provider, implement profile provider with async fetching and updating, and integrate profile editing functionality in the UI.

lib/api.dart

···
 import 'package:grain/dpop_client.dart';
 import 'package:grain/main.dart';
 import 'package:grain/models/atproto_session.dart';
+import 'package:grain/photo_manip.dart';
 import 'package:http/http.dart' as http;
 import 'package:jose/jose.dart';
 import 'package:mime/mime.dart';
···
       return false;
     }
     appLogger.i('Deleted record $uri');
+    return true;
+  }
+
+  /// Updates the current user's profile (displayName, description, avatar).
+  /// If avatarFile is provided, uploads it as a blob and sets avatar.
+  /// Returns true on success, false on failure.
+  Future<bool> updateProfile({
+    required String displayName,
+    required String description,
+    File? avatarFile,
+  }) async {
+    final session = await auth.getValidSession();
+    if (session == null) {
+      appLogger.w('No valid session for updateProfile');
+      return false;
+    }
+    final dpopClient = DpopHttpClient(dpopKey: session.dpopJwk);
+    final issuer = session.issuer;
+    final did = session.subject;
+    // Fetch the raw profile record from atproto getRecord endpoint
+    final getUrl = Uri.parse(
+      '$issuer/xrpc/com.atproto.repo.getRecord?repo=$did&collection=social.grain.actor.profile&rkey=self',
+    );
+    final getResp = await dpopClient.send(
+      method: 'GET',
+      url: getUrl,
+      accessToken: session.accessToken,
+      headers: {'Content-Type': 'application/json'},
+    );
+    if (getResp.statusCode != 200) {
+      appLogger.w(
+        'Failed to fetch raw profile record for update: \\${getResp.statusCode} \\${getResp.body}',
+      );
+      return false;
+    }
+    final recordJson = jsonDecode(getResp.body) as Map<String, dynamic>;
+    var avatar = recordJson['value']?['avatar'];
+    // If avatarFile is provided, upload it and set avatar
+    if (avatarFile != null) {
+      try {
+        // Resize avatar before upload using photo_manip
+        final resizeResult = await resizeImage(file: avatarFile);
+        final blobResult = await uploadBlob(resizeResult.file);
+        if (blobResult != null && blobResult['blob'] != null) {
+          avatar = blobResult['blob'];
+        }
+      } catch (e) {
+        appLogger.w('Failed to upload avatar: $e');
+      }
+    }
+    // Update the profile record
+    final url = Uri.parse('$issuer/xrpc/com.atproto.repo.putRecord');
+    final record = {
+      'collection': 'social.grain.actor.profile',
+      'repo': did,
+      'rkey': 'self',
+      'record': {'displayName': displayName, 'description': description, 'avatar': avatar},
+    };
+    appLogger.i('Updating profile: $record');
+    final response = await dpopClient.send(
+      method: 'POST',
+      url: url,
+      accessToken: session.accessToken,
+      headers: {'Content-Type': 'application/json'},
+      body: jsonEncode(record),
+    );
+    if (response.statusCode != 200 && response.statusCode != 201) {
+      appLogger.w('Failed to update profile: \\${response.statusCode} \\${response.body}');
+      return false;
+    }
+    appLogger.i('Profile updated successfully');
     return true;
   }
 }

lib/main.dart

···
 import 'package:grain/screens/home_page.dart';
 import 'package:grain/screens/splash_page.dart';
 
+import 'providers/profile_provider.dart';
+
 class AppConfig {
   static late final String apiUrl;
 
···
   }
 
   void handleSignIn() async {
+    final container = ProviderScope.containerOf(context, listen: false);
+
     setState(() {
       isSignedIn = true;
     });
···
     await apiService.fetchCurrentUser();
   }
 
-  void handleSignOut() async {
+  void handleSignOut(BuildContext context) async {
+    final container = ProviderScope.containerOf(context, listen: false);
     await auth.clearSession(); // Clear session data
+    // Invalidate Riverpod providers for profile and gallery state
+    container.invalidate(profileNotifierProvider);
+    // Add any other providers you want to invalidate here
     setState(() {
       isSignedIn = false;
     });
···
       );
     } else {
       home = isSignedIn
-          ? MyHomePage(title: 'Grain', onSignOut: handleSignOut)
+          ? MyHomePage(title: 'Grain', onSignOut: () => handleSignOut(context))
           : SplashPage(onSignIn: handleSignIn);
     }
     return MaterialApp(

lib/models/profile.dart

···
 @freezed
 class Profile with _$Profile {
   const factory Profile({
+    required String cid,
     required String did,
     required String handle,
     String? displayName,

lib/models/profile.freezed.dart

···
 
 /// @nodoc
 mixin _$Profile {
+  String get cid => throw _privateConstructorUsedError;
   String get did => throw _privateConstructorUsedError;
   String get handle => throw _privateConstructorUsedError;
   String? get displayName => throw _privateConstructorUsedError;
···
       _$ProfileCopyWithImpl<$Res, Profile>;
   @useResult
   $Res call({
+    String cid,
     String did,
     String handle,
     String? displayName,
···
   @pragma('vm:prefer-inline')
   @override
   $Res call({
+    Object? cid = null,
     Object? did = null,
     Object? handle = null,
     Object? displayName = freezed,
···
   }) {
     return _then(
       _value.copyWith(
+            cid: null == cid
+                ? _value.cid
+                : cid // ignore: cast_nullable_to_non_nullable
+                      as String,
             did: null == did
                 ? _value.did
                 : did // ignore: cast_nullable_to_non_nullable
···
   @override
   @useResult
   $Res call({
+    String cid,
     String did,
     String handle,
     String? displayName,
···
   @pragma('vm:prefer-inline')
   @override
   $Res call({
+    Object? cid = null,
     Object? did = null,
     Object? handle = null,
     Object? displayName = freezed,
···
   }) {
     return _then(
       _$ProfileImpl(
+        cid: null == cid
+            ? _value.cid
+            : cid // ignore: cast_nullable_to_non_nullable
+                  as String,
         did: null == did
             ? _value.did
             : did // ignore: cast_nullable_to_non_nullable
···
 @JsonSerializable()
 class _$ProfileImpl implements _Profile {
   const _$ProfileImpl({
+    required this.cid,
     required this.did,
     required this.handle,
     this.displayName,
···
   factory _$ProfileImpl.fromJson(Map<String, dynamic> json) =>
       _$$ProfileImplFromJson(json);
 
+  @override
+  final String cid;
   @override
   final String did;
   @override
···
 
   @override
   String toString() {
-    return 'Profile(did: $did, handle: $handle, displayName: $displayName, description: $description, avatar: $avatar, followersCount: $followersCount, followsCount: $followsCount, galleryCount: $galleryCount, viewer: $viewer)';
+    return 'Profile(cid: $cid, did: $did, handle: $handle, displayName: $displayName, description: $description, avatar: $avatar, followersCount: $followersCount, followsCount: $followsCount, galleryCount: $galleryCount, viewer: $viewer)';
   }
 
   @override
···
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ProfileImpl &&
+            (identical(other.cid, cid) || other.cid == cid) &&
             (identical(other.did, did) || other.did == did) &&
             (identical(other.handle, handle) || other.handle == handle) &&
             (identical(other.displayName, displayName) ||
···
   @override
   int get hashCode => Object.hash(
     runtimeType,
+    cid,
     did,
     handle,
     displayName,
···
 
 abstract class _Profile implements Profile {
   const factory _Profile({
+    required final String cid,
     required final String did,
     required final String handle,
     final String? displayName,
···
 
   factory _Profile.fromJson(Map<String, dynamic> json) = _$ProfileImpl.fromJson;
 
+  @override
+  String get cid;
   @override
   String get did;
   @override

lib/models/profile.g.dart

···
 
 _$ProfileImpl _$$ProfileImplFromJson(Map<String, dynamic> json) =>
     _$ProfileImpl(
+      cid: json['cid'] as String,
       did: json['did'] as String,
       handle: json['handle'] as String,
       displayName: json['displayName'] as String?,
···
 
 Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
     <String, dynamic>{
+      'cid': instance.cid,
       'did': instance.did,
       'handle': instance.handle,
       'displayName': instance.displayName,

lib/models/profile_with_galleries.dart

···
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import 'gallery.dart';
+import 'profile.dart';
+
+part 'profile_with_galleries.freezed.dart';
+part 'profile_with_galleries.g.dart';
+
+@freezed
+class ProfileWithGalleries with _$ProfileWithGalleries {
+  const factory ProfileWithGalleries({required Profile profile, required List<Gallery> galleries}) =
+      _ProfileWithGalleries;
+
+  factory ProfileWithGalleries.fromJson(Map<String, dynamic> json) =>
+      _$ProfileWithGalleriesFromJson(json);
+}

lib/models/profile_with_galleries.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'profile_with_galleries.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+ProfileWithGalleries _$ProfileWithGalleriesFromJson(Map<String, dynamic> json) {
+  return _ProfileWithGalleries.fromJson(json);
+}
+
+/// @nodoc
+mixin _$ProfileWithGalleries {
+  Profile get profile => throw _privateConstructorUsedError;
+  List<Gallery> get galleries => throw _privateConstructorUsedError;
+
+  /// Serializes this ProfileWithGalleries to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of ProfileWithGalleries
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $ProfileWithGalleriesCopyWith<ProfileWithGalleries> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ProfileWithGalleriesCopyWith<$Res> {
+  factory $ProfileWithGalleriesCopyWith(
+    ProfileWithGalleries value,
+    $Res Function(ProfileWithGalleries) then,
+  ) = _$ProfileWithGalleriesCopyWithImpl<$Res, ProfileWithGalleries>;
+  @useResult
+  $Res call({Profile profile, List<Gallery> galleries});
+
+  $ProfileCopyWith<$Res> get profile;
+}
+
+/// @nodoc
+class _$ProfileWithGalleriesCopyWithImpl<
+  $Res,
+  $Val extends ProfileWithGalleries
+>
+    implements $ProfileWithGalleriesCopyWith<$Res> {
+  _$ProfileWithGalleriesCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of ProfileWithGalleries
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({Object? profile = null, Object? galleries = null}) {
+    return _then(
+      _value.copyWith(
+            profile: null == profile
+                ? _value.profile
+                : profile // ignore: cast_nullable_to_non_nullable
+                      as Profile,
+            galleries: null == galleries
+                ? _value.galleries
+                : galleries // ignore: cast_nullable_to_non_nullable
+                      as List<Gallery>,
+          )
+          as $Val,
+    );
+  }
+
+  /// Create a copy of ProfileWithGalleries
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $ProfileCopyWith<$Res> get profile {
+    return $ProfileCopyWith<$Res>(_value.profile, (value) {
+      return _then(_value.copyWith(profile: value) as $Val);
+    });
+  }
+}
+
+/// @nodoc
+abstract class _$$ProfileWithGalleriesImplCopyWith<$Res>
+    implements $ProfileWithGalleriesCopyWith<$Res> {
+  factory _$$ProfileWithGalleriesImplCopyWith(
+    _$ProfileWithGalleriesImpl value,
+    $Res Function(_$ProfileWithGalleriesImpl) then,
+  ) = __$$ProfileWithGalleriesImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({Profile profile, List<Gallery> galleries});
+
+  @override
+  $ProfileCopyWith<$Res> get profile;
+}
+
+/// @nodoc
+class __$$ProfileWithGalleriesImplCopyWithImpl<$Res>
+    extends _$ProfileWithGalleriesCopyWithImpl<$Res, _$ProfileWithGalleriesImpl>
+    implements _$$ProfileWithGalleriesImplCopyWith<$Res> {
+  __$$ProfileWithGalleriesImplCopyWithImpl(
+    _$ProfileWithGalleriesImpl _value,
+    $Res Function(_$ProfileWithGalleriesImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of ProfileWithGalleries
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({Object? profile = null, Object? galleries = null}) {
+    return _then(
+      _$ProfileWithGalleriesImpl(
+        profile: null == profile
+            ? _value.profile
+            : profile // ignore: cast_nullable_to_non_nullable
+                  as Profile,
+        galleries: null == galleries
+            ? _value._galleries
+            : galleries // ignore: cast_nullable_to_non_nullable
+                  as List<Gallery>,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$ProfileWithGalleriesImpl implements _ProfileWithGalleries {
+  const _$ProfileWithGalleriesImpl({
+    required this.profile,
+    required final List<Gallery> galleries,
+  }) : _galleries = galleries;
+
+  factory _$ProfileWithGalleriesImpl.fromJson(Map<String, dynamic> json) =>
+      _$$ProfileWithGalleriesImplFromJson(json);
+
+  @override
+  final Profile profile;
+  final List<Gallery> _galleries;
+  @override
+  List<Gallery> get galleries {
+    if (_galleries is EqualUnmodifiableListView) return _galleries;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_galleries);
+  }
+
+  @override
+  String toString() {
+    return 'ProfileWithGalleries(profile: $profile, galleries: $galleries)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ProfileWithGalleriesImpl &&
+            (identical(other.profile, profile) || other.profile == profile) &&
+            const DeepCollectionEquality().equals(
+              other._galleries,
+              _galleries,
+            ));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+    runtimeType,
+    profile,
+    const DeepCollectionEquality().hash(_galleries),
+  );
+
+  /// Create a copy of ProfileWithGalleries
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ProfileWithGalleriesImplCopyWith<_$ProfileWithGalleriesImpl>
+  get copyWith =>
+      __$$ProfileWithGalleriesImplCopyWithImpl<_$ProfileWithGalleriesImpl>(
+        this,
+        _$identity,
+      );
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$ProfileWithGalleriesImplToJson(this);
+  }
+}
+
+abstract class _ProfileWithGalleries implements ProfileWithGalleries {
+  const factory _ProfileWithGalleries({
+    required final Profile profile,
+    required final List<Gallery> galleries,
+  }) = _$ProfileWithGalleriesImpl;
+
+  factory _ProfileWithGalleries.fromJson(Map<String, dynamic> json) =
+      _$ProfileWithGalleriesImpl.fromJson;
+
+  @override
+  Profile get profile;
+  @override
+  List<Gallery> get galleries;
+
+  /// Create a copy of ProfileWithGalleries
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$ProfileWithGalleriesImplCopyWith<_$ProfileWithGalleriesImpl>
+  get copyWith => throw _privateConstructorUsedError;
+}

lib/models/profile_with_galleries.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'profile_with_galleries.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$ProfileWithGalleriesImpl _$$ProfileWithGalleriesImplFromJson(
+  Map<String, dynamic> json,
+) => _$ProfileWithGalleriesImpl(
+  profile: Profile.fromJson(json['profile'] as Map<String, dynamic>),
+  galleries: (json['galleries'] as List<dynamic>)
+      .map((e) => Gallery.fromJson(e as Map<String, dynamic>))
+      .toList(),
+);
+
+Map<String, dynamic> _$$ProfileWithGalleriesImplToJson(
+  _$ProfileWithGalleriesImpl instance,
+) => <String, dynamic>{
+  'profile': instance.profile,
+  'galleries': instance.galleries,
+};

lib/providers/gallery_cache_provider.dart

···
 
   Gallery? getGallery(String uri) => state[uri];
 
+  void setGalleriesForActor(String did, List<Gallery> galleries) {
+    setGalleries(galleries);
+    // Optionally, you could keep a mapping of actor DID to gallery URIs if needed
+  }
+
   Future<void> toggleFavorite(String uri) async {
     // Fetch the latest gallery from the API to ensure up-to-date favorite state
     final latestGallery = await apiService.getGallery(uri: uri);

lib/providers/gallery_cache_provider.g.dart

···
 // RiverpodGenerator
 // **************************************************************************
 
-String _$galleryCacheHash() => r'dc64ef86246ea4ac742837cfcc8a9353375f2144';
+String _$galleryCacheHash() => r'24f705b282f56332ab62705a6b29eb3f3c80142b';
 
 /// Holds a cache of galleries by URI.
 ///

lib/providers/profile_cache_provider.dart

···
-import 'package:grain/api.dart';
-import 'package:grain/models/profile.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-part 'profile_cache_provider.g.dart';
-
-@Riverpod(keepAlive: true)
-class ProfileCache extends _$ProfileCache {
-  @override
-  Map<String, Profile> build() => {};
-
-  Future<Profile?> fetch(String did) async {
-    if (state.containsKey(did)) {
-      return state[did];
-    }
-    final profile = await apiService.fetchProfile(did: did);
-    if (profile != null) {
-      state = {...state, did: profile};
-    }
-    return profile;
-  }
-
-  void setProfile(Profile profile) {
-    state = {...state, profile.did: profile};
-  }
-
-  Future<void> toggleFollow(String followeeDid, String? followerDid) async {
-    final profile = state[followeeDid];
-    if (profile == null || followerDid == null) return;
-    final viewer = profile.viewer;
-    final followUri = viewer?.following;
-    if (followUri != null && followUri.isNotEmpty) {
-      // Unfollow
-      final success = await apiService.deleteRecord(followUri);
-      if (success) {
-        final updatedProfile = profile.copyWith(
-          viewer: viewer?.copyWith(following: null),
-          followersCount: (profile.followersCount ?? 1) - 1,
-        );
-        state = {...state, followeeDid: updatedProfile};
-      }
-    } else {
-      // Follow
-      final newFollowUri = await apiService.createFollow(followeeDid: followeeDid);
-      if (newFollowUri != null) {
-        final updatedProfile = profile.copyWith(
-          viewer: viewer?.copyWith(following: newFollowUri),
-          followersCount: (profile.followersCount ?? 0) + 1,
-        );
-        state = {...state, followeeDid: updatedProfile};
-      }
-    }
-  }
-}

lib/providers/profile_cache_provider.g.dart

···
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'profile_cache_provider.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-String _$profileCacheHash() => r'e2b88310e5f54587442c2a9a0307b01030993fcc';
-
-/// See also [ProfileCache].
-@ProviderFor(ProfileCache)
-final profileCacheProvider =
-    NotifierProvider<ProfileCache, Map<String, Profile>>.internal(
-      ProfileCache.new,
-      name: r'profileCacheProvider',
-      debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-          ? null
-          : _$profileCacheHash,
-      dependencies: null,
-      allTransitiveDependencies: null,
-    );
-
-typedef _$ProfileCache = Notifier<Map<String, Profile>>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/providers/profile_provider.dart

···
+import 'dart:io';
+
+import 'package:grain/api.dart';
+import 'package:grain/models/profile.dart';
+import 'package:grain/models/profile_with_galleries.dart';
+import 'package:grain/providers/gallery_cache_provider.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'profile_provider.g.dart';
+
+@Riverpod(keepAlive: true)
+class ProfileNotifier extends _$ProfileNotifier {
+  @override
+  Future<ProfileWithGalleries?> build(String did) async {
+    return _fetchProfile(did);
+  }
+
+  Future<ProfileWithGalleries?> _fetchProfile(String did) async {
+    final profile = await apiService.fetchProfile(did: did);
+    final galleries = await apiService.fetchActorGalleries(did: did);
+    if (profile != null) {
+      return ProfileWithGalleries(profile: profile, galleries: galleries);
+    }
+    return null;
+  }
+
+  Future<void> refresh() async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() => _fetchProfile(did));
+  }
+
+  Future<bool> updateProfile({
+    required String displayName,
+    required String description,
+    dynamic avatarFile,
+  }) async {
+    File? file;
+    if (avatarFile is XFile) {
+      file = File(avatarFile.path);
+    } else if (avatarFile is File) {
+      file = avatarFile;
+    } else {
+      file = null;
+    }
+    final success = await apiService.updateProfile(
+      displayName: displayName,
+      description: description,
+      avatarFile: file,
+    );
+    if (success) {
+      final start = DateTime.now();
+      const timeout = Duration(seconds: 20);
+      const pollInterval = Duration(milliseconds: 1000);
+      Profile? updated;
+      final prevCid = state.value?.profile.cid;
+      state = const AsyncValue.loading(); // Force UI to show loading and rebuild
+      while (DateTime.now().difference(start) < timeout) {
+        updated = await apiService.fetchProfile(did: did);
+        if (updated != null && updated.cid != prevCid) {
+          break;
+        }
+        await Future.delayed(pollInterval);
+      }
+      // Always assign a new instance to state
+      if (updated != null) {
+        final galleries = await apiService.fetchActorGalleries(did: did);
+        // Update the gallery cache provider
+        ref.read(galleryCacheProvider.notifier).setGalleriesForActor(did, galleries);
+        state = AsyncValue.data(ProfileWithGalleries(profile: updated, galleries: galleries));
+      } else {
+        state = const AsyncValue.data(null);
+      }
+      if (updated == null) {
+        await refresh();
+      }
+    }
+    return success;
+  }
+
+  Future<void> toggleFollow(String? followerDid) async {
+    final current = state.value;
+    final profile = current?.profile;
+    if (profile == null || followerDid == null) return;
+    final viewer = profile.viewer;
+    final followUri = viewer?.following;
+    if (followUri != null && followUri.isNotEmpty) {
+      // Unfollow
+      final success = await apiService.deleteRecord(followUri);
+      if (success) {
+        final updatedProfile = profile.copyWith(
+          viewer: viewer?.copyWith(following: null),
+          followersCount: (profile.followersCount ?? 1) - 1,
+        );
+        state = AsyncValue.data(
+          ProfileWithGalleries(profile: updatedProfile, galleries: current!.galleries),
+        );
+      }
+    } else {
+      // Follow
+      final newFollowUri = await apiService.createFollow(followeeDid: did);
+      if (newFollowUri != null) {
+        final updatedProfile = profile.copyWith(
+          viewer: viewer?.copyWith(following: newFollowUri),
+          followersCount: (profile.followersCount ?? 0) + 1,
+        );
+        state = AsyncValue.data(
+          ProfileWithGalleries(profile: updatedProfile, galleries: current!.galleries),
+        );
+      }
+    }
+  }
+}

lib/providers/profile_provider.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'profile_provider.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$profileNotifierHash() => r'0a4d40043196309ae74bdb3b88d7d63d25b8b4f6';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$ProfileNotifier
+    extends BuildlessAsyncNotifier<ProfileWithGalleries?> {
+  late final String did;
+
+  FutureOr<ProfileWithGalleries?> build(String did);
+}
+
+/// See also [ProfileNotifier].
+@ProviderFor(ProfileNotifier)
+const profileNotifierProvider = ProfileNotifierFamily();
+
+/// See also [ProfileNotifier].
+class ProfileNotifierFamily extends Family<AsyncValue<ProfileWithGalleries?>> {
+  /// See also [ProfileNotifier].
+  const ProfileNotifierFamily();
+
+  /// See also [ProfileNotifier].
+  ProfileNotifierProvider call(String did) {
+    return ProfileNotifierProvider(did);
+  }
+
+  @override
+  ProfileNotifierProvider getProviderOverride(
+    covariant ProfileNotifierProvider provider,
+  ) {
+    return call(provider.did);
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'profileNotifierProvider';
+}
+
+/// See also [ProfileNotifier].
+class ProfileNotifierProvider
+    extends AsyncNotifierProviderImpl<ProfileNotifier, ProfileWithGalleries?> {
+  /// See also [ProfileNotifier].
+  ProfileNotifierProvider(String did)
+    : this._internal(
+        () => ProfileNotifier()..did = did,
+        from: profileNotifierProvider,
+        name: r'profileNotifierProvider',
+        debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+            ? null
+            : _$profileNotifierHash,
+        dependencies: ProfileNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            ProfileNotifierFamily._allTransitiveDependencies,
+        did: did,
+      );
+
+  ProfileNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.did,
+  }) : super.internal();
+
+  final String did;
+
+  @override
+  FutureOr<ProfileWithGalleries?> runNotifierBuild(
+    covariant ProfileNotifier notifier,
+  ) {
+    return notifier.build(did);
+  }
+
+  @override
+  Override overrideWith(ProfileNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: ProfileNotifierProvider._internal(
+        () => create()..did = did,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        did: did,
+      ),
+    );
+  }
+
+  @override
+  AsyncNotifierProviderElement<ProfileNotifier, ProfileWithGalleries?>
+  createElement() {
+    return _ProfileNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ProfileNotifierProvider && other.did == did;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, did.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin ProfileNotifierRef on AsyncNotifierProviderRef<ProfileWithGalleries?> {
+  /// The parameter `did` of this provider.
+  String get did;
+}
+
+class _ProfileNotifierProviderElement
+    extends AsyncNotifierProviderElement<ProfileNotifier, ProfileWithGalleries?>
+    with ProfileNotifierRef {
+  _ProfileNotifierProviderElement(super.provider);
+
+  @override
+  String get did => (origin as ProfileNotifierProvider).did;
+}
+
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/screens/home_page.dart

···
               showExplore = false;
             });
           },
-          avatarUrl: apiService.currentUser?.avatar,
         ),
         floatingActionButton: (!showProfile && !showNotifications && !showExplore)
             ? FloatingActionButton(
···
             showExplore = false;
           });
         },
-        avatarUrl: apiService.currentUser?.avatar,
       ),
     );
   }

lib/screens/profile_page.dart

···
 import 'package:grain/api.dart';
 import 'package:grain/app_theme.dart';
 import 'package:grain/models/gallery.dart';
-import 'package:grain/providers/profile_cache_provider.dart';
+import 'package:grain/models/profile_with_galleries.dart';
+import 'package:grain/providers/profile_provider.dart';
 import 'package:grain/screens/hashtag_page.dart';
 import 'package:grain/widgets/app_button.dart';
 import 'package:grain/widgets/app_image.dart';
+import 'package:grain/widgets/edit_profile_sheet.dart';
 import 'package:grain/widgets/faceted_text.dart';
 
 import 'gallery_page.dart';
···
 }
 
 class _ProfilePageState extends ConsumerState<ProfilePage> with SingleTickerProviderStateMixin {
-  dynamic _profile;
-  bool _loading = true;
-  List<Gallery> _galleries = [];
   List<Gallery> _favs = [];
   TabController? _tabController;
   bool _favsLoading = false;
-  bool _galleriesLoading = false;
-  List<Map<String, dynamic>>? _descriptionFacets;
-
-  Future<List<Map<String, dynamic>>> _extractFacets(String text) async {
-    final blueskyText = BlueskyText(text);
-    final entities = blueskyText.entities;
-    final facets = await entities.toFacets();
-    return List<Map<String, dynamic>>.from(facets);
-  }
 
   @override
   void initState() {
···
     final isOwnProfile = (apiService.currentUser?.did == did);
     _tabController = TabController(length: isOwnProfile ? 2 : 1, vsync: this);
     _tabController!.addListener(_onTabChanged);
-    _fetchProfileAndGalleries();
   }
 
   @override
···
           _favsLoading = true;
         });
       }
-      String? did = (_profile ?? widget.profile)?.did;
+      String? did = widget.did ?? widget.profile?.did;
       if (did != null && did.isNotEmpty) {
         try {
           final favs = await apiService.getActorFavs(did: did);
···
     }
   }
 
-  Future<void> _fetchProfileAndGalleries() async {
-    if (mounted) {
-      setState(() {
-        _loading = true;
-      });
-    }
-    String? did = widget.did ?? widget.profile?.did;
-    if (did == null || did.isEmpty) {
-      if (mounted) {
-        setState(() {
-          _loading = false;
-        });
-      }
-      return;
-    }
-    // Use the profileCacheProvider to fetch and cache the profile
-    final profile = await ref.read(profileCacheProvider.notifier).fetch(did);
-    final galleries = await apiService.fetchActorGalleries(did: did);
-    List<Map<String, dynamic>>? descriptionFacets;
-    if ((profile?.description ?? '').isNotEmpty) {
-      try {
-        final desc = profile != null ? profile.description : '';
-        descriptionFacets = await _extractFacets(desc ?? '');
-      } catch (_) {
-        descriptionFacets = null;
-      }
-    }
-    if (mounted) {
-      setState(() {
-        _profile = profile;
-        _galleries = galleries;
-        _descriptionFacets = descriptionFacets;
-        _loading = false;
-      });
+  // Refactored: Just pop the sheet after save, don't return edited values
+  Future<void> _handleProfileSave(
+    String did,
+    String displayName,
+    String description,
+    dynamic avatarFile,
+  ) async {
+    final notifier = ref.read(profileNotifierProvider(did).notifier);
+    final success = await notifier.updateProfile(
+      displayName: displayName,
+      description: description,
+      avatarFile: avatarFile,
+    );
+    if (!mounted) return;
+    if (success) {
+      Navigator.of(context).pop();
+      if (mounted) setState(() {}); // Force widget rebuild after modal closes
+    } else {
+      if (!mounted) return;
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(const SnackBar(content: Text('Failed to update profile')));
     }
   }
 
···
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     final did = widget.did ?? widget.profile?.did;
-    final profile = did != null
-        ? ref.watch(profileCacheProvider)[did] ?? _profile ?? widget.profile
-        : _profile ?? widget.profile;
-    if (_loading) {
-      return Scaffold(
-        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+    final asyncProfile = did != null
+        ? ref.watch(profileNotifierProvider(did))
+        : const AsyncValue<ProfileWithGalleries?>.loading();
+
+    return asyncProfile.when(
+      loading: () => Scaffold(
+        backgroundColor: theme.scaffoldBackgroundColor,
         body: Center(
           child: CircularProgressIndicator(strokeWidth: 2, color: theme.colorScheme.primary),
         ),
-      );
-    }
-    if (profile == null) {
-      return const Center(child: Text('No profile data'));
-    }
-    return Scaffold(
-      backgroundColor: theme.scaffoldBackgroundColor,
-      appBar: widget.showAppBar
-          ? AppBar(
-              backgroundColor: theme.appBarTheme.backgroundColor,
-              surfaceTintColor: theme.appBarTheme.backgroundColor,
-              bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(1),
-                child: Container(color: theme.dividerColor, height: 1),
-              ),
-              leading: const BackButton(),
-            )
-          : null,
-      body: SafeArea(
-        bottom: false,
-        child: Column(
-          children: [
-            Expanded(
-              child: NestedScrollView(
-                headerSliverBuilder: (context, innerBoxIsScrolled) => [
-                  SliverToBoxAdapter(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 8),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              const SizedBox(height: 16),
-                              Row(
+      ),
+      error: (err, stack) => Scaffold(
+        backgroundColor: theme.scaffoldBackgroundColor,
+        body: Center(child: Text('Failed to load profile')),
+      ),
+      data: (profileWithGalleries) {
+        if (profileWithGalleries == null) {
+          return Scaffold(
+            backgroundColor: theme.scaffoldBackgroundColor,
+            body: Center(child: Text('Profile not found')),
+          );
+        }
+        final profile = profileWithGalleries.profile;
+        final galleries = profileWithGalleries.galleries;
+        Future<List<Map<String, dynamic>>?> getDescriptionFacets() async {
+          final desc = profile.description ?? '';
+          if (desc.isEmpty) return null;
+          try {
+            final blueskyText = BlueskyText(desc);
+            final entities = blueskyText.entities;
+            return await entities.toFacets();
+          } catch (_) {
+            return null;
+          }
+        }
+
+        return Scaffold(
+          backgroundColor: theme.scaffoldBackgroundColor,
+          appBar: widget.showAppBar
+              ? AppBar(
+                  backgroundColor: theme.appBarTheme.backgroundColor,
+                  surfaceTintColor: theme.appBarTheme.backgroundColor,
+                  bottom: PreferredSize(
+                    preferredSize: const Size.fromHeight(1),
+                    child: Container(color: theme.dividerColor, height: 1),
+                  ),
+                  leading: const BackButton(),
+                )
+              : null,
+          body: SafeArea(
+            bottom: false,
+            child: Column(
+              children: [
+                Expanded(
+                  child: NestedScrollView(
+                    headerSliverBuilder: (context, innerBoxIsScrolled) => [
+                      SliverToBoxAdapter(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Padding(
+                              padding: const EdgeInsets.symmetric(horizontal: 8),
+                              child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  // Avatar
-                                  if (profile.avatar != null)
-                                    ClipOval(
-                                      child: AppImage(
-                                        url: profile.avatar,
-                                        width: 64,
-                                        height: 64,
-                                        fit: BoxFit.cover,
-                                      ),
-                                    )
-                                  else
-                                    const Icon(Icons.account_circle, size: 64, color: Colors.grey),
-                                  const Spacer(),
-                                  // Follow/Unfollow button
-                                  if (profile.did != apiService.currentUser?.did)
-                                    SizedBox(
-                                      child: AppButton(
-                                        size: AppButtonSize.small,
-                                        variant: profile.viewer?.following?.isNotEmpty == true
-                                            ? AppButtonVariant.secondary
-                                            : AppButtonVariant.primary,
-                                        onPressed: () async {
-                                          await ref
-                                              .read(profileCacheProvider.notifier)
-                                              .toggleFollow(
-                                                profile.did,
-                                                apiService.currentUser?.did,
+                                  const SizedBox(height: 16),
+                                  Row(
+                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                    children: [
+                                      // Avatar
+                                      if (profile.avatar != null)
+                                        ClipOval(
+                                          child: AppImage(
+                                            url: profile.avatar,
+                                            width: 64,
+                                            height: 64,
+                                            fit: BoxFit.cover,
+                                          ),
+                                        )
+                                      else
+                                        const Icon(
+                                          Icons.account_circle,
+                                          size: 64,
+                                          color: Colors.grey,
+                                        ),
+                                      const Spacer(),
+                                      // Follow/Unfollow button
+                                      if (profile.did != apiService.currentUser?.did)
+                                        SizedBox(
+                                          child: AppButton(
+                                            size: AppButtonSize.small,
+                                            variant: profile.viewer?.following?.isNotEmpty == true
+                                                ? AppButtonVariant.secondary
+                                                : AppButtonVariant.primary,
+                                            onPressed: () async {
+                                              await ref
+                                                  .read(
+                                                    profileNotifierProvider(profile.did).notifier,
+                                                  )
+                                                  .toggleFollow(apiService.currentUser?.did);
+                                            },
+                                            label: (profile.viewer?.following?.isNotEmpty == true)
+                                                ? 'Following'
+                                                : 'Follow',
+                                          ),
+                                        )
+                                      // Edit Profile button for current user
+                                      else
+                                        SizedBox(
+                                          child: AppButton(
+                                            size: AppButtonSize.small,
+                                            variant: AppButtonVariant.secondary,
+                                            onPressed: () async {
+                                              final bottomSheetContext = context;
+                                              await showModalBottomSheet<Map<String, dynamic>>(
+                                                context: bottomSheetContext,
+                                                isScrollControlled: true,
+                                                backgroundColor: Colors.transparent,
+                                                builder: (sheetContext) => EditProfileSheet(
+                                                  initialDisplayName: profile.displayName,
+                                                  initialDescription: profile.description,
+                                                  initialAvatarUrl: profile.avatar,
+                                                  onSave:
+                                                      (displayName, description, avatarFile) async {
+                                                        await _handleProfileSave(
+                                                          profile.did,
+                                                          displayName,
+                                                          description,
+                                                          avatarFile,
+                                                        );
+                                                      },
+                                                  onCancel: () => Navigator.of(sheetContext).pop(),
+                                                ),
                                               );
-                                        },
-                                        label: (profile.viewer?.following?.isNotEmpty == true)
-                                            ? 'Following'
-                                            : 'Follow',
-                                      ),
+                                            },
+                                            label: 'Edit profile',
+                                          ),
+                                        ),
+                                    ],
+                                  ),
+                                  const SizedBox(height: 8),
+                                  Text(
+                                    profile.displayName ?? '',
+                                    style: const TextStyle(
+                                      fontSize: 28,
+                                      fontWeight: FontWeight.w800,
+                                    ),
+                                    textAlign: TextAlign.left,
+                                  ),
+                                  const SizedBox(height: 2),
+                                  Text(
+                                    '@${profile.handle}',
+                                    style: TextStyle(
+                                      fontSize: 14,
+                                      color: Theme.of(context).brightness == Brightness.dark
+                                          ? Colors.grey[400]
+                                          : Colors.grey[700],
+                                    ),
+                                    textAlign: TextAlign.left,
+                                  ),
+                                  const SizedBox(height: 12),
+                                  _ProfileStatsRow(
+                                    followers:
+                                        (profile.followersCount is int
+                                                ? profile.followersCount
+                                                : int.tryParse(
+                                                        profile.followersCount?.toString() ?? '0',
+                                                      ) ??
+                                                      0)
+                                            .toString(),
+                                    following:
+                                        (profile.followsCount is int
+                                                ? profile.followsCount
+                                                : int.tryParse(
+                                                        profile.followsCount?.toString() ?? '0',
+                                                      ) ??
+                                                      0)
+                                            .toString(),
+                                    galleries:
+                                        (profile.galleryCount is int
+                                                ? profile.galleryCount
+                                                : int.tryParse(
+                                                        profile.galleryCount?.toString() ?? '0',
+                                                      ) ??
+                                                      0)
+                                            .toString(),
+                                  ),
+                                  if ((profile.description ?? '').isNotEmpty) ...[
+                                    const SizedBox(height: 16),
+                                    FutureBuilder<List<Map<String, dynamic>>?>(
+                                      future: getDescriptionFacets(),
+                                      builder: (context, snapshot) {
+                                        return FacetedText(
+                                          text: profile.description ?? '',
+                                          facets: snapshot.data,
+                                          onMentionTap: (didOrHandle) {
+                                            Navigator.of(context).push(
+                                              MaterialPageRoute(
+                                                builder: (context) =>
+                                                    ProfilePage(did: didOrHandle, showAppBar: true),
+                                              ),
+                                            );
+                                          },
+                                          onLinkTap: (url) {
+                                            // TODO: Implement WebViewPage navigation
+                                          },
+                                          onTagTap: (tag) => Navigator.push(
+                                            context,
+                                            MaterialPageRoute(
+                                              builder: (_) => HashtagPage(hashtag: tag),
+                                            ),
+                                          ),
+                                          linkStyle: TextStyle(
+                                            color: Theme.of(context).colorScheme.primary,
+                                            fontWeight: FontWeight.w600,
+                                          ),
+                                        );
+                                      },
                                     ),
+                                  ],
+                                  const SizedBox(height: 24),
                                 ],
                               ),
-                              const SizedBox(height: 8),
-                              Text(
-                                profile.displayName ?? '',
-                                style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w800),
-                                textAlign: TextAlign.left,
+                            ),
+                            // TabBar with no horizontal padding
+                            Container(
+                              color: theme.scaffoldBackgroundColor,
+                              child: TabBar(
+                                dividerColor: theme.disabledColor,
+                                controller: _tabController,
+                                indicator: UnderlineTabIndicator(
+                                  borderSide: const BorderSide(
+                                    color: AppTheme.primaryColor,
+                                    width: 3,
+                                  ),
+                                  insets: EdgeInsets.zero,
+                                ),
+                                indicatorSize: TabBarIndicatorSize.tab,
+                                labelColor: theme.colorScheme.onSurface,
+                                unselectedLabelColor: theme.colorScheme.onSurfaceVariant,
+                                labelStyle: const TextStyle(
+                                  fontWeight: FontWeight.w600,
+                                  fontSize: 16,
+                                ),
+                                tabs: [
+                                  const Tab(text: 'Galleries'),
+                                  if (apiService.currentUser?.did == profile.did)
+                                    const Tab(text: 'Favs'),
+                                ],
                               ),
-                              const SizedBox(height: 2),
-                              Text(
-                                '@${profile.handle ?? ''}',
-                                style: TextStyle(
-                                  fontSize: 14,
-                                  color: Theme.of(context).brightness == Brightness.dark
-                                      ? Colors.grey[400]
-                                      : Colors.grey[700],
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                    body: TabBarView(
+                      controller: _tabController,
+                      children: [
+                        // Galleries tab, edge-to-edge grid
+                        galleries.isEmpty
+                            ? GridView.builder(
+                                shrinkWrap: true,
+                                physics: const NeverScrollableScrollPhysics(),
+                                padding: EdgeInsets.zero,
+                                gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                                  crossAxisCount: 3,
+                                  childAspectRatio: 3 / 4,
+                                  crossAxisSpacing: 2,
+                                  mainAxisSpacing: 2,
+                                ),
+                                itemCount: 12, // Enough to fill the screen
+                                itemBuilder: (context, index) {
+                                  return Container(
+                                    color: theme.colorScheme.surfaceContainerHighest,
+                                  );
+                                },
+                              )
+                            : GridView.builder(
+                                shrinkWrap: true,
+                                physics: const NeverScrollableScrollPhysics(),
+                                padding: EdgeInsets.zero,
+                                gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                                  crossAxisCount: 3,
+                                  childAspectRatio: 3 / 4,
+                                  crossAxisSpacing: 2,
+                                  mainAxisSpacing: 2,
                                 ),
-                                textAlign: TextAlign.left,
-                              ),
-                              const SizedBox(height: 12),
-                              _ProfileStatsRow(
-                                followers:
-                                    (profile.followersCount is int
-                                            ? profile.followersCount
-                                            : int.tryParse(
-                                                    profile.followersCount?.toString() ?? '0',
-                                                  ) ??
-                                                  0)
-                                        .toString(),
-                                following:
-                                    (profile.followsCount is int
-                                            ? profile.followsCount
-                                            : int.tryParse(
-                                                    profile.followsCount?.toString() ?? '0',
-                                                  ) ??
-                                                  0)
-                                        .toString(),
-                                galleries:
-                                    (profile.galleryCount is int
-                                            ? profile.galleryCount
-                                            : int.tryParse(
-                                                    profile.galleryCount?.toString() ?? '0',
-                                                  ) ??
-                                                  0)
-                                        .toString(),
-                              ),
-                              if ((profile.description ?? '').isNotEmpty) ...[
-                                const SizedBox(height: 16),
-                                FacetedText(
-                                  text: profile.description,
-                                  facets: _descriptionFacets,
-                                  onMentionTap: (didOrHandle) {
-                                    Navigator.of(context).push(
-                                      MaterialPageRoute(
-                                        builder: (context) =>
-                                            ProfilePage(did: didOrHandle, showAppBar: true),
+                                itemCount: (galleries.length < 12 ? 12 : galleries.length),
+                                itemBuilder: (context, index) {
+                                  if (galleries.isNotEmpty && index < galleries.length) {
+                                    final gallery = galleries[index];
+                                    final hasPhoto =
+                                        gallery.items.isNotEmpty &&
+                                        (gallery.items[0].thumb?.isNotEmpty ?? false);
+                                    return GestureDetector(
+                                      onTap: () {
+                                        if (gallery.uri.isNotEmpty) {
+                                          Navigator.of(context).push(
+                                            MaterialPageRoute(
+                                              builder: (context) => GalleryPage(
+                                                uri: gallery.uri,
+                                                currentUserDid: apiService.currentUser?.did ?? '',
+                                              ),
+                                            ),
+                                          );
+                                        }
+                                      },
+                                      child: Container(
+                                        decoration: BoxDecoration(
+                                          color: Theme.of(
+                                            context,
+                                          ).colorScheme.surfaceContainerHighest,
+                                        ),
+                                        clipBehavior: Clip.antiAlias,
+                                        child: hasPhoto
+                                            ? AppImage(
+                                                url: gallery.items[0].thumb,
+                                                fit: BoxFit.cover,
+                                              )
+                                            : Center(
+                                                child: Text(
+                                                  gallery.title ?? '',
+                                                  style: TextStyle(
+                                                    fontSize: 12,
+                                                    color: theme.colorScheme.onSurfaceVariant,
+                                                  ),
+                                                  textAlign: TextAlign.center,
+                                                ),
+                                              ),
                                       ),
                                     );
-                                  },
-                                  onLinkTap: (url) {
-                                    // TODO: Implement WebViewPage navigation
-                                  },
-                                  onTagTap: (tag) => Navigator.push(
-                                    context,
-                                    MaterialPageRoute(builder: (_) => HashtagPage(hashtag: tag)),
+                                  }
+                                  // Placeholder for empty slots
+                                  return Container(
+                                    color: theme.colorScheme.surfaceContainerHighest,
+                                  );
+                                },
+                              ),
+                        // Favs tab
+                        if (apiService.currentUser?.did == profile.did)
+                          (_favsLoading
+                              ? const Center(
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 2,
+                                    color: AppTheme.primaryColor,
                                   ),
-                                  linkStyle: TextStyle(
-                                    color: Theme.of(context).colorScheme.primary,
-                                    fontWeight: FontWeight.w600,
+                                )
+                              : _favs.isEmpty
+                              ? GridView.builder(
+                                  shrinkWrap: true,
+                                  physics: const NeverScrollableScrollPhysics(),
+                                  padding: EdgeInsets.zero,
+                                  gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                                    crossAxisCount: 3,
+                                    childAspectRatio: 3 / 4,
+                                    crossAxisSpacing: 2,
+                                    mainAxisSpacing: 2,
                                   ),
-                                ),
-                              ],
-                              const SizedBox(height: 24),
-                            ],
-                          ),
-                        ),
-                        // TabBar with no horizontal padding
-                        Container(
-                          color: theme.scaffoldBackgroundColor,
-                          child: TabBar(
-                            dividerColor: theme.disabledColor,
-                            controller: _tabController,
-                            indicator: UnderlineTabIndicator(
-                              borderSide: const BorderSide(color: AppTheme.primaryColor, width: 3),
-                              insets: EdgeInsets.zero,
-                            ),
-                            indicatorSize: TabBarIndicatorSize.tab,
-                            labelColor: theme.colorScheme.onSurface,
-                            unselectedLabelColor: theme.colorScheme.onSurfaceVariant,
-                            labelStyle: const TextStyle(fontWeight: FontWeight.w600, fontSize: 16),
-                            tabs: [
-                              const Tab(text: 'Galleries'),
-                              if (apiService.currentUser?.did == profile.did)
-                                const Tab(text: 'Favs'),
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-                body: TabBarView(
-                  controller: _tabController,
-                  children: [
-                    // Galleries tab, edge-to-edge grid
-                    _galleriesLoading
-                        ? Center(
-                            child: CircularProgressIndicator(
-                              strokeWidth: 2,
-                              color: theme.colorScheme.primary,
-                            ),
-                          )
-                        : _galleries.isEmpty
-                        ? GridView.builder(
-                            shrinkWrap: true,
-                            physics: const NeverScrollableScrollPhysics(),
-                            padding: EdgeInsets.zero,
-                            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                              crossAxisCount: 3,
-                              childAspectRatio: 3 / 4,
-                              crossAxisSpacing: 2,
-                              mainAxisSpacing: 2,
-                            ),
-                            itemCount: 12, // Enough to fill the screen
-                            itemBuilder: (context, index) {
-                              return Container(color: theme.colorScheme.surfaceContainerHighest);
-                            },
-                          )
-                        : GridView.builder(
-                            shrinkWrap: true,
-                            physics: const NeverScrollableScrollPhysics(),
-                            padding: EdgeInsets.zero,
-                            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                              crossAxisCount: 3,
-                              childAspectRatio: 3 / 4,
-                              crossAxisSpacing: 2,
-                              mainAxisSpacing: 2,
-                            ),
-                            itemCount: (_galleries.length < 12 ? 12 : _galleries.length),
-                            itemBuilder: (context, index) {
-                              if (_galleries.isNotEmpty && index < _galleries.length) {
-                                final gallery = _galleries[index];
-                                final hasPhoto =
-                                    gallery.items.isNotEmpty &&
-                                    (gallery.items[0].thumb?.isNotEmpty ?? false);
-                                return GestureDetector(
-                                  onTap: () {
-                                    if (gallery.uri.isNotEmpty) {
-                                      Navigator.of(context).push(
-                                        MaterialPageRoute(
-                                          builder: (context) => GalleryPage(
-                                            uri: gallery.uri,
-                                            currentUserDid: apiService.currentUser?.did ?? '',
-                                          ),
-                                        ),
-                                      );
-                                    }
+                                  itemCount: 12, // Enough to fill the screen
+                                  itemBuilder: (context, index) {
+                                    return Container(
+                                      color: theme.colorScheme.surfaceContainerHighest,
+                                    );
                                   },
-                                  child: Container(
-                                    decoration: BoxDecoration(
-                                      color: Theme.of(context).colorScheme.surfaceContainerHighest,
-                                    ),
-                                    clipBehavior: Clip.antiAlias,
-                                    child: hasPhoto
-                                        ? AppImage(url: gallery.items[0].thumb, fit: BoxFit.cover)
-                                        : Center(
-                                            child: Text(
-                                              gallery.title ?? '',
-                                              style: TextStyle(
-                                                fontSize: 12,
-                                                color: theme.colorScheme.onSurfaceVariant,
+                                )
+                              : GridView.builder(
+                                  shrinkWrap: true,
+                                  physics: const NeverScrollableScrollPhysics(),
+                                  padding: EdgeInsets.zero,
+                                  gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                                    crossAxisCount: 3,
+                                    childAspectRatio: 3 / 4,
+                                    crossAxisSpacing: 2,
+                                    mainAxisSpacing: 2,
+                                  ),
+                                  itemCount: _favs.length,
+                                  itemBuilder: (context, index) {
+                                    final gallery = _favs[index];
+                                    final hasPhoto =
+                                        gallery.items.isNotEmpty &&
+                                        (gallery.items[0].thumb?.isNotEmpty ?? false);
+                                    return GestureDetector(
+                                      onTap: () {
+                                        if (gallery.uri.isNotEmpty) {
+                                          Navigator.of(context).push(
+                                            MaterialPageRoute(
+                                              builder: (context) => GalleryPage(
+                                                uri: gallery.uri,
+                                                currentUserDid: apiService.currentUser?.did ?? '',
                                               ),
-                                              textAlign: TextAlign.center,
                                             ),
-                                          ),
-                                  ),
-                                );
-                              }
-                              // Placeholder for empty slots
-                              return Container(color: theme.colorScheme.surfaceContainerHighest);
-                            },
-                          ),
-                    // Favs tab
-                    if (apiService.currentUser?.did == profile.did)
-                      (_favsLoading
-                          ? const Center(
-                              child: CircularProgressIndicator(
-                                strokeWidth: 2,
-                                color: AppTheme.primaryColor,
-                              ),
-                            )
-                          : _favs.isEmpty
-                          ? GridView.builder(
-                              shrinkWrap: true,
-                              physics: const NeverScrollableScrollPhysics(),
-                              padding: EdgeInsets.zero,
-                              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                                crossAxisCount: 3,
-                                childAspectRatio: 3 / 4,
-                                crossAxisSpacing: 2,
-                                mainAxisSpacing: 2,
-                              ),
-                              itemCount: 12, // Enough to fill the screen
-                              itemBuilder: (context, index) {
-                                return Container(color: theme.colorScheme.surfaceContainerHighest);
-                              },
-                            )
-                          : GridView.builder(
-                              shrinkWrap: true,
-                              physics: const NeverScrollableScrollPhysics(),
-                              padding: EdgeInsets.zero,
-                              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                                crossAxisCount: 3,
-                                childAspectRatio: 3 / 4,
-                                crossAxisSpacing: 2,
-                                mainAxisSpacing: 2,
-                              ),
-                              itemCount: _favs.length,
-                              itemBuilder: (context, index) {
-                                final gallery = _favs[index];
-                                final hasPhoto =
-                                    gallery.items.isNotEmpty &&
-                                    (gallery.items[0].thumb?.isNotEmpty ?? false);
-                                return GestureDetector(
-                                  onTap: () {
-                                    if (gallery.uri.isNotEmpty) {
-                                      Navigator.of(context).push(
-                                        MaterialPageRoute(
-                                          builder: (context) => GalleryPage(
-                                            uri: gallery.uri,
-                                            currentUserDid: apiService.currentUser?.did ?? '',
-                                          ),
+                                          );
+                                        }
+                                      },
+                                      child: Container(
+                                        decoration: BoxDecoration(
+                                          color: theme.colorScheme.surfaceContainerHighest,
                                         ),
-                                      );
-                                    }
-                                  },
-                                  child: Container(
-                                    decoration: BoxDecoration(
-                                      color: theme.colorScheme.surfaceContainerHighest,
-                                    ),
-                                    clipBehavior: Clip.antiAlias,
-                                    child: hasPhoto
-                                        ? AppImage(url: gallery.items[0].thumb, fit: BoxFit.cover)
-                                        : Center(
-                                            child: Text(
-                                              gallery.title ?? '',
-                                              style: TextStyle(
-                                                fontSize: 12,
-                                                color: theme.colorScheme.onSurfaceVariant,
+                                        clipBehavior: Clip.antiAlias,
+                                        child: hasPhoto
+                                            ? AppImage(
+                                                url: gallery.items[0].thumb,
+                                                fit: BoxFit.cover,
+                                              )
+                                            : Center(
+                                                child: Text(
+                                                  gallery.title ?? '',
+                                                  style: TextStyle(
+                                                    fontSize: 12,
+                                                    color: theme.colorScheme.onSurfaceVariant,
+                                                  ),
+                                                  textAlign: TextAlign.center,
+                                                ),
                                               ),
-                                              textAlign: TextAlign.center,
-                                            ),
-                                          ),
-                                  ),
-                                );
-                              },
-                            )),
-                  ],
+                                      ),
+                                    );
+                                  },
+                                )),
+                      ],
+                    ),
+                  ),
                 ),
-              ),
+              ],
             ),
-          ],
-        ),
-      ),
+          ),
+        );
+      },
     );
   }
 }

lib/widgets/bottom_nav_bar.dart

···
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:grain/api.dart';
 import 'package:grain/app_theme.dart';
+import 'package:grain/models/profile_with_galleries.dart';
+import 'package:grain/providers/profile_provider.dart';
 import 'package:grain/widgets/app_image.dart';
 
-class BottomNavBar extends StatelessWidget {
+class BottomNavBar extends ConsumerWidget {
   final int navIndex;
   final VoidCallback onHome;
   final VoidCallback onExplore;
   final VoidCallback onNotifications;
   final VoidCallback onProfile;
-  final String? avatarUrl;
 
   const BottomNavBar({
     super.key,
···
     required this.onExplore,
     required this.onNotifications,
     required this.onProfile,
-    this.avatarUrl,
   });
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final did = apiService.currentUser?.did;
+    final asyncProfile = did != null
+        ? ref.watch(profileNotifierProvider(did))
+        : const AsyncValue<ProfileWithGalleries?>.loading();
+
+    final avatarUrl = asyncProfile.maybeWhen(
+      data: (profileWithGalleries) => profileWithGalleries?.profile.avatar,
+      orElse: () => null,
+    );
+
     return Container(
       decoration: BoxDecoration(
         color: Theme.of(context).scaffoldBackgroundColor,
···
                 child: Transform.translate(
                   offset: const Offset(0, -10),
                   child: Center(
-                    child: avatarUrl != null && avatarUrl!.isNotEmpty
+                    child: avatarUrl != null && avatarUrl.isNotEmpty
                         ? Container(
                             width: 28,
                             height: 28,
···
                                 : null,
                             child: ClipOval(
                               child: AppImage(
-                                url: avatarUrl!,
+                                url: avatarUrl,
                                 width: 24,
                                 height: 24,
                                 fit: BoxFit.cover,

lib/widgets/edit_profile_sheet.dart

···
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:grain/widgets/app_button.dart';
+import 'package:grain/widgets/plain_text_field.dart';
+import 'package:image_picker/image_picker.dart';
+
+class EditProfileSheet extends StatefulWidget {
+  final String? initialDisplayName;
+  final String? initialDescription;
+  final String? initialAvatarUrl;
+  final Future<void> Function(String displayName, String description, XFile? avatar)? onSave;
+  final VoidCallback? onCancel;
+
+  const EditProfileSheet({
+    super.key,
+    this.initialDisplayName,
+    this.initialDescription,
+    this.initialAvatarUrl,
+    this.onSave,
+    this.onCancel,
+  });
+
+  @override
+  State<EditProfileSheet> createState() => _EditProfileSheetState();
+}
+
+class _EditProfileSheetState extends State<EditProfileSheet> {
+  late TextEditingController _displayNameController;
+  late TextEditingController _descriptionController;
+  XFile? _selectedAvatar;
+  bool _saving = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _displayNameController = TextEditingController(text: widget.initialDisplayName ?? '');
+    _descriptionController = TextEditingController(text: widget.initialDescription ?? '');
+  }
+
+  @override
+  void dispose() {
+    _displayNameController.dispose();
+    _descriptionController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _pickAvatar() async {
+    final picker = ImagePicker();
+    final picked = await picker.pickImage(source: ImageSource.gallery, imageQuality: 85);
+    if (picked != null) {
+      setState(() {
+        _selectedAvatar = picked;
+      });
+    }
+  }
+
+  void _onSave() async {
+    if (_saving) return;
+    setState(() => _saving = true);
+    if (widget.onSave != null) {
+      await widget.onSave!(
+        _displayNameController.text.trim(),
+        _descriptionController.text.trim(),
+        _selectedAvatar,
+      );
+    }
+    if (mounted) setState(() => _saving = false);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final avatarRadius = 44.0;
+    final double maxHeight =
+        MediaQuery.of(context).size.height - kToolbarHeight - MediaQuery.of(context).padding.top;
+
+    return ConstrainedBox(
+      constraints: BoxConstraints(maxHeight: maxHeight),
+      child: ClipRRect(
+        borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
+        child: Container(
+          color: theme.colorScheme.surface,
+          child: LayoutBuilder(
+            builder: (context, constraints) {
+              return Padding(
+                padding: EdgeInsets.fromLTRB(16, 16, 16, MediaQuery.of(context).viewInsets.bottom),
+                child: Column(
+                  mainAxisSize: MainAxisSize.max,
+                  children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        AppButton(
+                          label: 'Cancel',
+                          size: AppButtonSize.small,
+                          variant: AppButtonVariant.secondary,
+                          onPressed: widget.onCancel ?? () => Navigator.of(context).maybePop(),
+                        ),
+                        Text(
+                          'Edit profile',
+                          style: theme.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
+                        ),
+                        AppButton(
+                          label: 'Save',
+                          size: AppButtonSize.small,
+                          variant: AppButtonVariant.primary,
+                          loading: _saving,
+                          onPressed: _saving ? null : _onSave,
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    GestureDetector(
+                      onTap: _pickAvatar,
+                      child: Stack(
+                        alignment: Alignment.center,
+                        children: [
+                          CircleAvatar(
+                            radius: avatarRadius,
+                            backgroundColor: theme.colorScheme.surfaceVariant,
+                            backgroundImage: _selectedAvatar != null
+                                ? FileImage(File(_selectedAvatar!.path))
+                                : (widget.initialAvatarUrl != null &&
+                                      widget.initialAvatarUrl!.isNotEmpty)
+                                ? NetworkImage(widget.initialAvatarUrl!)
+                                : null as ImageProvider<Object>?,
+                            child:
+                                (_selectedAvatar == null &&
+                                    (widget.initialAvatarUrl == null ||
+                                        widget.initialAvatarUrl!.isEmpty))
+                                ? Icon(
+                                    Icons.account_circle,
+                                    size: avatarRadius * 2,
+                                    color: theme.colorScheme.onSurfaceVariant,
+                                  )
+                                : null,
+                          ),
+                          Positioned(
+                            bottom: 0,
+                            right: 0,
+                            child: Container(
+                              decoration: BoxDecoration(
+                                color: theme.colorScheme.primary,
+                                shape: BoxShape.circle,
+                              ),
+                              padding: const EdgeInsets.all(6),
+                              child: Icon(Icons.edit, color: Colors.white, size: 18),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    const SizedBox(height: 16),
+                    Expanded(
+                      child: SingleChildScrollView(
+                        padding: EdgeInsets.zero,
+                        child: Column(
+                          children: [
+                            PlainTextField(
+                              label: 'Display Name',
+                              controller: _displayNameController,
+                              maxLines: 1,
+                            ),
+                            const SizedBox(height: 12),
+                            PlainTextField(
+                              label: 'Description',
+                              controller: _descriptionController,
+                              maxLines: 3,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                    const SizedBox(height: 24),
+                  ],
+                ),
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}