diff --git a/lib/account_manager/repository/account_repository/account_repository.dart b/lib/account_manager/repository/account_repository/account_repository.dart
index 1042523..0ce8ce7 100644
--- a/lib/account_manager/repository/account_repository/account_repository.dart
+++ b/lib/account_manager/repository/account_repository/account_repository.dart
@@ -53,9 +53,9 @@ class AccountRepository {
   static AccountRepository instance = AccountRepository._();
 
   Future<void> init() async {
-    await _localAccounts.load();
-    await _userLogins.load();
-    await _activeLocalAccount.load();
+    await _localAccounts.get();
+    await _userLogins.get();
+    await _activeLocalAccount.get();
     await _openLoggedInDHTRecords();
   }
 
diff --git a/lib/contact_invitation/views/contact_invitation_display.dart b/lib/contact_invitation/views/contact_invitation_display.dart
index f54994e..4e75f57 100644
--- a/lib/contact_invitation/views/contact_invitation_display.dart
+++ b/lib/contact_invitation/views/contact_invitation_display.dart
@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:math';
 
 import 'package:awesome_extensions/awesome_extensions.dart';
@@ -20,12 +19,10 @@ class InvitationGeneratorCubit extends FutureCubit<Uint8List> {
 class ContactInvitationDisplayDialog extends StatefulWidget {
   const ContactInvitationDisplayDialog({
     required this.message,
-    required this.generator,
     super.key,
   });
 
   final String message;
-  final FutureOr<Uint8List> generator;
 
   @override
   ContactInvitationDisplayDialogState createState() =>
@@ -34,9 +31,7 @@ class ContactInvitationDisplayDialog extends StatefulWidget {
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties
-      ..add(StringProperty('message', message))
-      ..add(DiagnosticsProperty<FutureOr<Uint8List>?>('generator', generator));
+    properties.add(StringProperty('message', message));
   }
 }
 
diff --git a/lib/contact_invitation/views/contact_invitation_item_widget.dart b/lib/contact_invitation/views/contact_invitation_item_widget.dart
index cb54d28..9881a93 100644
--- a/lib/contact_invitation/views/contact_invitation_item_widget.dart
+++ b/lib/contact_invitation/views/contact_invitation_item_widget.dart
@@ -102,8 +102,6 @@ class ContactInvitationItemWidget extends StatelessWidget {
                                   contactInvitationRecord.invitation))),
                           child: ContactInvitationDisplayDialog(
                             message: contactInvitationRecord.message,
-                            generator: Uint8List.fromList(
-                                contactInvitationRecord.invitation),
                           )));
                 },
                 title: Text(
diff --git a/lib/contact_invitation/views/invite_dialog.dart b/lib/contact_invitation/views/invite_dialog.dart
index f4fe055..6e4580b 100644
--- a/lib/contact_invitation/views/invite_dialog.dart
+++ b/lib/contact_invitation/views/invite_dialog.dart
@@ -13,7 +13,8 @@ import '../contact_invitation.dart';
 
 class InviteDialog extends StatefulWidget {
   const InviteDialog(
-      {required this.onValidationCancelled,
+      {required this.modalContext,
+      required this.onValidationCancelled,
       required this.onValidationSuccess,
       required this.onValidationFailed,
       required this.inviteControlIsValid,
@@ -29,6 +30,7 @@ class InviteDialog extends StatefulWidget {
       InviteDialogState dialogState,
       Future<void> Function({required Uint8List inviteData})
           validateInviteData) buildInviteControl;
+  final BuildContext modalContext;
 
   @override
   InviteDialogState createState() => InviteDialogState();
@@ -50,7 +52,8 @@ class InviteDialog extends StatefulWidget {
                   InviteDialogState dialogState,
                   Future<void> Function({required Uint8List inviteData})
                       validateInviteData)>.has(
-          'buildInviteControl', buildInviteControl));
+          'buildInviteControl', buildInviteControl))
+      ..add(DiagnosticsProperty<BuildContext>('modalContext', modalContext));
   }
 }
 
