diff --git a/lib/model/federation_data.dart b/lib/model/federation_data.dart
index 37ea376aa..ffb2782c4 100644
--- a/lib/model/federation_data.dart
+++ b/lib/model/federation_data.dart
@@ -98,7 +98,7 @@ class FederationState extends _$FederationState {
       isSupportedEmoji: false,
       isSupportedAnnouncement: false,
       isSupportedLocalTimeline: false,
-      name: federation.name,
+      name: federation.name ?? "",
       usersCount: federation.usersCount,
       notesCount: federation.notesCount,
       softwareName: federation.softwareName ?? "",
@@ -156,7 +156,7 @@ class FederationState extends _$FederationState {
       privacyPolicyUrl: misskeyMeta?.privacyPolicyUrl?.toString(),
       impressumUrl: misskeyMeta?.impressumUrl?.toString(),
       repositoryUrl: misskeyMeta?.repositoryUrl?.toString(),
-      name: misskeyMeta?.name ?? federation.name,
+      name: misskeyMeta?.name ?? federation.name ?? "",
       description: misskeyMeta?.description ?? federation.description ?? "",
       maintainerName: misskeyMeta?.maintainerName,
       maintainerEmail: misskeyMeta?.maintainerEmail,
diff --git a/lib/model/federation_data.g.dart b/lib/model/federation_data.g.dart
index 3db303d05..624ccb793 100644
--- a/lib/model/federation_data.g.dart
+++ b/lib/model/federation_data.g.dart
@@ -6,7 +6,7 @@ part of 'federation_data.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$federationStateHash() => r'87a02d857e7326204a58ef410ad0bc068d959af7';
+String _$federationStateHash() => r'5847f3fd4a4ab06e720277f05fc29840bf9b93f8';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/lib/router/app_router.gr.dart b/lib/router/app_router.gr.dart
index bda93569c..e83cbcb9e 100644
--- a/lib/router/app_router.gr.dart
+++ b/lib/router/app_router.gr.dart
@@ -107,12 +107,13 @@ abstract class _$AppRouter extends RootStackRouter {
       final args = routeData.argsAs<AntennaSettingsRouteArgs>();
       return AutoRoutePage<AntennaSettings>(
         routeData: routeData,
-        child: AntennaSettingsDialog(
+        child: WrappedRoute(
+            child: AntennaSettingsDialog(
           account: args.account,
           key: args.key,
           title: args.title,
           initialSettings: args.initialSettings,
-        ),
+        )),
       );
     },
     AppInfoRoute.name: (routeData) {
diff --git a/lib/state_notifier/common/download_file_notifier.g.dart b/lib/state_notifier/common/download_file_notifier.g.dart
index 09b95ecfb..d7688f927 100644
--- a/lib/state_notifier/common/download_file_notifier.g.dart
+++ b/lib/state_notifier/common/download_file_notifier.g.dart
@@ -7,7 +7,7 @@ part of 'download_file_notifier.dart';
 // **************************************************************************
 
 String _$downloadFileNotifierHash() =>
-    r'1e16b1a213ec582509b1843d15b1987e27020a26';
+    r'99b394364feb8276a67c277ad703172e94fffc1b';
 
 /// See also [DownloadFileNotifier].
 @ProviderFor(DownloadFileNotifier)
diff --git a/lib/state_notifier/note_create_page/note_create_state_notifier.g.dart b/lib/state_notifier/note_create_page/note_create_state_notifier.g.dart
index a4167f385..0407a77e8 100644
--- a/lib/state_notifier/note_create_page/note_create_state_notifier.g.dart
+++ b/lib/state_notifier/note_create_page/note_create_state_notifier.g.dart
@@ -7,7 +7,7 @@ part of 'note_create_state_notifier.dart';
 // **************************************************************************
 
 String _$noteCreateNotifierHash() =>
-    r'a6c19cac73b572cf30473220f793e1826dbeb286';
+    r'ede14304154ce4e5a7fd678f1471389c226ffb67';
 
 /// See also [NoteCreateNotifier].
 @ProviderFor(NoteCreateNotifier)
diff --git a/lib/view/common/misskey_notes/renote_modal_sheet.g.dart b/lib/view/common/misskey_notes/renote_modal_sheet.g.dart
index ba6e0aa48..cd59088f8 100644
--- a/lib/view/common/misskey_notes/renote_modal_sheet.g.dart
+++ b/lib/view/common/misskey_notes/renote_modal_sheet.g.dart
@@ -431,7 +431,7 @@ class _RenoteChannelNotifierProviderElement
 }
 
 String _$renoteOtherAccountNotifierHash() =>
-    r'6ce80b97d6f49aa3302dfd27b2b1b8242dc559cb';
+    r'e3176e375b9657de2d8e05483e5f6d7add7a1ef2';
 
 abstract class _$RenoteOtherAccountNotifier
     extends BuildlessAutoDisposeNotifier<AsyncValue<(Account, Note)>?> {
diff --git a/lib/view/note_modal_sheet/note_modal_sheet.g.dart b/lib/view/note_modal_sheet/note_modal_sheet.g.dart
index 39a63ab2b..653d1e5fc 100644
--- a/lib/view/note_modal_sheet/note_modal_sheet.g.dart
+++ b/lib/view/note_modal_sheet/note_modal_sheet.g.dart
@@ -7,7 +7,7 @@ part of 'note_modal_sheet.dart';
 // **************************************************************************
 
 String _$noteModalSheetNotifierHash() =>
-    r'6e16e66d1e8ce6671ac6ba8bd9bb208c9b7b6652';
+    r'7d2d5ee4f994089c0ae3b3b1fcbbec8ad53c8db9';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/lib/view/user_page/user_info_notifier.g.dart b/lib/view/user_page/user_info_notifier.g.dart
index 796682d30..1832bd342 100644
--- a/lib/view/user_page/user_info_notifier.g.dart
+++ b/lib/view/user_page/user_info_notifier.g.dart
@@ -384,7 +384,7 @@ class _UserInfoProxyProviderElement
   String get userId => (origin as UserInfoProxyProvider).userId;
 }
 
-String _$userInfoNotifierHash() => r'cd97bc5433d147b8881446c0431fa623f0d2319e';
+String _$userInfoNotifierHash() => r'b4b78145b2cb531abe6da2fb840c4b01bb12f4dd';
 
 abstract class _$UserInfoNotifier
     extends BuildlessAutoDisposeAsyncNotifier<UserInfo> {