@@ -69,8 +72,8 @@ class InviteDialogState extends State<InviteDialog> {
 
   Future<void> _onAccept() async {
     final navigator = Navigator.of(context);
-    final activeAccountInfo = context.read<ActiveAccountInfo>();
-    final contactList = context.read<ContactListCubit>();
+    final activeAccountInfo = widget.modalContext.read<ActiveAccountInfo>();
+    final contactList = widget.modalContext.read<ContactListCubit>();
 
     setState(() {
       _isAccepting = true;
@@ -133,7 +136,7 @@ class InviteDialogState extends State<InviteDialog> {
   }) async {
     try {
       final contactInvitationListCubit =
-          context.read<ContactInvitationListCubit>();
+          widget.modalContext.read<ContactInvitationListCubit>();
 
       setState(() {
         _isValidating = true;
diff --git a/lib/contact_invitation/views/new_contact_invitation_bottom_sheet.dart b/lib/contact_invitation/views/new_contact_invitation_bottom_sheet.dart
index 9430146..b0ba5c3 100644
--- a/lib/contact_invitation/views/new_contact_invitation_bottom_sheet.dart
+++ b/lib/contact_invitation/views/new_contact_invitation_bottom_sheet.dart
@@ -8,8 +8,9 @@ import 'paste_invite_dialog.dart';
 import 'scan_invite_dialog.dart';
 import 'send_invite_dialog.dart';
 
-Widget newContactInvitationBottomSheetBuilder(BuildContext context) {
-  final theme = Theme.of(context);
+Widget newContactInvitationBottomSheetBuilder(
+    BuildContext sheetContext, BuildContext context) {
+  final theme = Theme.of(sheetContext);
   final textTheme = theme.textTheme;
   final scale = theme.extension<ScaleScheme>()!;
 
@@ -17,7 +18,7 @@ Widget newContactInvitationBottomSheetBuilder(BuildContext context) {
       focusNode: FocusNode(),
       onKeyEvent: (ke) {
         if (ke.logicalKey == LogicalKeyboardKey.escape) {
-          Navigator.pop(context);
+          Navigator.pop(sheetContext);
         }
       },
       child: SizedBox(
@@ -30,7 +31,7 @@ Widget newContactInvitationBottomSheetBuilder(BuildContext context) {
               Column(children: [
                 IconButton(
                     onPressed: () async {
-                      Navigator.pop(context);
+                      Navigator.pop(sheetContext);
                       await SendInviteDialog.show(context);
                     },
                     iconSize: 64,
@@ -41,7 +42,7 @@ Widget newContactInvitationBottomSheetBuilder(BuildContext context) {
               Column(children: [
                 IconButton(
                     onPressed: () async {
-                      Navigator.pop(context);
+                      Navigator.pop(sheetContext);
                       await ScanInviteDialog.show(context);
                     },
                     iconSize: 64,
@@ -52,7 +53,7 @@ Widget newContactInvitationBottomSheetBuilder(BuildContext context) {
               Column(children: [
                 IconButton(
                     onPressed: () async {
-                      Navigator.pop(context);
+                      Navigator.pop(sheetContext);
                       await PasteInviteDialog.show(context);
                     },
                     iconSize: 64,
diff --git a/lib/contact_invitation/views/paste_invite_dialog.dart b/lib/contact_invitation/views/paste_invite_dialog.dart
index 545a48a..bfd3fcd 100644
--- a/lib/contact_invitation/views/paste_invite_dialog.dart
+++ b/lib/contact_invitation/views/paste_invite_dialog.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:awesome_extensions/awesome_extensions.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_translate/flutter_translate.dart';
 import 'package:veilid_support/veilid_support.dart';
@@ -11,7 +12,7 @@ import '../../tools/tools.dart';
 import 'invite_dialog.dart';
 
 class PasteInviteDialog extends StatefulWidget {
-  const PasteInviteDialog({super.key});
+  const PasteInviteDialog({required this.modalContext, super.key});
 
   @override
   PasteInviteDialogState createState() => PasteInviteDialogState();
@@ -20,7 +21,16 @@ class PasteInviteDialog extends StatefulWidget {
     await showStyledDialog<void>(
         context: context,
         title: translate('paste_invite_dialog.title'),
-        child: const PasteInviteDialog());
+        child: PasteInviteDialog(modalContext: context));
+  }
+
+  final BuildContext modalContext;
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties
+        .add(DiagnosticsProperty<BuildContext>('modalContext', modalContext));
   }
 }
 
@@ -122,6 +132,7 @@ class PasteInviteDialogState extends State<PasteInviteDialog> {
   // ignore: prefer_expression_function_bodies
   Widget build(BuildContext context) {
     return InviteDialog(
+        modalContext: widget.modalContext,
         onValidationCancelled: onValidationCancelled,
         onValidationSuccess: onValidationSuccess,
         onValidationFailed: onValidationFailed,
diff --git a/lib/contact_invitation/views/scan_invite_dialog.dart b/lib/contact_invitation/views/scan_invite_dialog.dart
index 67c0999..70f5b3b 100644
--- a/lib/contact_invitation/views/scan_invite_dialog.dart
+++ b/lib/contact_invitation/views/scan_invite_dialog.dart
@@ -104,7 +104,7 @@ class ScannerOverlay extends CustomPainter {
 }
 
 class ScanInviteDialog extends StatefulWidget {
-  const ScanInviteDialog({super.key});
+  const ScanInviteDialog({required this.modalContext, super.key});
 
   @override
   ScanInviteDialogState createState() => ScanInviteDialogState();
@@ -113,7 +113,16 @@ class ScanInviteDialog extends StatefulWidget {
     await showStyledDialog<void>(
         context: context,
         title: translate('scan_invite_dialog.title'),
-        child: const ScanInviteDialog());
+        child: ScanInviteDialog(modalContext: context));
+  }
+
+  final BuildContext modalContext;
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties
+        .add(DiagnosticsProperty<BuildContext>('modalContext', modalContext));
   }
 }
 
@@ -380,6 +389,7 @@ class ScanInviteDialogState extends State<ScanInviteDialog> {
   // ignore: prefer_expression_function_bodies
   Widget build(BuildContext context) {
     return InviteDialog(
+        modalContext: widget.modalContext,
         onValidationCancelled: onValidationCancelled,
         onValidationSuccess: onValidationSuccess,
         onValidationFailed: onValidationFailed,
diff --git a/lib/contact_invitation/views/send_invite_dialog.dart b/lib/contact_invitation/views/send_invite_dialog.dart
index 399ffe8..8113078 100644
--- a/lib/contact_invitation/views/send_invite_dialog.dart
+++ b/lib/contact_invitation/views/send_invite_dialog.dart
@@ -14,7 +14,7 @@ import '../../tools/tools.dart';
 import '../contact_invitation.dart';
 
 class SendInviteDialog extends StatefulWidget {
-  const SendInviteDialog({super.key});
+  const SendInviteDialog({required this.modalContext, super.key});
 
   @override
   SendInviteDialogState createState() => SendInviteDialogState();
@@ -23,7 +23,16 @@ class SendInviteDialog extends StatefulWidget {
     await showStyledDialog<void>(
         context: context,
         title: translate('send_invite_dialog.title'),
-        child: const SendInviteDialog());
+        child: SendInviteDialog(modalContext: context));
+  }
+
+  final BuildContext modalContext;
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties
+        .add(DiagnosticsProperty<BuildContext>('modalContext', modalContext));
   }
 }
 
@@ -132,7 +141,7 @@ class SendInviteDialogState extends State<SendInviteDialog> {
 
     // Start generation
     final contactInvitationListCubit =
-        context.read<ContactInvitationListCubit>();
+        widget.modalContext.read<ContactInvitationListCubit>();
 
     final generator = contactInvitationListCubit.createInvitation(
         encryptionKeyType: _encryptionKeyType,
@@ -145,10 +154,11 @@ class SendInviteDialogState extends State<SendInviteDialog> {
     }
     await showDialog<void>(
         context: context,
-        builder: (context) => ContactInvitationDisplayDialog(
+        builder: (context) => BlocProvider(
+            create: (context) => InvitationGeneratorCubit(generator),
+            child: ContactInvitationDisplayDialog(
               message: _messageTextController.text,
-              generator: generator,
-            ));
+            )));
     // if (ret == null) {
     //   return;
     // }
diff --git a/lib/layout/home/home_account_ready/main_pager/main_pager.dart b/lib/layout/home/home_account_ready/main_pager/main_pager.dart
index 2cbee9c..54f794c 100644
--- a/lib/layout/home/home_account_ready/main_pager/main_pager.dart
+++ b/lib/layout/home/home_account_ready/main_pager/main_pager.dart
@@ -110,37 +110,38 @@ class MainPagerState extends State<MainPager> with TickerProviderStateMixin {
         context: context,
         // ignore: prefer_expression_function_bodies
         builder: (context) {
-          return const AlertDialog(
-              shape: RoundedRectangleBorder(
+          return AlertDialog(
+              shape: const RoundedRectangleBorder(
                 borderRadius: BorderRadius.all(Radius.circular(20)),
               ),
-              contentPadding: EdgeInsets.only(
+              contentPadding: const EdgeInsets.only(
                 top: 10,
               ),
-              title: Text(
+              title: const Text(
                 'Scan Contact Invite',
                 style: TextStyle(fontSize: 24),
               ),
-              content: ScanInviteDialog());
+              content: ScanInviteDialog(
+                modalContext: context,
+              ));
         });
   }
 
-  // ignore: prefer_expression_function_bodies
-  Widget _onNewChatBottomSheetBuilder(BuildContext context) {
-    return const SizedBox(
-        height: 200,
-        child: Center(
-            child: Text(
-                'Group and custom chat functionality is not available yet')));
-  }
+  Widget _onNewChatBottomSheetBuilder(
+          BuildContext sheetContext, BuildContext context) =>
+      const SizedBox(
+          height: 200,
+          child: Center(
+              child: Text(
+                  'Group and custom chat functionality is not available yet')));
 
-  Widget _bottomSheetBuilder(BuildContext context) {
+  Widget _bottomSheetBuilder(BuildContext sheetContext, BuildContext context) {
     if (_currentPage == 0) {
       // New contact invitation
-      return newContactInvitationBottomSheetBuilder(context);
+      return newContactInvitationBottomSheetBuilder(sheetContext, context);
     } else if (_currentPage == 1) {
       // New chat
-      return _onNewChatBottomSheetBuilder(context);
+      return _onNewChatBottomSheetBuilder(sheetContext, context);
     } else {
       // Unknown error
       return debugPage('unknown page');
@@ -214,7 +215,8 @@ class MainPagerState extends State<MainPager> with TickerProviderStateMixin {
                 _fabIconList[_currentPage],
                 color: scale.secondaryScale.text,
               ),
-          bottomSheetBuilder: _bottomSheetBuilder),
+          bottomSheetBuilder: (sheetContext) =>
+              _bottomSheetBuilder(sheetContext, context)),
       floatingActionButtonLocation: FloatingActionButtonLocation.endDocked,
     );
   }
diff --git a/lib/proto/veilidchat.pb.dart b/lib/proto/veilidchat.pb.dart
index af40e07..a0db194 100644
--- a/lib/proto/veilidchat.pb.dart
+++ b/lib/proto/veilidchat.pb.dart
@@ -23,38 +23,28 @@ export 'veilidchat.pbenum.dart';
 class Attachment extends $pb.GeneratedMessage {
   factory Attachment() => create();
   Attachment._() : super();
-  factory Attachment.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory Attachment.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory Attachment.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Attachment.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'Attachment',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..e<AttachmentKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE,
-        defaultOrMaker: AttachmentKind.ATTACHMENT_KIND_UNSPECIFIED,
-        valueOf: AttachmentKind.valueOf,
-        enumValues: AttachmentKind.values)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Attachment', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..e<AttachmentKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE, defaultOrMaker: AttachmentKind.ATTACHMENT_KIND_UNSPECIFIED, valueOf: AttachmentKind.valueOf, enumValues: AttachmentKind.values)
     ..aOS(2, _omitFieldNames ? '' : 'mime')
     ..aOS(3, _omitFieldNames ? '' : 'name')
-    ..aOM<$0.DataReference>(4, _omitFieldNames ? '' : 'content',
-        subBuilder: $0.DataReference.create)
-    ..aOM<$1.Signature>(5, _omitFieldNames ? '' : 'signature',
-        subBuilder: $1.Signature.create)
-    ..hasRequiredFields = false;
+    ..aOM<$0.DataReference>(4, _omitFieldNames ? '' : 'content', subBuilder: $0.DataReference.create)
+    ..aOM<$1.Signature>(5, _omitFieldNames ? '' : 'signature', subBuilder: $1.Signature.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   Attachment clone() => Attachment()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  Attachment copyWith(void Function(Attachment) updates) =>
-      super.copyWith((message) => updates(message as Attachment)) as Attachment;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  Attachment copyWith(void Function(Attachment) updates) => super.copyWith((message) => updates(message as Attachment)) as Attachment;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -63,17 +53,13 @@ class Attachment extends $pb.GeneratedMessage {
   Attachment createEmptyInstance() => create();
   static $pb.PbList<Attachment> createRepeated() => $pb.PbList<Attachment>();
   @$core.pragma('dart2js:noInline')
-  static Attachment getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<Attachment>(create);
+  static Attachment getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Attachment>(create);
   static Attachment? _defaultInstance;
 
   @$pb.TagNumber(1)
   AttachmentKind get kind => $_getN(0);
   @$pb.TagNumber(1)
-  set kind(AttachmentKind v) {
-    setField(1, v);
-  }
-
+  set kind(AttachmentKind v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasKind() => $_has(0);
   @$pb.TagNumber(1)
@@ -82,10 +68,7 @@ class Attachment extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.String get mime => $_getSZ(1);
   @$pb.TagNumber(2)
-  set mime($core.String v) {
-    $_setString(1, v);
-  }
-
+  set mime($core.String v) { $_setString(1, v); }
   @$pb.TagNumber(2)
   $core.bool hasMime() => $_has(1);
   @$pb.TagNumber(2)
@@ -94,10 +77,7 @@ class Attachment extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.String get name => $_getSZ(2);
   @$pb.TagNumber(3)
-  set name($core.String v) {
-    $_setString(2, v);
-  }
-
+  set name($core.String v) { $_setString(2, v); }
   @$pb.TagNumber(3)
   $core.bool hasName() => $_has(2);
   @$pb.TagNumber(3)
@@ -106,10 +86,7 @@ class Attachment extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $0.DataReference get content => $_getN(3);
   @$pb.TagNumber(4)
-  set content($0.DataReference v) {
-    setField(4, v);
-  }
-
+  set content($0.DataReference v) { setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasContent() => $_has(3);
   @$pb.TagNumber(4)
@@ -120,10 +97,7 @@ class Attachment extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $1.Signature get signature => $_getN(4);
   @$pb.TagNumber(5)
-  set signature($1.Signature v) {
-    setField(5, v);
-  }
-
+  set signature($1.Signature v) { setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasSignature() => $_has(4);
   @$pb.TagNumber(5)
@@ -135,39 +109,28 @@ class Attachment extends $pb.GeneratedMessage {
 class Message extends $pb.GeneratedMessage {
   factory Message() => create();
   Message._() : super();
-  factory Message.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory Message.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'Message',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..aOM<$1.TypedKey>(1, _omitFieldNames ? '' : 'author',
-        subBuilder: $1.TypedKey.create)
-    ..a<$fixnum.Int64>(
-        2, _omitFieldNames ? '' : 'timestamp', $pb.PbFieldType.OU6,
-        defaultOrMaker: $fixnum.Int64.ZERO)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..aOM<$1.TypedKey>(1, _omitFieldNames ? '' : 'author', subBuilder: $1.TypedKey.create)
+    ..a<$fixnum.Int64>(2, _omitFieldNames ? '' : 'timestamp', $pb.PbFieldType.OU6, defaultOrMaker: $fixnum.Int64.ZERO)
     ..aOS(3, _omitFieldNames ? '' : 'text')
-    ..aOM<$1.Signature>(4, _omitFieldNames ? '' : 'signature',
-        subBuilder: $1.Signature.create)
-    ..pc<Attachment>(
-        5, _omitFieldNames ? '' : 'attachments', $pb.PbFieldType.PM,
-        subBuilder: Attachment.create)
-    ..hasRequiredFields = false;
+    ..aOM<$1.Signature>(4, _omitFieldNames ? '' : 'signature', subBuilder: $1.Signature.create)
+    ..pc<Attachment>(5, _omitFieldNames ? '' : 'attachments', $pb.PbFieldType.PM, subBuilder: Attachment.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   Message clone() => Message()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  Message copyWith(void Function(Message) updates) =>
-      super.copyWith((message) => updates(message as Message)) as Message;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -176,17 +139,13 @@ class Message extends $pb.GeneratedMessage {
   Message createEmptyInstance() => create();
   static $pb.PbList<Message> createRepeated() => $pb.PbList<Message>();
   @$core.pragma('dart2js:noInline')
-  static Message getDefault() =>
-      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Message>(create);
+  static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Message>(create);
   static Message? _defaultInstance;
 
   @$pb.TagNumber(1)
   $1.TypedKey get author => $_getN(0);
   @$pb.TagNumber(1)
-  set author($1.TypedKey v) {
-    setField(1, v);
-  }
-
+  set author($1.TypedKey v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasAuthor() => $_has(0);
   @$pb.TagNumber(1)
@@ -197,10 +156,7 @@ class Message extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $fixnum.Int64 get timestamp => $_getI64(1);
   @$pb.TagNumber(2)
-  set timestamp($fixnum.Int64 v) {
-    $_setInt64(1, v);
-  }
-
+  set timestamp($fixnum.Int64 v) { $_setInt64(1, v); }
   @$pb.TagNumber(2)
   $core.bool hasTimestamp() => $_has(1);
   @$pb.TagNumber(2)
@@ -209,10 +165,7 @@ class Message extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.String get text => $_getSZ(2);
   @$pb.TagNumber(3)
-  set text($core.String v) {
-    $_setString(2, v);
-  }
-
+  set text($core.String v) { $_setString(2, v); }
   @$pb.TagNumber(3)
   $core.bool hasText() => $_has(2);
   @$pb.TagNumber(3)
@@ -221,10 +174,7 @@ class Message extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $1.Signature get signature => $_getN(3);
   @$pb.TagNumber(4)
-  set signature($1.Signature v) {
-    setField(4, v);
-  }
-
+  set signature($1.Signature v) { setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasSignature() => $_has(3);
   @$pb.TagNumber(4)
@@ -239,54 +189,41 @@ class Message extends $pb.GeneratedMessage {
 class Conversation extends $pb.GeneratedMessage {
   factory Conversation() => create();
   Conversation._() : super();
-  factory Conversation.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory Conversation.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory Conversation.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Conversation.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'Conversation',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..aOM<Profile>(1, _omitFieldNames ? '' : 'profile',
-        subBuilder: Profile.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Conversation', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..aOM<Profile>(1, _omitFieldNames ? '' : 'profile', subBuilder: Profile.create)
     ..aOS(2, _omitFieldNames ? '' : 'identityMasterJson')
-    ..aOM<$1.TypedKey>(3, _omitFieldNames ? '' : 'messages',
-        subBuilder: $1.TypedKey.create)
-    ..hasRequiredFields = false;
+    ..aOM<$1.TypedKey>(3, _omitFieldNames ? '' : 'messages', subBuilder: $1.TypedKey.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   Conversation clone() => Conversation()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  Conversation copyWith(void Function(Conversation) updates) =>
-      super.copyWith((message) => updates(message as Conversation))
-          as Conversation;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  Conversation copyWith(void Function(Conversation) updates) => super.copyWith((message) => updates(message as Conversation)) as Conversation;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Conversation create() => Conversation._();
   Conversation createEmptyInstance() => create();
-  static $pb.PbList<Conversation> createRepeated() =>
-      $pb.PbList<Conversation>();
+  static $pb.PbList<Conversation> createRepeated() => $pb.PbList<Conversation>();
   @$core.pragma('dart2js:noInline')
-  static Conversation getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<Conversation>(create);
+  static Conversation getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Conversation>(create);
   static Conversation? _defaultInstance;
 
   @$pb.TagNumber(1)
   Profile get profile => $_getN(0);
   @$pb.TagNumber(1)
-  set profile(Profile v) {
-    setField(1, v);
-  }
-
+  set profile(Profile v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasProfile() => $_has(0);
   @$pb.TagNumber(1)
@@ -297,10 +234,7 @@ class Conversation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.String get identityMasterJson => $_getSZ(1);
   @$pb.TagNumber(2)
-  set identityMasterJson($core.String v) {
-    $_setString(1, v);
-  }
-
+  set identityMasterJson($core.String v) { $_setString(1, v); }
   @$pb.TagNumber(2)
   $core.bool hasIdentityMasterJson() => $_has(1);
   @$pb.TagNumber(2)
@@ -309,10 +243,7 @@ class Conversation extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $1.TypedKey get messages => $_getN(2);
   @$pb.TagNumber(3)
-  set messages($1.TypedKey v) {
-    setField(3, v);
-  }
-
+  set messages($1.TypedKey v) { setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasMessages() => $_has(2);
   @$pb.TagNumber(3)
@@ -324,40 +255,30 @@ class Conversation extends $pb.GeneratedMessage {
 class Contact extends $pb.GeneratedMessage {
   factory Contact() => create();
   Contact._() : super();
-  factory Contact.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory Contact.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory Contact.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Contact.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'Contact',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..aOM<Profile>(1, _omitFieldNames ? '' : 'editedProfile',
-        subBuilder: Profile.create)
-    ..aOM<Profile>(2, _omitFieldNames ? '' : 'remoteProfile',
-        subBuilder: Profile.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Contact', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..aOM<Profile>(1, _omitFieldNames ? '' : 'editedProfile', subBuilder: Profile.create)
+    ..aOM<Profile>(2, _omitFieldNames ? '' : 'remoteProfile', subBuilder: Profile.create)
     ..aOS(3, _omitFieldNames ? '' : 'identityMasterJson')
-    ..aOM<$1.TypedKey>(4, _omitFieldNames ? '' : 'identityPublicKey',
-        subBuilder: $1.TypedKey.create)
-    ..aOM<$1.TypedKey>(5, _omitFieldNames ? '' : 'remoteConversationRecordKey',
-        subBuilder: $1.TypedKey.create)
-    ..aOM<$1.TypedKey>(6, _omitFieldNames ? '' : 'localConversationRecordKey',
-        subBuilder: $1.TypedKey.create)
+    ..aOM<$1.TypedKey>(4, _omitFieldNames ? '' : 'identityPublicKey', subBuilder: $1.TypedKey.create)
+    ..aOM<$1.TypedKey>(5, _omitFieldNames ? '' : 'remoteConversationRecordKey', subBuilder: $1.TypedKey.create)
+    ..aOM<$1.TypedKey>(6, _omitFieldNames ? '' : 'localConversationRecordKey', subBuilder: $1.TypedKey.create)
     ..aOB(7, _omitFieldNames ? '' : 'showAvailability')
-    ..hasRequiredFields = false;
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   Contact clone() => Contact()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  Contact copyWith(void Function(Contact) updates) =>
-      super.copyWith((message) => updates(message as Contact)) as Contact;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  Contact copyWith(void Function(Contact) updates) => super.copyWith((message) => updates(message as Contact)) as Contact;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -366,17 +287,13 @@ class Contact extends $pb.GeneratedMessage {
   Contact createEmptyInstance() => create();
   static $pb.PbList<Contact> createRepeated() => $pb.PbList<Contact>();
   @$core.pragma('dart2js:noInline')
-  static Contact getDefault() =>
-      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Contact>(create);
+  static Contact getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Contact>(create);
   static Contact? _defaultInstance;
 
   @$pb.TagNumber(1)
   Profile get editedProfile => $_getN(0);
   @$pb.TagNumber(1)
-  set editedProfile(Profile v) {
-    setField(1, v);
-  }
-
+  set editedProfile(Profile v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasEditedProfile() => $_has(0);
   @$pb.TagNumber(1)
@@ -387,10 +304,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   Profile get remoteProfile => $_getN(1);
   @$pb.TagNumber(2)
-  set remoteProfile(Profile v) {
-    setField(2, v);
-  }
-
+  set remoteProfile(Profile v) { setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasRemoteProfile() => $_has(1);
   @$pb.TagNumber(2)
@@ -401,10 +315,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.String get identityMasterJson => $_getSZ(2);
   @$pb.TagNumber(3)
-  set identityMasterJson($core.String v) {
-    $_setString(2, v);
-  }
-
+  set identityMasterJson($core.String v) { $_setString(2, v); }
   @$pb.TagNumber(3)
   $core.bool hasIdentityMasterJson() => $_has(2);
   @$pb.TagNumber(3)
@@ -413,10 +324,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $1.TypedKey get identityPublicKey => $_getN(3);
   @$pb.TagNumber(4)
-  set identityPublicKey($1.TypedKey v) {
-    setField(4, v);
-  }
-
+  set identityPublicKey($1.TypedKey v) { setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasIdentityPublicKey() => $_has(3);
   @$pb.TagNumber(4)
@@ -427,10 +335,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $1.TypedKey get remoteConversationRecordKey => $_getN(4);
   @$pb.TagNumber(5)
-  set remoteConversationRecordKey($1.TypedKey v) {
-    setField(5, v);
-  }
-
+  set remoteConversationRecordKey($1.TypedKey v) { setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasRemoteConversationRecordKey() => $_has(4);
   @$pb.TagNumber(5)
@@ -441,10 +346,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $1.TypedKey get localConversationRecordKey => $_getN(5);
   @$pb.TagNumber(6)
-  set localConversationRecordKey($1.TypedKey v) {
-    setField(6, v);
-  }
-
+  set localConversationRecordKey($1.TypedKey v) { setField(6, v); }
   @$pb.TagNumber(6)
   $core.bool hasLocalConversationRecordKey() => $_has(5);
   @$pb.TagNumber(6)
@@ -455,10 +357,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool get showAvailability => $_getBF(6);
   @$pb.TagNumber(7)
-  set showAvailability($core.bool v) {
-    $_setBool(6, v);
-  }
-
+  set showAvailability($core.bool v) { $_setBool(6, v); }
   @$pb.TagNumber(7)
   $core.bool hasShowAvailability() => $_has(6);
   @$pb.TagNumber(7)
@@ -468,38 +367,28 @@ class Contact extends $pb.GeneratedMessage {
 class Profile extends $pb.GeneratedMessage {
   factory Profile() => create();
   Profile._() : super();
-  factory Profile.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory Profile.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory Profile.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Profile.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'Profile',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Profile', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'name')
     ..aOS(2, _omitFieldNames ? '' : 'pronouns')
     ..aOS(3, _omitFieldNames ? '' : 'status')
-    ..e<Availability>(
-        4, _omitFieldNames ? '' : 'availability', $pb.PbFieldType.OE,
-        defaultOrMaker: Availability.AVAILABILITY_UNSPECIFIED,
-        valueOf: Availability.valueOf,
-        enumValues: Availability.values)
-    ..aOM<$1.TypedKey>(5, _omitFieldNames ? '' : 'avatar',
-        subBuilder: $1.TypedKey.create)
-    ..hasRequiredFields = false;
+    ..e<Availability>(4, _omitFieldNames ? '' : 'availability', $pb.PbFieldType.OE, defaultOrMaker: Availability.AVAILABILITY_UNSPECIFIED, valueOf: Availability.valueOf, enumValues: Availability.values)
+    ..aOM<$1.TypedKey>(5, _omitFieldNames ? '' : 'avatar', subBuilder: $1.TypedKey.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   Profile clone() => Profile()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  Profile copyWith(void Function(Profile) updates) =>
-      super.copyWith((message) => updates(message as Profile)) as Profile;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  Profile copyWith(void Function(Profile) updates) => super.copyWith((message) => updates(message as Profile)) as Profile;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -508,17 +397,13 @@ class Profile extends $pb.GeneratedMessage {
   Profile createEmptyInstance() => create();
   static $pb.PbList<Profile> createRepeated() => $pb.PbList<Profile>();
   @$core.pragma('dart2js:noInline')
-  static Profile getDefault() =>
-      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Profile>(create);
+  static Profile getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Profile>(create);
   static Profile? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get name => $_getSZ(0);
   @$pb.TagNumber(1)
-  set name($core.String v) {
-    $_setString(0, v);
-  }
-
+  set name($core.String v) { $_setString(0, v); }
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
@@ -527,10 +412,7 @@ class Profile extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.String get pronouns => $_getSZ(1);
   @$pb.TagNumber(2)
-  set pronouns($core.String v) {
-    $_setString(1, v);
-  }
-
+  set pronouns($core.String v) { $_setString(1, v); }
   @$pb.TagNumber(2)
   $core.bool hasPronouns() => $_has(1);
   @$pb.TagNumber(2)
@@ -539,10 +421,7 @@ class Profile extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.String get status => $_getSZ(2);
   @$pb.TagNumber(3)
-  set status($core.String v) {
-    $_setString(2, v);
-  }
-
+  set status($core.String v) { $_setString(2, v); }
   @$pb.TagNumber(3)
   $core.bool hasStatus() => $_has(2);
   @$pb.TagNumber(3)
@@ -551,10 +430,7 @@ class Profile extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   Availability get availability => $_getN(3);
   @$pb.TagNumber(4)
-  set availability(Availability v) {
-    setField(4, v);
-  }
-
+  set availability(Availability v) { setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasAvailability() => $_has(3);
   @$pb.TagNumber(4)
@@ -563,10 +439,7 @@ class Profile extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $1.TypedKey get avatar => $_getN(4);
   @$pb.TagNumber(5)
-  set avatar($1.TypedKey v) {
-    setField(5, v);
-  }
-
+  set avatar($1.TypedKey v) { setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasAvatar() => $_has(4);
   @$pb.TagNumber(5)
@@ -578,34 +451,25 @@ class Profile extends $pb.GeneratedMessage {
 class Chat extends $pb.GeneratedMessage {
   factory Chat() => create();
   Chat._() : super();
-  factory Chat.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory Chat.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory Chat.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Chat.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'Chat',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..e<ChatType>(1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: ChatType.CHAT_TYPE_UNSPECIFIED,
-        valueOf: ChatType.valueOf,
-        enumValues: ChatType.values)
-    ..aOM<$1.TypedKey>(2, _omitFieldNames ? '' : 'remoteConversationKey',
-        subBuilder: $1.TypedKey.create)
-    ..hasRequiredFields = false;
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Chat', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..e<ChatType>(1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: ChatType.CHAT_TYPE_UNSPECIFIED, valueOf: ChatType.valueOf, enumValues: ChatType.values)
+    ..aOM<$1.TypedKey>(2, _omitFieldNames ? '' : 'remoteConversationKey', subBuilder: $1.TypedKey.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   Chat clone() => Chat()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  Chat copyWith(void Function(Chat) updates) =>
-      super.copyWith((message) => updates(message as Chat)) as Chat;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  Chat copyWith(void Function(Chat) updates) => super.copyWith((message) => updates(message as Chat)) as Chat;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -614,17 +478,13 @@ class Chat extends $pb.GeneratedMessage {
   Chat createEmptyInstance() => create();
   static $pb.PbList<Chat> createRepeated() => $pb.PbList<Chat>();
   @$core.pragma('dart2js:noInline')
-  static Chat getDefault() =>
-      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Chat>(create);
+  static Chat getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Chat>(create);
   static Chat? _defaultInstance;
 
   @$pb.TagNumber(1)
   ChatType get type => $_getN(0);
   @$pb.TagNumber(1)
-  set type(ChatType v) {
-    setField(1, v);
-  }
-
+  set type(ChatType v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
   @$pb.TagNumber(1)
@@ -633,10 +493,7 @@ class Chat extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $1.TypedKey get remoteConversationKey => $_getN(1);
   @$pb.TagNumber(2)
-  set remoteConversationKey($1.TypedKey v) {
-    setField(2, v);
-  }
-
+  set remoteConversationKey($1.TypedKey v) { setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasRemoteConversationKey() => $_has(1);
   @$pb.TagNumber(2)
@@ -648,40 +505,29 @@ class Chat extends $pb.GeneratedMessage {
 class Account extends $pb.GeneratedMessage {
   factory Account() => create();
   Account._() : super();
-  factory Account.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory Account.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory Account.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Account.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'Account',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..aOM<Profile>(1, _omitFieldNames ? '' : 'profile',
-        subBuilder: Profile.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Account', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..aOM<Profile>(1, _omitFieldNames ? '' : 'profile', subBuilder: Profile.create)
     ..aOB(2, _omitFieldNames ? '' : 'invisible')
-    ..a<$core.int>(
-        3, _omitFieldNames ? '' : 'autoAwayTimeoutSec', $pb.PbFieldType.OU3)
-    ..aOM<$0.OwnedDHTRecordPointer>(4, _omitFieldNames ? '' : 'contactList',
-        subBuilder: $0.OwnedDHTRecordPointer.create)
-    ..aOM<$0.OwnedDHTRecordPointer>(
-        5, _omitFieldNames ? '' : 'contactInvitationRecords',
-        subBuilder: $0.OwnedDHTRecordPointer.create)
-    ..aOM<$0.OwnedDHTRecordPointer>(6, _omitFieldNames ? '' : 'chatList',
-        subBuilder: $0.OwnedDHTRecordPointer.create)
-    ..hasRequiredFields = false;
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'autoAwayTimeoutSec', $pb.PbFieldType.OU3)
+    ..aOM<$0.OwnedDHTRecordPointer>(4, _omitFieldNames ? '' : 'contactList', subBuilder: $0.OwnedDHTRecordPointer.create)
+    ..aOM<$0.OwnedDHTRecordPointer>(5, _omitFieldNames ? '' : 'contactInvitationRecords', subBuilder: $0.OwnedDHTRecordPointer.create)
+    ..aOM<$0.OwnedDHTRecordPointer>(6, _omitFieldNames ? '' : 'chatList', subBuilder: $0.OwnedDHTRecordPointer.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   Account clone() => Account()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  Account copyWith(void Function(Account) updates) =>
-      super.copyWith((message) => updates(message as Account)) as Account;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  Account copyWith(void Function(Account) updates) => super.copyWith((message) => updates(message as Account)) as Account;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -690,17 +536,13 @@ class Account extends $pb.GeneratedMessage {
   Account createEmptyInstance() => create();
   static $pb.PbList<Account> createRepeated() => $pb.PbList<Account>();
   @$core.pragma('dart2js:noInline')
-  static Account getDefault() =>
-      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Account>(create);
+  static Account getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Account>(create);
   static Account? _defaultInstance;
 
   @$pb.TagNumber(1)
   Profile get profile => $_getN(0);
   @$pb.TagNumber(1)
-  set profile(Profile v) {
-    setField(1, v);
-  }
-
+  set profile(Profile v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasProfile() => $_has(0);
   @$pb.TagNumber(1)
@@ -711,10 +553,7 @@ class Account extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool get invisible => $_getBF(1);
   @$pb.TagNumber(2)
-  set invisible($core.bool v) {
-    $_setBool(1, v);
-  }
-
+  set invisible($core.bool v) { $_setBool(1, v); }
   @$pb.TagNumber(2)
   $core.bool hasInvisible() => $_has(1);
   @$pb.TagNumber(2)
@@ -723,10 +562,7 @@ class Account extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.int get autoAwayTimeoutSec => $_getIZ(2);
   @$pb.TagNumber(3)
-  set autoAwayTimeoutSec($core.int v) {
-    $_setUnsignedInt32(2, v);
-  }
-
+  set autoAwayTimeoutSec($core.int v) { $_setUnsignedInt32(2, v); }
   @$pb.TagNumber(3)
   $core.bool hasAutoAwayTimeoutSec() => $_has(2);
   @$pb.TagNumber(3)
@@ -735,10 +571,7 @@ class Account extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $0.OwnedDHTRecordPointer get contactList => $_getN(3);
   @$pb.TagNumber(4)
-  set contactList($0.OwnedDHTRecordPointer v) {
-    setField(4, v);
-  }
-
+  set contactList($0.OwnedDHTRecordPointer v) { setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasContactList() => $_has(3);
   @$pb.TagNumber(4)
@@ -749,10 +582,7 @@ class Account extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $0.OwnedDHTRecordPointer get contactInvitationRecords => $_getN(4);
   @$pb.TagNumber(5)
-  set contactInvitationRecords($0.OwnedDHTRecordPointer v) {
-    setField(5, v);
-  }
-
+  set contactInvitationRecords($0.OwnedDHTRecordPointer v) { setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasContactInvitationRecords() => $_has(4);
   @$pb.TagNumber(5)
@@ -763,10 +593,7 @@ class Account extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $0.OwnedDHTRecordPointer get chatList => $_getN(5);
   @$pb.TagNumber(6)
-  set chatList($0.OwnedDHTRecordPointer v) {
-    setField(6, v);
-  }
-
+  set chatList($0.OwnedDHTRecordPointer v) { setField(6, v); }
   @$pb.TagNumber(6)
   $core.bool hasChatList() => $_has(5);
   @$pb.TagNumber(6)
@@ -778,53 +605,40 @@ class Account extends $pb.GeneratedMessage {
 class ContactInvitation extends $pb.GeneratedMessage {
   factory ContactInvitation() => create();
   ContactInvitation._() : super();
-  factory ContactInvitation.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory ContactInvitation.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory ContactInvitation.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ContactInvitation.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'ContactInvitation',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..aOM<$1.TypedKey>(1, _omitFieldNames ? '' : 'contactRequestInboxKey',
-        subBuilder: $1.TypedKey.create)
-    ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'writerSecret', $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ContactInvitation', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..aOM<$1.TypedKey>(1, _omitFieldNames ? '' : 'contactRequestInboxKey', subBuilder: $1.TypedKey.create)
+    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'writerSecret', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   ContactInvitation clone() => ContactInvitation()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  ContactInvitation copyWith(void Function(ContactInvitation) updates) =>
-      super.copyWith((message) => updates(message as ContactInvitation))
-          as ContactInvitation;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ContactInvitation copyWith(void Function(ContactInvitation) updates) => super.copyWith((message) => updates(message as ContactInvitation)) as ContactInvitation;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static ContactInvitation create() => ContactInvitation._();
   ContactInvitation createEmptyInstance() => create();
-  static $pb.PbList<ContactInvitation> createRepeated() =>
-      $pb.PbList<ContactInvitation>();
+  static $pb.PbList<ContactInvitation> createRepeated() => $pb.PbList<ContactInvitation>();
   @$core.pragma('dart2js:noInline')
-  static ContactInvitation getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<ContactInvitation>(create);
+  static ContactInvitation getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ContactInvitation>(create);
   static ContactInvitation? _defaultInstance;
 
   @$pb.TagNumber(1)
   $1.TypedKey get contactRequestInboxKey => $_getN(0);
   @$pb.TagNumber(1)
-  set contactRequestInboxKey($1.TypedKey v) {
-    setField(1, v);
-  }
-
+  set contactRequestInboxKey($1.TypedKey v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasContactRequestInboxKey() => $_has(0);
   @$pb.TagNumber(1)
@@ -835,10 +649,7 @@ class ContactInvitation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.List<$core.int> get writerSecret => $_getN(1);
   @$pb.TagNumber(2)
-  set writerSecret($core.List<$core.int> v) {
-    $_setBytes(1, v);
-  }
-
+  set writerSecret($core.List<$core.int> v) { $_setBytes(1, v); }
   @$pb.TagNumber(2)
   $core.bool hasWriterSecret() => $_has(1);
   @$pb.TagNumber(2)
@@ -848,55 +659,40 @@ class ContactInvitation extends $pb.GeneratedMessage {
 class SignedContactInvitation extends $pb.GeneratedMessage {
   factory SignedContactInvitation() => create();
   SignedContactInvitation._() : super();
-  factory SignedContactInvitation.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory SignedContactInvitation.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory SignedContactInvitation.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory SignedContactInvitation.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'SignedContactInvitation',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1, _omitFieldNames ? '' : 'contactInvitation', $pb.PbFieldType.OY)
-    ..aOM<$1.Signature>(2, _omitFieldNames ? '' : 'identitySignature',
-        subBuilder: $1.Signature.create)
-    ..hasRequiredFields = false;
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SignedContactInvitation', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'contactInvitation', $pb.PbFieldType.OY)
+    ..aOM<$1.Signature>(2, _omitFieldNames ? '' : 'identitySignature', subBuilder: $1.Signature.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
-  SignedContactInvitation clone() =>
-      SignedContactInvitation()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  SignedContactInvitation copyWith(
-          void Function(SignedContactInvitation) updates) =>
-      super.copyWith((message) => updates(message as SignedContactInvitation))
-          as SignedContactInvitation;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  SignedContactInvitation clone() => SignedContactInvitation()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  SignedContactInvitation copyWith(void Function(SignedContactInvitation) updates) => super.copyWith((message) => updates(message as SignedContactInvitation)) as SignedContactInvitation;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static SignedContactInvitation create() => SignedContactInvitation._();
   SignedContactInvitation createEmptyInstance() => create();
-  static $pb.PbList<SignedContactInvitation> createRepeated() =>
-      $pb.PbList<SignedContactInvitation>();
+  static $pb.PbList<SignedContactInvitation> createRepeated() => $pb.PbList<SignedContactInvitation>();
   @$core.pragma('dart2js:noInline')
-  static SignedContactInvitation getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<SignedContactInvitation>(create);
+  static SignedContactInvitation getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SignedContactInvitation>(create);
   static SignedContactInvitation? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.List<$core.int> get contactInvitation => $_getN(0);
   @$pb.TagNumber(1)
-  set contactInvitation($core.List<$core.int> v) {
-    $_setBytes(0, v);
-  }
-
+  set contactInvitation($core.List<$core.int> v) { $_setBytes(0, v); }
   @$pb.TagNumber(1)
   $core.bool hasContactInvitation() => $_has(0);
   @$pb.TagNumber(1)
@@ -905,10 +701,7 @@ class SignedContactInvitation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $1.Signature get identitySignature => $_getN(1);
   @$pb.TagNumber(2)
-  set identitySignature($1.Signature v) {
-    setField(2, v);
-  }
-
+  set identitySignature($1.Signature v) { setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasIdentitySignature() => $_has(1);
   @$pb.TagNumber(2)
@@ -920,56 +713,40 @@ class SignedContactInvitation extends $pb.GeneratedMessage {
 class ContactRequest extends $pb.GeneratedMessage {
   factory ContactRequest() => create();
   ContactRequest._() : super();
-  factory ContactRequest.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory ContactRequest.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory ContactRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ContactRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'ContactRequest',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..e<EncryptionKeyType>(
-        1, _omitFieldNames ? '' : 'encryptionKeyType', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptionKeyType.ENCRYPTION_KEY_TYPE_UNSPECIFIED,
-        valueOf: EncryptionKeyType.valueOf,
-        enumValues: EncryptionKeyType.values)
-    ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'private', $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ContactRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..e<EncryptionKeyType>(1, _omitFieldNames ? '' : 'encryptionKeyType', $pb.PbFieldType.OE, defaultOrMaker: EncryptionKeyType.ENCRYPTION_KEY_TYPE_UNSPECIFIED, valueOf: EncryptionKeyType.valueOf, enumValues: EncryptionKeyType.values)
+    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'private', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   ContactRequest clone() => ContactRequest()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  ContactRequest copyWith(void Function(ContactRequest) updates) =>
-      super.copyWith((message) => updates(message as ContactRequest))
-          as ContactRequest;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ContactRequest copyWith(void Function(ContactRequest) updates) => super.copyWith((message) => updates(message as ContactRequest)) as ContactRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static ContactRequest create() => ContactRequest._();
   ContactRequest createEmptyInstance() => create();
-  static $pb.PbList<ContactRequest> createRepeated() =>
-      $pb.PbList<ContactRequest>();
+  static $pb.PbList<ContactRequest> createRepeated() => $pb.PbList<ContactRequest>();
   @$core.pragma('dart2js:noInline')
-  static ContactRequest getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<ContactRequest>(create);
+  static ContactRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ContactRequest>(create);
   static ContactRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   EncryptionKeyType get encryptionKeyType => $_getN(0);
   @$pb.TagNumber(1)
-  set encryptionKeyType(EncryptionKeyType v) {
-    setField(1, v);
-  }
-
+  set encryptionKeyType(EncryptionKeyType v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasEncryptionKeyType() => $_has(0);
   @$pb.TagNumber(1)
@@ -978,10 +755,7 @@ class ContactRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.List<$core.int> get private => $_getN(1);
   @$pb.TagNumber(2)
-  set private($core.List<$core.int> v) {
-    $_setBytes(1, v);
-  }
-
+  set private($core.List<$core.int> v) { $_setBytes(1, v); }
   @$pb.TagNumber(2)
   $core.bool hasPrivate() => $_has(1);
   @$pb.TagNumber(2)
@@ -991,62 +765,43 @@ class ContactRequest extends $pb.GeneratedMessage {
 class ContactRequestPrivate extends $pb.GeneratedMessage {
   factory ContactRequestPrivate() => create();
   ContactRequestPrivate._() : super();
-  factory ContactRequestPrivate.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory ContactRequestPrivate.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory ContactRequestPrivate.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ContactRequestPrivate.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'ContactRequestPrivate',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..aOM<$1.CryptoKey>(1, _omitFieldNames ? '' : 'writerKey',
-        subBuilder: $1.CryptoKey.create)
-    ..aOM<Profile>(2, _omitFieldNames ? '' : 'profile',
-        subBuilder: Profile.create)
-    ..aOM<$1.TypedKey>(3, _omitFieldNames ? '' : 'identityMasterRecordKey',
-        subBuilder: $1.TypedKey.create)
-    ..aOM<$1.TypedKey>(4, _omitFieldNames ? '' : 'chatRecordKey',
-        subBuilder: $1.TypedKey.create)
-    ..a<$fixnum.Int64>(
-        5, _omitFieldNames ? '' : 'expiration', $pb.PbFieldType.OU6,
-        defaultOrMaker: $fixnum.Int64.ZERO)
-    ..hasRequiredFields = false;
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ContactRequestPrivate', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..aOM<$1.CryptoKey>(1, _omitFieldNames ? '' : 'writerKey', subBuilder: $1.CryptoKey.create)
+    ..aOM<Profile>(2, _omitFieldNames ? '' : 'profile', subBuilder: Profile.create)
+    ..aOM<$1.TypedKey>(3, _omitFieldNames ? '' : 'identityMasterRecordKey', subBuilder: $1.TypedKey.create)
+    ..aOM<$1.TypedKey>(4, _omitFieldNames ? '' : 'chatRecordKey', subBuilder: $1.TypedKey.create)
+    ..a<$fixnum.Int64>(5, _omitFieldNames ? '' : 'expiration', $pb.PbFieldType.OU6, defaultOrMaker: $fixnum.Int64.ZERO)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
-  ContactRequestPrivate clone() =>
-      ContactRequestPrivate()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  ContactRequestPrivate copyWith(
-          void Function(ContactRequestPrivate) updates) =>
-      super.copyWith((message) => updates(message as ContactRequestPrivate))
-          as ContactRequestPrivate;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  ContactRequestPrivate clone() => ContactRequestPrivate()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ContactRequestPrivate copyWith(void Function(ContactRequestPrivate) updates) => super.copyWith((message) => updates(message as ContactRequestPrivate)) as ContactRequestPrivate;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static ContactRequestPrivate create() => ContactRequestPrivate._();
   ContactRequestPrivate createEmptyInstance() => create();
-  static $pb.PbList<ContactRequestPrivate> createRepeated() =>
-      $pb.PbList<ContactRequestPrivate>();
+  static $pb.PbList<ContactRequestPrivate> createRepeated() => $pb.PbList<ContactRequestPrivate>();
   @$core.pragma('dart2js:noInline')
-  static ContactRequestPrivate getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<ContactRequestPrivate>(create);
+  static ContactRequestPrivate getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ContactRequestPrivate>(create);
   static ContactRequestPrivate? _defaultInstance;
 
   @$pb.TagNumber(1)
   $1.CryptoKey get writerKey => $_getN(0);
   @$pb.TagNumber(1)
-  set writerKey($1.CryptoKey v) {
-    setField(1, v);
-  }
-
+  set writerKey($1.CryptoKey v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasWriterKey() => $_has(0);
   @$pb.TagNumber(1)
@@ -1057,10 +812,7 @@ class ContactRequestPrivate extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   Profile get profile => $_getN(1);
   @$pb.TagNumber(2)
-  set profile(Profile v) {
-    setField(2, v);
-  }
-
+  set profile(Profile v) { setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasProfile() => $_has(1);
   @$pb.TagNumber(2)
@@ -1071,10 +823,7 @@ class ContactRequestPrivate extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $1.TypedKey get identityMasterRecordKey => $_getN(2);
   @$pb.TagNumber(3)
-  set identityMasterRecordKey($1.TypedKey v) {
-    setField(3, v);
-  }
-
+  set identityMasterRecordKey($1.TypedKey v) { setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasIdentityMasterRecordKey() => $_has(2);
   @$pb.TagNumber(3)
@@ -1085,10 +834,7 @@ class ContactRequestPrivate extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $1.TypedKey get chatRecordKey => $_getN(3);
   @$pb.TagNumber(4)
-  set chatRecordKey($1.TypedKey v) {
-    setField(4, v);
-  }
-
+  set chatRecordKey($1.TypedKey v) { setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasChatRecordKey() => $_has(3);
   @$pb.TagNumber(4)
@@ -1099,10 +845,7 @@ class ContactRequestPrivate extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $fixnum.Int64 get expiration => $_getI64(4);
   @$pb.TagNumber(5)
-  set expiration($fixnum.Int64 v) {
-    $_setInt64(4, v);
-  }
-
+  set expiration($fixnum.Int64 v) { $_setInt64(4, v); }
   @$pb.TagNumber(5)
   $core.bool hasExpiration() => $_has(4);
   @$pb.TagNumber(5)
@@ -1112,54 +855,41 @@ class ContactRequestPrivate extends $pb.GeneratedMessage {
 class ContactResponse extends $pb.GeneratedMessage {
   factory ContactResponse() => create();
   ContactResponse._() : super();
-  factory ContactResponse.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory ContactResponse.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory ContactResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ContactResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'ContactResponse',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ContactResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
     ..aOB(1, _omitFieldNames ? '' : 'accept')
-    ..aOM<$1.TypedKey>(2, _omitFieldNames ? '' : 'identityMasterRecordKey',
-        subBuilder: $1.TypedKey.create)
-    ..aOM<$1.TypedKey>(3, _omitFieldNames ? '' : 'remoteConversationRecordKey',
-        subBuilder: $1.TypedKey.create)
-    ..hasRequiredFields = false;
+    ..aOM<$1.TypedKey>(2, _omitFieldNames ? '' : 'identityMasterRecordKey', subBuilder: $1.TypedKey.create)
+    ..aOM<$1.TypedKey>(3, _omitFieldNames ? '' : 'remoteConversationRecordKey', subBuilder: $1.TypedKey.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   ContactResponse clone() => ContactResponse()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  ContactResponse copyWith(void Function(ContactResponse) updates) =>
-      super.copyWith((message) => updates(message as ContactResponse))
-          as ContactResponse;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ContactResponse copyWith(void Function(ContactResponse) updates) => super.copyWith((message) => updates(message as ContactResponse)) as ContactResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static ContactResponse create() => ContactResponse._();
   ContactResponse createEmptyInstance() => create();
-  static $pb.PbList<ContactResponse> createRepeated() =>
-      $pb.PbList<ContactResponse>();
+  static $pb.PbList<ContactResponse> createRepeated() => $pb.PbList<ContactResponse>();
   @$core.pragma('dart2js:noInline')
-  static ContactResponse getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<ContactResponse>(create);
+  static ContactResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ContactResponse>(create);
   static ContactResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.bool get accept => $_getBF(0);
   @$pb.TagNumber(1)
-  set accept($core.bool v) {
-    $_setBool(0, v);
-  }
-
+  set accept($core.bool v) { $_setBool(0, v); }
   @$pb.TagNumber(1)
   $core.bool hasAccept() => $_has(0);
   @$pb.TagNumber(1)
@@ -1168,10 +898,7 @@ class ContactResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $1.TypedKey get identityMasterRecordKey => $_getN(1);
   @$pb.TagNumber(2)
-  set identityMasterRecordKey($1.TypedKey v) {
-    setField(2, v);
-  }
-
+  set identityMasterRecordKey($1.TypedKey v) { setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasIdentityMasterRecordKey() => $_has(1);
   @$pb.TagNumber(2)
@@ -1182,10 +909,7 @@ class ContactResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $1.TypedKey get remoteConversationRecordKey => $_getN(2);
   @$pb.TagNumber(3)
-  set remoteConversationRecordKey($1.TypedKey v) {
-    setField(3, v);
-  }
-
+  set remoteConversationRecordKey($1.TypedKey v) { setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasRemoteConversationRecordKey() => $_has(2);
   @$pb.TagNumber(3)
@@ -1197,55 +921,40 @@ class ContactResponse extends $pb.GeneratedMessage {
 class SignedContactResponse extends $pb.GeneratedMessage {
   factory SignedContactResponse() => create();
   SignedContactResponse._() : super();
-  factory SignedContactResponse.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory SignedContactResponse.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory SignedContactResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory SignedContactResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'SignedContactResponse',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1, _omitFieldNames ? '' : 'contactResponse', $pb.PbFieldType.OY)
-    ..aOM<$1.Signature>(2, _omitFieldNames ? '' : 'identitySignature',
-        subBuilder: $1.Signature.create)
-    ..hasRequiredFields = false;
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SignedContactResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'contactResponse', $pb.PbFieldType.OY)
+    ..aOM<$1.Signature>(2, _omitFieldNames ? '' : 'identitySignature', subBuilder: $1.Signature.create)
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
-  SignedContactResponse clone() =>
-      SignedContactResponse()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  SignedContactResponse copyWith(
-          void Function(SignedContactResponse) updates) =>
-      super.copyWith((message) => updates(message as SignedContactResponse))
-          as SignedContactResponse;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  SignedContactResponse clone() => SignedContactResponse()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  SignedContactResponse copyWith(void Function(SignedContactResponse) updates) => super.copyWith((message) => updates(message as SignedContactResponse)) as SignedContactResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static SignedContactResponse create() => SignedContactResponse._();
   SignedContactResponse createEmptyInstance() => create();
-  static $pb.PbList<SignedContactResponse> createRepeated() =>
-      $pb.PbList<SignedContactResponse>();
+  static $pb.PbList<SignedContactResponse> createRepeated() => $pb.PbList<SignedContactResponse>();
   @$core.pragma('dart2js:noInline')
-  static SignedContactResponse getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<SignedContactResponse>(create);
+  static SignedContactResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SignedContactResponse>(create);
   static SignedContactResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.List<$core.int> get contactResponse => $_getN(0);
   @$pb.TagNumber(1)
-  set contactResponse($core.List<$core.int> v) {
-    $_setBytes(0, v);
-  }
-
+  set contactResponse($core.List<$core.int> v) { $_setBytes(0, v); }
   @$pb.TagNumber(1)
   $core.bool hasContactResponse() => $_has(0);
   @$pb.TagNumber(1)
@@ -1254,10 +963,7 @@ class SignedContactResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $1.Signature get identitySignature => $_getN(1);
   @$pb.TagNumber(2)
-  set identitySignature($1.Signature v) {
-    setField(2, v);
-  }
-
+  set identitySignature($1.Signature v) { setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasIdentitySignature() => $_has(1);
   @$pb.TagNumber(2)
@@ -1269,66 +975,45 @@ class SignedContactResponse extends $pb.GeneratedMessage {
 class ContactInvitationRecord extends $pb.GeneratedMessage {
   factory ContactInvitationRecord() => create();
   ContactInvitationRecord._() : super();
-  factory ContactInvitationRecord.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory ContactInvitationRecord.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
+  factory ContactInvitationRecord.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ContactInvitationRecord.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      _omitMessageNames ? '' : 'ContactInvitationRecord',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'),
-      createEmptyInstance: create)
-    ..aOM<$0.OwnedDHTRecordPointer>(
-        1, _omitFieldNames ? '' : 'contactRequestInbox',
-        subBuilder: $0.OwnedDHTRecordPointer.create)
-    ..aOM<$1.CryptoKey>(2, _omitFieldNames ? '' : 'writerKey',
-        subBuilder: $1.CryptoKey.create)
-    ..aOM<$1.CryptoKey>(3, _omitFieldNames ? '' : 'writerSecret',
-        subBuilder: $1.CryptoKey.create)
-    ..aOM<$1.TypedKey>(4, _omitFieldNames ? '' : 'localConversationRecordKey',
-        subBuilder: $1.TypedKey.create)
-    ..a<$fixnum.Int64>(
-        5, _omitFieldNames ? '' : 'expiration', $pb.PbFieldType.OU6,
-        defaultOrMaker: $fixnum.Int64.ZERO)
-    ..a<$core.List<$core.int>>(
-        6, _omitFieldNames ? '' : 'invitation', $pb.PbFieldType.OY)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ContactInvitationRecord', package: const $pb.PackageName(_omitMessageNames ? '' : 'veilidchat'), createEmptyInstance: create)
+    ..aOM<$0.OwnedDHTRecordPointer>(1, _omitFieldNames ? '' : 'contactRequestInbox', subBuilder: $0.OwnedDHTRecordPointer.create)
+    ..aOM<$1.CryptoKey>(2, _omitFieldNames ? '' : 'writerKey', subBuilder: $1.CryptoKey.create)
+    ..aOM<$1.CryptoKey>(3, _omitFieldNames ? '' : 'writerSecret', subBuilder: $1.CryptoKey.create)
+    ..aOM<$1.TypedKey>(4, _omitFieldNames ? '' : 'localConversationRecordKey', subBuilder: $1.TypedKey.create)
+    ..a<$fixnum.Int64>(5, _omitFieldNames ? '' : 'expiration', $pb.PbFieldType.OU6, defaultOrMaker: $fixnum.Int64.ZERO)
+    ..a<$core.List<$core.int>>(6, _omitFieldNames ? '' : 'invitation', $pb.PbFieldType.OY)
     ..aOS(7, _omitFieldNames ? '' : 'message')
-    ..hasRequiredFields = false;
+    ..hasRequiredFields = false
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
-  ContactInvitationRecord clone() =>
-      ContactInvitationRecord()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
-  ContactInvitationRecord copyWith(
-          void Function(ContactInvitationRecord) updates) =>
-      super.copyWith((message) => updates(message as ContactInvitationRecord))
-          as ContactInvitationRecord;
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  ContactInvitationRecord clone() => ContactInvitationRecord()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ContactInvitationRecord copyWith(void Function(ContactInvitationRecord) updates) => super.copyWith((message) => updates(message as ContactInvitationRecord)) as ContactInvitationRecord;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static ContactInvitationRecord create() => ContactInvitationRecord._();
   ContactInvitationRecord createEmptyInstance() => create();
-  static $pb.PbList<ContactInvitationRecord> createRepeated() =>
-      $pb.PbList<ContactInvitationRecord>();
+  static $pb.PbList<ContactInvitationRecord> createRepeated() => $pb.PbList<ContactInvitationRecord>();
   @$core.pragma('dart2js:noInline')
-  static ContactInvitationRecord getDefault() => _defaultInstance ??=
-      $pb.GeneratedMessage.$_defaultFor<ContactInvitationRecord>(create);
+  static ContactInvitationRecord getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ContactInvitationRecord>(create);
   static ContactInvitationRecord? _defaultInstance;
 
   @$pb.TagNumber(1)
   $0.OwnedDHTRecordPointer get contactRequestInbox => $_getN(0);
   @$pb.TagNumber(1)
-  set contactRequestInbox($0.OwnedDHTRecordPointer v) {
-    setField(1, v);
-  }
-
+  set contactRequestInbox($0.OwnedDHTRecordPointer v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasContactRequestInbox() => $_has(0);
   @$pb.TagNumber(1)
@@ -1339,10 +1024,7 @@ class ContactInvitationRecord extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $1.CryptoKey get writerKey => $_getN(1);
   @$pb.TagNumber(2)
-  set writerKey($1.CryptoKey v) {
-    setField(2, v);
-  }
-
+  set writerKey($1.CryptoKey v) { setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasWriterKey() => $_has(1);
   @$pb.TagNumber(2)
@@ -1353,10 +1035,7 @@ class ContactInvitationRecord extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $1.CryptoKey get writerSecret => $_getN(2);
   @$pb.TagNumber(3)
-  set writerSecret($1.CryptoKey v) {
-    setField(3, v);
-  }
-
+  set writerSecret($1.CryptoKey v) { setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasWriterSecret() => $_has(2);
   @$pb.TagNumber(3)
@@ -1367,10 +1046,7 @@ class ContactInvitationRecord extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $1.TypedKey get localConversationRecordKey => $_getN(3);
   @$pb.TagNumber(4)
-  set localConversationRecordKey($1.TypedKey v) {
-    setField(4, v);
-  }
-
+  set localConversationRecordKey($1.TypedKey v) { setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasLocalConversationRecordKey() => $_has(3);
   @$pb.TagNumber(4)
@@ -1381,10 +1057,7 @@ class ContactInvitationRecord extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $fixnum.Int64 get expiration => $_getI64(4);
   @$pb.TagNumber(5)
-  set expiration($fixnum.Int64 v) {
-    $_setInt64(4, v);
-  }
-
+  set expiration($fixnum.Int64 v) { $_setInt64(4, v); }
   @$pb.TagNumber(5)
   $core.bool hasExpiration() => $_has(4);
   @$pb.TagNumber(5)
@@ -1393,10 +1066,7 @@ class ContactInvitationRecord extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.List<$core.int> get invitation => $_getN(5);
   @$pb.TagNumber(6)
-  set invitation($core.List<$core.int> v) {
-    $_setBytes(5, v);
-  }
-
+  set invitation($core.List<$core.int> v) { $_setBytes(5, v); }
   @$pb.TagNumber(6)
   $core.bool hasInvitation() => $_has(5);
   @$pb.TagNumber(6)
@@ -1405,16 +1075,13 @@ class ContactInvitationRecord extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.String get message => $_getSZ(6);
   @$pb.TagNumber(7)
-  set message($core.String v) {
-    $_setString(6, v);
-  }
-
+  set message($core.String v) { $_setString(6, v); }
   @$pb.TagNumber(7)
   $core.bool hasMessage() => $_has(6);
   @$pb.TagNumber(7)
   void clearMessage() => clearField(7);
 }
 
+
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames =
-    $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/router/cubit/router_cubit.dart b/lib/router/cubit/router_cubit.dart
index f43df6b..88d7537 100644
--- a/lib/router/cubit/router_cubit.dart
+++ b/lib/router/cubit/router_cubit.dart
@@ -31,7 +31,9 @@ class RouterCubit extends Cubit<RouterState> {
     // Watch for changes that the router will care about
     Future.delayed(Duration.zero, () async {
       await eventualInitialized.future;
-      emit(state.copyWith(isInitialized: true));
+      emit(state.copyWith(
+          isInitialized: true,
+          hasAnyAccount: accountRepository.getLocalAccounts().isNotEmpty));
     });
 
     // Subscribe to repository streams
diff --git a/lib/router/cubit/router_cubit.freezed.dart b/lib/router/cubit/router_cubit.freezed.dart
index 16baed7..bbe7a04 100644
--- a/lib/router/cubit/router_cubit.freezed.dart
+++ b/lib/router/cubit/router_cubit.freezed.dart
@@ -118,7 +118,7 @@ class __$$RouterStateImplCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$RouterStateImpl implements _RouterState {
+class _$RouterStateImpl with DiagnosticableTreeMixin implements _RouterState {
   const _$RouterStateImpl(
       {required this.isInitialized,
       required this.hasAnyAccount,
@@ -135,10 +135,20 @@ class _$RouterStateImpl implements _RouterState {
   final bool hasActiveChat;
 
   @override
-  String toString() {
+  String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
     return 'RouterState(isInitialized: $isInitialized, hasAnyAccount: $hasAnyAccount, hasActiveChat: $hasActiveChat)';
   }
 
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties
+      ..add(DiagnosticsProperty('type', 'RouterState'))
+      ..add(DiagnosticsProperty('isInitialized', isInitialized))
+      ..add(DiagnosticsProperty('hasAnyAccount', hasAnyAccount))
+      ..add(DiagnosticsProperty('hasActiveChat', hasActiveChat));
+  }
+
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
diff --git a/packages/veilid_support/lib/src/config.dart b/packages/veilid_support/lib/src/config.dart
index 99860a0..1d2b521 100644
--- a/packages/veilid_support/lib/src/config.dart
+++ b/packages/veilid_support/lib/src/config.dart
@@ -60,6 +60,13 @@ Future<VeilidConfig> getVeilidConfig(bool isWeb, String appName) async {
                 config.network.routingTable.copyWith(bootstrap: bootstrap)));
   }
 
+  // ignore: do_not_use_environment
+  const envNetworkKey = String.fromEnvironment('NETWORK_KEY');
+  if (envNetworkKey.isNotEmpty) {
+    config = config.copyWith(
+        network: config.network.copyWith(networkKeyPassword: envNetworkKey));
+  }
+
   // ignore: do_not_use_environment
   const envBootstrap = String.fromEnvironment('BOOTSTRAP');
   if (envBootstrap.isNotEmpty) {