✨ Fake call audio level

👔 Disable the video by default
🐛 Fix the duplicate local participant
2025-10-19 19:34:22 +08:00 · 2025-10-19 19:23:17 +08:00 · 2025-10-19 19:23:01 +08:00 · 2025-10-19 19:16:40 +08:00 · 2025-10-19 19:06:14 +08:00 · 2025-10-19 18:58:54 +08:00
167 changed files with 2780 additions and 9724 deletions
--- a/assets/i18n/en-US.json
+++ b/assets/i18n/en-US.json
@@ -871,7 +871,6 @@
    "pollShortTextAnswerPreview": "Short text answer (preview)",
    "award": "Award",
    "awardPost": "Award Post",
-    "awardPoints": "Awarded {} points",
    "awardMessage": "Message",
    "awardMessageHint": "Enter your award message...",
    "awardAttitude": "Attitude",
@@ -1253,54 +1252,5 @@
    "availableWithYourPlan": "Available with your plan",
    "upgradeRequired": "Upgrade required",
    "settingsDisableAnimation": "Disable Animation",
-    "addTag": "Add Tag",
-    "postFeaturedOn": "Post featured on {}",
-    "messageSentAt": "Sent at {}",
-    "myTickets": "My Tickets",
-    "drawHistory": "Draw History",
-    "lottery": "Lottery",
-    "noLotteryTickets": "No lottery tickets yet",
-    "buyYourFirstTicket": "Buy your first lottery ticket to get started!",
-    "buyTicket": "Buy Ticket",
-    "ticketNumbers": "Numbers: {}, Special: {}",
-    "cost": "Cost",
-    "multiplier": "Multiplier",
-    "prizeWon": "Prize Won",
-    "pending": "Pending",
-    "drawn": "Drawn",
-    "won": "Won",
-    "lost": "Lost",
-    "noDrawHistory": "No draw history yet",
-    "buyLotteryTicket": "Buy Lottery Ticket",
-    "selectNumbers": "Select Numbers",
-    "select5UniqueNumbers": "Select 5 unique numbers",
-    "selectSpecialNumber": "Select Special Number",
-    "selectMultiplier": "Select Multiplier",
-    "baseCost": "Base Cost",
-    "totalCost": "Total Cost",
-    "prizeStructure": "Prize Structure",
-    "enterPinToConfirmPurchase": "Enter your PIN to confirm purchase",
-    "ticketPurchasedSuccessfully": "Ticket purchased successfully!",
-    "winningNumbers": "Winning Numbers",
-    "specialNumber": "Special Number",
-    "totalTickets": "Total Tickets",
-    "totalWinners": "Total Winners",
-    "prizePool": "Prize Pool",
-    "enterPinToConfirmPayment": "Enter your PIN code to confirm payment",
-    "purchase": "Purchase",
-    "multiplierLabel": "Multiplier",
-    "specialOnly": "Special Only",
-    "matches": "Matches",
-    "thoughtDefaultTopic": "Reflection",
-    "thoughtAiName": "SN-chan",
-    "thoughtUserName": "You",
-    "thoughtStreamingHint": "Sn-chan is thinking...",
-    "thoughtInputHint": "Ask sn-chan anything...",
-    "thoughtNewConversation": "Start New Conversation",
-    "thoughtParseError": "Failed to parse AI response",
-    "thoughtFunctionCall": "Function Call",
-    "aiThought": "AI Thought",
-    "aiThoughtTitle": "Let sn-chan think",
-    "postReferenceUnavailable": "Referenced post is unavailable",
-    "fabLocation": "FAB Location"
+    "addTag": "Add Tag"
 }
--- a/assets/i18n/zh-CN.json
+++ b/assets/i18n/zh-CN.json
@@ -1081,14 +1081,5 @@
    "postPublish": "发布帖子",
    "restoreDraftTitle": "恢复草稿",
    "restoreDraftMessage": "发现了一个草稿。你想要恢复它吗？",
-    "draft": "草稿",
-    "thoughtDefaultTopic": "寻思",
-    "thoughtAiName": "SN 酱",
-    "thoughtUserName": "您",
-    "thoughtStreamingHint": "SN 酱正在思考...",
-    "thoughtInputHint": "问 SN 酱任何问题...",
-    "thoughtNewConversation": "开始新对话",
-    "thoughtParseError": "解析 AI 响应失败",
-    "aiThought": "寻思",
-    "aiThoughtTitle": "让 SN 酱寻思寻思"
+    "draft": "草稿"
 }
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,3 +1,6 @@
+# Uncomment this line to define a global platform for your project
+platform :ios, '15.0'
+
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

@@ -25,8 +28,6 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 flutter_ios_podfile_setup

 target 'Runner' do
-  platform :ios, '15.0'
-
  use_frameworks!
  use_modular_headers!

@@ -49,16 +50,6 @@ target 'Runner' do
  end
 end

-target 'WatchRunner Watch App' do
-  platform :watchos, '11.0'
-
-  use_frameworks!
-  use_modular_headers!
-
-  pod 'Kingfisher', '~> 8.0'
-  pod 'KingfisherWebP'
-end
-
 post_install do |installer|
  installer.pods_project.targets.each do |target|
    flutter_additional_ios_build_settings(target)
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2,8 +2,6 @@ PODS:
  - Alamofire (5.10.2)
  - app_links (6.4.1):
    - Flutter
-  - connectivity_plus (0.0.1):
-    - Flutter
  - croppy (0.0.1):
    - Flutter
  - device_info_plus (0.0.1):
@@ -219,25 +217,6 @@ PODS:
  - irondash_engine_context (0.0.1):
    - Flutter
  - Kingfisher (8.6.0)
-  - KingfisherWebP (1.7.2):
-    - Kingfisher (~> 8.0)
-    - libwebp (>= 1.1.0)
-  - libwebp (1.5.0):
-    - libwebp/demux (= 1.5.0)
-    - libwebp/mux (= 1.5.0)
-    - libwebp/sharpyuv (= 1.5.0)
-    - libwebp/webp (= 1.5.0)
-  - libwebp/demux (1.5.0):
-    - libwebp/webp
-  - libwebp/mux (1.5.0):
-    - libwebp/demux
-  - libwebp/sharpyuv (1.5.0)
-  - libwebp/webp (1.5.0):
-    - libwebp/sharpyuv
-  - livekit_client (2.5.3):
-    - Flutter
-    - flutter_webrtc
-    - WebRTC-SDK (= 137.7151.04)
  - local_auth_darwin (0.0.1):
    - Flutter
    - FlutterMacOS
@@ -324,7 +303,6 @@ PODS:
 DEPENDENCIES:
  - Alamofire
  - app_links (from `.symlinks/plugins/app_links/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - croppy (from `.symlinks/plugins/croppy/ios`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - file_picker (from `.symlinks/plugins/file_picker/ios`)
@@ -348,8 +326,6 @@ DEPENDENCIES:
  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
  - irondash_engine_context (from `.symlinks/plugins/irondash_engine_context/ios`)
  - Kingfisher (~> 8.0)
-  - KingfisherWebP
-  - livekit_client (from `.symlinks/plugins/livekit_client/ios`)
  - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
  - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
  - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
@@ -391,8 +367,6 @@ SPEC REPOS:
    - GoogleDataTransport
    - GoogleUtilities
    - Kingfisher
-    - KingfisherWebP
-    - libwebp
    - nanopb
    - OrderedSet
    - PromisesObjC
@@ -406,8 +380,6 @@ SPEC REPOS:
 EXTERNAL SOURCES:
  app_links:
    :path: ".symlinks/plugins/app_links/ios"
-  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
  croppy:
    :path: ".symlinks/plugins/croppy/ios"
  device_info_plus:
@@ -452,8 +424,6 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/image_picker_ios/ios"
  irondash_engine_context:
    :path: ".symlinks/plugins/irondash_engine_context/ios"
-  livekit_client:
-    :path: ".symlinks/plugins/livekit_client/ios"
  local_auth_darwin:
    :path: ".symlinks/plugins/local_auth_darwin/darwin"
  media_kit_libs_ios_video:
@@ -498,7 +468,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
  app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
-  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
  croppy: 979e8ddc254f4642bffe7d52dc7193354b27ba30
  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
@@ -535,12 +504,9 @@ SPEC CHECKSUMS:
  GoogleAppMeasurement: 1e718274b7e015cefd846ac1fcf7820c70dc017d
  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
-  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
  irondash_engine_context: 8e58ca8e0212ee9d1c7dc6a42121849986c88486
  Kingfisher: 64278f126a815d0e2d391cdf71311b85882c4de0
-  KingfisherWebP: 38b9721821947f547afb78f933f75f4f9e0ae402
-  libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
-  livekit_client: 86c8af579274e4b7a215185a8080db2d4e176f40
  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
@@ -549,8 +515,8 @@ SPEC CHECKSUMS:
  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
  pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c
-  path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
-  pointer_interceptor_ios: da06a662d5bfd329602b45b2ab41bc0fb5fdb0f0
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  pointer_interceptor_ios: ec847ef8b0915778bed2b2cef636f4d177fa8eed
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
@@ -558,7 +524,7 @@ SPEC CHECKSUMS:
  SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
  SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a
  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
  sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
  sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
@@ -566,11 +532,11 @@ SPEC CHECKSUMS:
  super_native_extensions: b763c02dc3a8fd078389f410bf15149179020cb4
  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
  syncfusion_flutter_pdfviewer: 90dc48305d2e33d4aa20681d1e98ddeda891bc14
-  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
  WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e

-PODFILE CHECKSUM: 3096dc559be56aca856e757e1dc65ca039801e2e
+PODFILE CHECKSUM: c818292390b02fa379036ea099713a332bd7193f

 COCOAPODS: 1.16.2
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,14 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 77;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		7310A7DF2EB10963002C0FD3 /* WatchRunner Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 7310A7D42EB10962002C0FD3 /* WatchRunner Watch App.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		73ACDFAD2E3D0E6100B63535 /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73ACDFAC2E3D0E6100B63535 /* ReplayKit.framework */; };
 		73ACDFC32E3D0E6100B63535 /* SolianBroadcastExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 73ACDFAB2E3D0E6100B63535 /* SolianBroadcastExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		73C305D82E0BE878009035B9 /* SolianShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -21,7 +20,6 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		A1D34487886D362AC8B99B2E /* Pods_WatchRunner_Watch_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 802C1CFCA7F1E069AAEFB454 /* Pods_WatchRunner_Watch_App.framework */; };
 		B87C0E607033790E71B54D73 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D834CA86410B09796B312B /* Pods_Runner.framework */; };
 		D174D53FF3E8EA943491A5CC /* Pods_SolianShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */; };
 		D1772CE196985AE8E8C9F2E5 /* Pods_SolianNotificationService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39FE4CC6223F0D3C0E1FFD04 /* Pods_SolianNotificationService.framework */; };
@@ -60,17 +58,6 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXCopyFilesBuildPhase section */
-		7310A7DE2EB10963002C0FD3 /* Embed Watch Content */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "$(CONTENTS_FOLDER_PATH)/Watch";
-			dstSubfolderSpec = 16;
-			files = (
-				7310A7DF2EB10963002C0FD3 /* WatchRunner Watch App.app in Embed Watch Content */,
-			);
-			name = "Embed Watch Content";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73268D1D2DEAFD670076E970 /* Embed Foundation Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -97,7 +84,6 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		103EA2362B9E9F127016A1F1 /* Pods-WatchRunner Watch App.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WatchRunner Watch App.profile.xcconfig"; path = "Target Support Files/Pods-WatchRunner Watch App/Pods-WatchRunner Watch App.profile.xcconfig"; sourceTree = "<group>"; };
 		14118AC858B441AB16B7309E /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
@@ -114,7 +100,6 @@
 		39FE4CC6223F0D3C0E1FFD04 /* Pods_SolianNotificationService.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SolianNotificationService.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A1C47BD29CC6AC2587D4DBE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		7310A7D42EB10962002C0FD3 /* WatchRunner Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "WatchRunner Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		737E920B2DB6A9FF00BE9CDB /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		73ACDFAB2E3D0E6100B63535 /* SolianBroadcastExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SolianBroadcastExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		73ACDFAC2E3D0E6100B63535 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; };
@@ -126,8 +111,6 @@
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SolianShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		802C1CFCA7F1E069AAEFB454 /* Pods_WatchRunner_Watch_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WatchRunner_Watch_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		86D60BA96DA647E1B11AA7F0 /* Pods-WatchRunner Watch App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WatchRunner Watch App.debug.xcconfig"; path = "Target Support Files/Pods-WatchRunner Watch App/Pods-WatchRunner Watch App.debug.xcconfig"; sourceTree = "<group>"; };
 		8B40620B1EEBB09456406A3C /* Pods-SolianNotificationService.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianNotificationService.profile.xcconfig"; path = "Target Support Files/Pods-SolianNotificationService/Pods-SolianNotificationService.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -137,7 +120,6 @@
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9AE244813FCDFAA941430393 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
-		A2EB1DAFDE9B8E6D88BBF7A3 /* Pods-WatchRunner Watch App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WatchRunner Watch App.release.xcconfig"; path = "Target Support Files/Pods-WatchRunner Watch App/Pods-WatchRunner Watch App.release.xcconfig"; sourceTree = "<group>"; };
 		A499FDB2082EB000933AA8C5 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		A85FF612AE7623A9934E57CE /* Pods-SolianShareExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianShareExtension.profile.xcconfig"; path = "Target Support Files/Pods-SolianShareExtension/Pods-SolianShareExtension.profile.xcconfig"; sourceTree = "<group>"; };
 		AA0CA8A3E15DEE023BB27438 /* Pods_NotificationService.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NotificationService.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -180,11 +162,6 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		7310A7D52EB10962002C0FD3 /* WatchRunner Watch App */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			path = "WatchRunner Watch App";
-			sourceTree = "<group>";
-		};
 		73268D272DEB012A0076E970 /* Services */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
@@ -228,14 +205,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		7310A7D12EB10962002C0FD3 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				A1D34487886D362AC8B99B2E /* Pods_WatchRunner_Watch_App.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73ACDFA82E3D0E6100B63535 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -289,7 +258,6 @@
 				7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */,
 				73ACDFAC2E3D0E6100B63535 /* ReplayKit.framework */,
 				73ACDFB82E3D0E6100B63535 /* UIKit.framework */,
-				802C1CFCA7F1E069AAEFB454 /* Pods_WatchRunner_Watch_App.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -312,9 +280,6 @@
 				17FAB080A9C53193ABD9C15B /* Pods-SolianShareExtension.debug.xcconfig */,
 				27C66EFB5A705F1A822C3EB0 /* Pods-SolianShareExtension.release.xcconfig */,
 				A85FF612AE7623A9934E57CE /* Pods-SolianShareExtension.profile.xcconfig */,
-				86D60BA96DA647E1B11AA7F0 /* Pods-WatchRunner Watch App.debug.xcconfig */,
-				A2EB1DAFDE9B8E6D88BBF7A3 /* Pods-WatchRunner Watch App.release.xcconfig */,
-				103EA2362B9E9F127016A1F1 /* Pods-WatchRunner Watch App.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -338,7 +303,6 @@
 				73CDD67B2DEC00480059D95D /* SolianNotificationService */,
 				73C305CF2E0BE878009035B9 /* SolianShareExtension */,
 				73ACDFAE2E3D0E6100B63535 /* SolianBroadcastExtension */,
-				7310A7D52EB10962002C0FD3 /* WatchRunner Watch App */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				91E124CE95BCB4DCD890160D /* Pods */,
@@ -355,7 +319,6 @@
 				73CDD67A2DEC00480059D95D /* SolianNotificationService.appex */,
 				73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */,
 				73ACDFAB2E3D0E6100B63535 /* SolianBroadcastExtension.appex */,
-				7310A7D42EB10962002C0FD3 /* WatchRunner Watch App.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -400,28 +363,6 @@
 			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		7310A7D32EB10962002C0FD3 /* WatchRunner Watch App */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7310A7E32EB10963002C0FD3 /* Build configuration list for PBXNativeTarget "WatchRunner Watch App" */;
-			buildPhases = (
-				DDEDA1BA6278B94F0F7B9B61 /* [CP] Check Pods Manifest.lock */,
-				7310A7D02EB10962002C0FD3 /* Sources */,
-				7310A7D12EB10962002C0FD3 /* Frameworks */,
-				7310A7D22EB10962002C0FD3 /* Resources */,
-				C74B07D6587D29C67A198025 /* [CP] Embed Pods Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			fileSystemSynchronizedGroups = (
-				7310A7D52EB10962002C0FD3 /* WatchRunner Watch App */,
-			);
-			name = "WatchRunner Watch App";
-			productName = "WatchRunner Watch App";
-			productReference = 7310A7D42EB10962002C0FD3 /* WatchRunner Watch App.app */;
-			productType = "com.apple.product-type.application";
-		};
 		73ACDFAA2E3D0E6100B63535 /* SolianBroadcastExtension */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 73ACDFCB2E3D0E6100B63535 /* Build configuration list for PBXNativeTarget "SolianBroadcastExtension" */;
@@ -493,7 +434,6 @@
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				73268D1D2DEAFD670076E970 /* Embed Foundation Extensions */,
-				7310A7DE2EB10963002C0FD3 /* Embed Watch Content */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
@@ -523,7 +463,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastSwiftUpdateCheck = 2600;
+				LastSwiftUpdateCheck = 1640;
 				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
@@ -531,9 +471,6 @@
 						CreatedOnToolsVersion = 14.0;
 						TestTargetID = 97C146ED1CF9000F007C117D;
 					};
-					7310A7D32EB10962002C0FD3 = {
-						CreatedOnToolsVersion = 26.0.1;
-					};
 					73ACDFAA2E3D0E6100B63535 = {
 						CreatedOnToolsVersion = 16.4;
 					};
@@ -567,7 +504,6 @@
 				73CDD6792DEC00480059D95D /* SolianNotificationService */,
 				73C305CD2E0BE878009035B9 /* SolianShareExtension */,
 				73ACDFAA2E3D0E6100B63535 /* SolianBroadcastExtension */,
-				7310A7D32EB10962002C0FD3 /* WatchRunner Watch App */,
 			);
 		};
 /* End PBXProject section */
@@ -580,13 +516,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		7310A7D22EB10962002C0FD3 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73ACDFA92E3D0E6100B63535 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -669,14 +598,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -734,14 +659,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -762,49 +683,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		C74B07D6587D29C67A198025 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-WatchRunner Watch App/Pods-WatchRunner Watch App-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-WatchRunner Watch App/Pods-WatchRunner Watch App-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WatchRunner Watch App/Pods-WatchRunner Watch App-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		DDEDA1BA6278B94F0F7B9B61 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-WatchRunner Watch App-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E86CDE9D6464F4F52B910856 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -856,13 +734,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		7310A7D02EB10962002C0FD3 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73ACDFA72E3D0E6100B63535 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1072,144 +943,6 @@
 			};
 			name = Profile;
 		};
-		7310A7E02EB10963002C0FD3 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 86D60BA96DA647E1B11AA7F0 /* Pods-WatchRunner Watch App.debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = W7HPZ53V6B;
-				ENABLE_PREVIEWS = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu17;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = WatchRunner;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
-				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = dev.solsynth.solian;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 1.0;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.watchkitapp;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = watchos;
-				SKIP_INSTALL = YES;
-				STRING_CATALOG_GENERATE_SYMBOLS = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
-				SWIFT_APPROACHABLE_CONCURRENCY = YES;
-				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 26.0;
-			};
-			name = Debug;
-		};
-		7310A7E12EB10963002C0FD3 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = A2EB1DAFDE9B8E6D88BBF7A3 /* Pods-WatchRunner Watch App.release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = W7HPZ53V6B;
-				ENABLE_PREVIEWS = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu17;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = WatchRunner;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
-				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = dev.solsynth.solian;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 1.0;
-				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.watchkitapp;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = watchos;
-				SKIP_INSTALL = YES;
-				STRING_CATALOG_GENERATE_SYMBOLS = YES;
-				SWIFT_APPROACHABLE_CONCURRENCY = YES;
-				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 26.0;
-			};
-			name = Release;
-		};
-		7310A7E22EB10963002C0FD3 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 103EA2362B9E9F127016A1F1 /* Pods-WatchRunner Watch App.profile.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = W7HPZ53V6B;
-				ENABLE_PREVIEWS = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu17;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = WatchRunner;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
-				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = dev.solsynth.solian;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 1.0;
-				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.watchkitapp;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = watchos;
-				SKIP_INSTALL = YES;
-				STRING_CATALOG_GENERATE_SYMBOLS = YES;
-				SWIFT_APPROACHABLE_CONCURRENCY = YES;
-				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 26.0;
-			};
-			name = Profile;
-		};
 		73ACDFC42E3D0E6100B63535 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1754,16 +1487,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		7310A7E32EB10963002C0FD3 /* Build configuration list for PBXNativeTarget "WatchRunner Watch App" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7310A7E02EB10963002C0FD3 /* Debug */,
-				7310A7E12EB10963002C0FD3 /* Release */,
-				7310A7E22EB10963002C0FD3 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		73ACDFCB2E3D0E6100B63535 /* Build configuration list for PBXNativeTarget "SolianBroadcastExtension" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,11 +1,9 @@
 import Flutter
 import UIKit
-import WatchConnectivity

@main
@objc class AppDelegate: FlutterAppDelegate {
    let notifyDelegate = NotifyDelegate()
-    private var watchConnectivityService: WatchConnectivityService?
    
    override func application(
        _ application: UIApplication,
@@ -30,55 +28,6 @@ import WatchConnectivity
        
        GeneratedPluginRegistrant.register(with: self)
        
-        if WCSession.isSupported() {
-            watchConnectivityService = WatchConnectivityService()
-        }
-        
        return super.application(application, didFinishLaunchingWithOptions: launchOptions)
    }
 }
-
-class WatchConnectivityService: NSObject, WCSessionDelegate {
-    private let session: WCSession
-
-    override init() {
-        self.session = .default
-        super.init()
-        print("[iOS] Activating WCSession")
-        self.session.delegate = self
-        self.session.activate()
-    }
-
-    func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {
-        if let error = error {
-            print("[iOS] WCSession activation failed with error: \(error.localizedDescription)")
-            return
-        }
-        print("[iOS] WCSession activated with state: \(activationState.rawValue)")
-    }
-    
-    func sessionDidBecomeInactive(_ session: WCSession) {}
-    
-    func sessionDidDeactivate(_ session: WCSession) {
-        session.activate()
-    }
-
-    func session(_ session: WCSession, didReceiveMessage message: [String : Any], replyHandler: @escaping ([String : Any]) -> Void) {
-        print("[iOS] Received message: \(message)")
-        if let request = message["request"] as? String, request == "data" {
-            let token = UserDefaults.standard.getFlutterToken()
-            let serverUrl = UserDefaults.standard.getServerUrl()
-            
-            print("[iOS] Retrieved token: \(token ?? "nil")")
-            print("[iOS] Retrieved serverUrl: \(serverUrl)")
-            
-            var data: [String: Any] = ["serverUrl": serverUrl]
-            if let token = token {
-                data["token"] = token
-            }
-            
-            print("[iOS] Replying with data: \(data)")
-            replyHandler(data)
-        }
-    }
-}
--- a/ios/Runner/Services/CloudFile.swift
+++ b/ios/Runner/Services/CloudFile.swift
@@ -8,7 +8,7 @@
 import Foundation

 func getAttachmentUrl(for identifier: String) -> String {
-    let serverBaseUrl = UserDefaults.standard.getServerUrl()
+    let serverBaseUrl = "https://api.solian.app"
    
    return identifier.starts(with: "http") ? identifier : "\(serverBaseUrl)/drive/files/\(identifier)"
 }
--- a/ios/Runner/Services/DataExchange.swift
+++ b/ios/Runner/Services/DataExchange.swift
@@ -26,6 +26,6 @@ extension UserDefaults {
    }
    
    func getServerUrl(forKey key: String = "app_server_url") -> String {
-        return self.getFlutterValue(forKey: key) ?? "https://api.solian.app"
+        return self.getFlutterValue(forKey: key) ?? "https://nt.solian.app"
    }
 }
--- a/ios/SolianNotificationService/NotificationService.swift
+++ b/ios/SolianNotificationService/NotificationService.swift
@@ -85,8 +85,15 @@ class NotificationService: UNNotificationServiceExtension {
                customIdentifier: nil
            )
            
+            let intent = self.createMessageIntent(with: sender, meta: metaCopy, body: content.body)
+            self.donateInteraction(for: intent)
+            let updatedContent = try? request.content.updating(from: intent)
            content.categoryIdentifier = "CHAT_MESSAGE"
-            self.contentHandler?(content)
+            if let updatedContent = updatedContent {
+                self.contentHandler?(updatedContent)
+            } else {
+                self.contentHandler?(content)
+            }
        })
    }
    
--- a/App/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/App/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -1,11 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/App/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/App/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,14 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icon.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/App/Assets.xcassets/AppIcon.appiconset/icon.png
+++ b/App/Assets.xcassets/AppIcon.appiconset/icon.png
--- a/App/Assets.xcassets/Contents.json
+++ b/App/Assets.xcassets/Contents.json
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/App/ContentView.swift
+++ b/App/ContentView.swift
@@ -1,15 +0,0 @@
-//
-//  ContentView.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/28.
-//
-
-import SwiftUI
-
-// The root view of the app.
-struct ContentView: View {
-    var body: some View {
-        ExploreView()
-    }
-}
--- a/App/Layouts/FlowLayout.swift
+++ b/App/Layouts/FlowLayout.swift
@@ -1,88 +0,0 @@
-//
-//  FlowLayout.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-
-// MARK: - Custom Layouts
-
-struct FlowLayout: Layout {
-    var alignment: HorizontalAlignment = .leading
-    var spacing: CGFloat = 10
-
-    func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) -> CGSize {
-        let containerWidth = proposal.width ?? 0
-        let sizes = subviews.map { $0.sizeThatFits(.unspecified) }
-
-        var currentX: CGFloat = 0
-        var currentY: CGFloat = 0
-        var lineHeight: CGFloat = 0
-        var totalHeight: CGFloat = 0
-
-        for size in sizes {
-            if currentX + size.width > containerWidth {
-                // New line
-                currentX = 0
-                currentY += lineHeight + spacing
-                totalHeight = currentY + size.height
-                lineHeight = 0
-            }
-
-            currentX += size.width + spacing
-            lineHeight = max(lineHeight, size.height)
-        }
-        totalHeight = currentY + lineHeight
-
-        return CGSize(width: containerWidth, height: totalHeight)
-    }
-
-    func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) {
-        let containerWidth = bounds.width
-        let sizes = subviews.map { $0.sizeThatFits(.unspecified) }
-
-        var currentX: CGFloat = 0
-        var currentY: CGFloat = 0
-        var lineHeight: CGFloat = 0
-        var lineElements: [(offset: Int, size: CGSize)] = []
-
-        func placeLine() {
-            let lineWidth = lineElements.map { $0.size.width }.reduce(0, +) + CGFloat(lineElements.count - 1) * spacing
-            var startX: CGFloat = 0
-            switch alignment {
-            case .leading:
-                startX = bounds.minX
-            case .center:
-                startX = bounds.minX + (containerWidth - lineWidth) / 2
-            case .trailing:
-                startX = bounds.maxX - lineWidth
-            default:
-                startX = bounds.minX
-            }
-
-            var xOffset = startX
-            for (offset, size) in lineElements {
-                subviews[offset].place(at: CGPoint(x: xOffset, y: bounds.minY + currentY), proposal: ProposedViewSize(size)) // Use bounds.minY + currentY
-                xOffset += size.width + spacing
-            }
-            lineElements.removeAll() // Clear elements for the next line
-        }
-
-        for (offset, size) in sizes.enumerated() {
-            if currentX + size.width > containerWidth && !lineElements.isEmpty {
-                // New line
-                placeLine()
-                currentX = 0
-                currentY += lineHeight + spacing
-                lineHeight = 0
-            }
-
-            lineElements.append((offset, size))
-            currentX += size.width + spacing
-            lineHeight = max(lineHeight, size.height)
-        }
-        placeLine() // Place the last line
-    }
-}
--- a/App/Models/Models.swift
+++ b/App/Models/Models.swift
@@ -1,126 +0,0 @@
-//
-//  Models.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import Foundation
-
-// MARK: - Models
-
-struct AppToken: Codable {
-    let token: String
-}
-
-struct SnActivity: Codable, Identifiable {
-    let id: String
-    let type: String
-    let data: ActivityData?
-    let createdAt: Date
-}
-
-enum ActivityData: Codable {
-    case post(SnPost)
-    case discovery(DiscoveryData)
-    case unknown
-
-    init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        if let post = try? container.decode(SnPost.self) {
-            self = .post(post)
-            return
-        }
-        if let discoveryData = try? container.decode(DiscoveryData.self) {
-            self = .discovery(discoveryData)
-            return
-        }
-        self = .unknown
-    }
-
-    func encode(to encoder: Encoder) throws {
-        // Not needed for decoding
-    }
-}
-
-struct SnPost: Codable, Identifiable {
-    let id: String
-    let title: String?
-    let content: String?
-    let publisher: SnPublisher
-    let attachments: [SnCloudFile]
-    let tags: [SnPostTag]
-}
-
-struct DiscoveryData: Codable {
-    let items: [DiscoveryItem]
-}
-
-struct DiscoveryItem: Codable, Identifiable {
-    var id = UUID()
-    let type: String
-    let data: DiscoveryItemData
-
-    enum CodingKeys: String, CodingKey {
-        case type, data
-    }
-}
-
-enum DiscoveryItemData: Codable {
-    case realm(SnRealm)
-    case publisher(SnPublisher)
-    case article(SnWebArticle)
-    case unknown
-
-    init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        if let realm = try? container.decode(SnRealm.self) {
-            self = .realm(realm)
-            return
-        }
-        if let publisher = try? container.decode(SnPublisher.self) {
-            self = .publisher(publisher)
-            return
-        }
-        if let article = try? container.decode(SnWebArticle.self) {
-            self = .article(article)
-            return
-        }
-        self = .unknown
-    }
-    
-    func encode(to encoder: Encoder) throws {
-        // Not needed for decoding
-    }
-}
-
-struct SnRealm: Codable, Identifiable {
-    let id: String
-    let name: String
-    let description: String?
-}
-
-struct SnPublisher: Codable, Identifiable {
-    let id: String
-    let name: String
-    let nick: String?
-    let description: String?
-    let picture: SnCloudFile?
-}
-
-struct SnCloudFile: Codable, Identifiable {
-    let id: String
-    let mimeType: String?
-}
-
-struct SnPostTag: Codable, Identifiable {
-    let id: String
-    let slug: String
-    let name: String?
-}
-
-struct SnWebArticle: Codable, Identifiable {
-    let id: String
-    let title: String
-    let url: String
-}
--- a/App/Previews/CustomPreviews.swift
+++ b/App/Previews/CustomPreviews.swift
@@ -1,15 +0,0 @@
-//
-//  CustomPreviews.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-
-#Preview {
-    NavigationStack {
-        ActivityListView(filter: "Preview", mockActivities: SnActivity.mock)
-            .environmentObject(AppState())
-    }
-}
--- a/App/Previews/MockData.swift
+++ b/App/Previews/MockData.swift
@@ -1,35 +0,0 @@
-//
-//  MockData.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import Foundation
-
-#if DEBUG
-extension SnActivity {
-    static var mock: [SnActivity] {
-        let mockPublisher = SnPublisher(id: "pub1", name: "Mock Publisher", nick: "mock_nick", description: "A publisher for testing", picture: SnCloudFile(id: "mock_avatar_id", mimeType: "image/png"))
-        let mockTag1 = SnPostTag(id: "tag1", slug: "swiftui", name: "SwiftUI")
-        let mockTag2 = SnPostTag(id: "tag2", slug: "watchos", name: "watchOS")
-        let mockAttachment1 = SnCloudFile(id: "mock_image_id_1", mimeType: "image/jpeg")
-        let mockAttachment2 = SnCloudFile(id: "mock_image_id_2", mimeType: "image/png")
-
-        let post1 = SnPost(id: "1", title: "Hello from a Mock Post!", content: "This is a mock post content. It can be a bit longer to see how it wraps.", publisher: mockPublisher, attachments: [mockAttachment1, mockAttachment2], tags: [mockTag1, mockTag2])
-        let activity1 = SnActivity(id: "1", type: "posts.new", data: .post(post1), createdAt: Date())
-        
-        let realm1 = SnRealm(id: "r1", name: "SwiftUI Previews", description: "A place for designing in previews.")
-        let publisher1 = SnPublisher(id: "p1", name: "The Mock Times", nick: "mock_times", description: "All the news that's fit to mock.", picture: nil)
-        let article1 = SnWebArticle(id: "a1", title: "The Art of Mocking Data", url: "https://example.com")
-
-        let discoveryItem1 = DiscoveryItem(type: "realm", data: .realm(realm1))
-        let discoveryItem2 = DiscoveryItem(type: "publisher", data: .publisher(publisher1))
-        let discoveryItem3 = DiscoveryItem(type: "article", data: .article(article1))
-        let discoveryData = DiscoveryData(items: [discoveryItem1, discoveryItem2, discoveryItem3])
-        let activity2 = SnActivity(id: "2", type: "discovery", data: .discovery(discoveryData), createdAt: Date())
-        
-        return [activity1, activity2]
-    }
-}
-#endif
--- a/App/Services/ImageLoader.swift
+++ b/App/Services/ImageLoader.swift
@@ -1,103 +0,0 @@
-//
-//  ImageLoader.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-import Kingfisher
-import KingfisherWebP
-import Combine
-
-// MARK: - Image Loader
-
-@MainActor
-class ImageLoader: ObservableObject {
-    @Published var image: Image?
-    @Published var errorMessage: String?
-    @Published var isLoading = false
-
-    private var dataTask: URLSessionDataTask?
-    private let session: URLSession
-
-    init(session: URLSession = .shared) {
-        self.session = session
-    }
-
-    deinit {
-        dataTask?.cancel()
-    }
-
-    func loadImage(from initialUrl: URL, token: String) async {
-        isLoading = true
-        errorMessage = nil
-        image = nil
-
-        do {
-            // First request with Authorization header
-            var request = URLRequest(url: initialUrl)
-            request.setValue("AtField \(token)", forHTTPHeaderField: "Authorization")
-            request.setValue("SolianWatch/1.0", forHTTPHeaderField: "User-Agent")
-
-            let (data, response) = try await session.data(for: request)
-
-            if let httpResponse = response as? HTTPURLResponse {
-                if httpResponse.statusCode == 302, let redirectLocation = httpResponse.allHeaderFields["Location"] as? String, let redirectUrl = URL(string: redirectLocation) {
-                    print("[watchOS] Redirecting to: \(redirectUrl)")
-                    // Second request to the redirected URL (S3 signed URL) without Authorization header
-                    let (redirectData, _) = try await session.data(from: redirectUrl)
-                    if let uiImage = UIImage(data: redirectData) {
-                        self.image = Image(uiImage: uiImage)
-                        print("[watchOS] Image loaded successfully from redirect URL.")
-                    } else {
-                        // Try KingfisherWebP for WebP
-                        let processor = WebPProcessor.default // Correct usage
-                        if let kfImage = processor.process(item: .data(redirectData), options: KingfisherParsedOptionsInfo(
-                            [
-                                .processor(processor),
-                                .loadDiskFileSynchronously,
-                                .cacheOriginalImage
-                            ]
-                        )) {
-                            self.image = Image(uiImage: kfImage)
-                            print("[watchOS] Image loaded successfully from redirect URL using KingfisherWebP.")
-                        } else {
-                            self.errorMessage = "Invalid image data from redirect (could not decode with KingfisherWebP)."
-                        }
-                    }
-                } else if httpResponse.statusCode == 200 {
-                    if let uiImage = UIImage(data: data) {
-                        self.image = Image(uiImage: uiImage)
-                        print("[watchOS] Image loaded successfully from initial URL.")
-                    } else {
-                        // Try KingfisherWebP for WebP
-                        let processor = WebPProcessor.default // Correct usage
-                        if let kfImage = processor.process(item: .data(data), options: KingfisherParsedOptionsInfo(
-                            [
-                                .processor(processor),
-                                .loadDiskFileSynchronously,
-                                .cacheOriginalImage
-                            ]
-                        )) {
-                            self.image = Image(uiImage: kfImage)
-                            print("[watchOS] Image loaded successfully from initial URL using KingfisherWebP.")
-                        } else {
-                            self.errorMessage = "Invalid image data (could not decode with KingfisherWebP)."
-                        }
-                    }
-                } else {
-                    self.errorMessage = "HTTP Status Code: \(httpResponse.statusCode)"
-                }
-            }
-        } catch {
-            self.errorMessage = error.localizedDescription
-            print("[watchOS] Image loading failed: \(error.localizedDescription)")
-        }
-        isLoading = false
-    }
-
-    func cancel() {
-        dataTask?.cancel()
-    }
-}
--- a/App/Services/NetworkService.swift
+++ b/App/Services/NetworkService.swift
@@ -1,69 +0,0 @@
-//
-//  NetworkService.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import Foundation
-
-// MARK: - Network Service
-
-class NetworkService {
-    private let session = URLSession.shared
-
-    func fetchActivities(filter: String, cursor: String? = nil, token: String, serverUrl: String) async throws -> [SnActivity] {
-        guard let baseURL = URL(string: serverUrl) else {
-            throw URLError(.badURL)
-        }
-        var components = URLComponents(url: baseURL.appendingPathComponent("/sphere/activities"), resolvingAgainstBaseURL: false)!
-        var queryItems = [URLQueryItem(name: "take", value: "20")]
-        if filter.lowercased() != "explore" {
-            queryItems.append(URLQueryItem(name: "filter", value: filter.lowercased()))
-        }
-        if let cursor = cursor {
-            queryItems.append(URLQueryItem(name: "cursor", value: cursor))
-        }
-        components.queryItems = queryItems
-
-        var request = URLRequest(url: components.url!)
-        request.httpMethod = "GET"
-        request.setValue("application/json", forHTTPHeaderField: "Accept")
-        
-        request.setValue("AtField \(token)", forHTTPHeaderField: "Authorization")
-        request.setValue("SolianWatch/1.0", forHTTPHeaderField: "User-Agent")
-
-        let (data, _) = try await session.data(for: request)
-        
-        let decoder = JSONDecoder()
-        decoder.dateDecodingStrategy = .iso8601
-        decoder.keyDecodingStrategy = .convertFromSnakeCase
-        
-        return try decoder.decode([SnActivity].self, from: data)
-    }
-
-    func createPost(title: String, content: String, token: String, serverUrl: String) async throws {
-        guard let baseURL = URL(string: serverUrl) else {
-            throw URLError(.badURL)
-        }
-        let url = baseURL.appendingPathComponent("/sphere/posts")
-
-        var request = URLRequest(url: url)
-        request.httpMethod = "POST"
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.setValue("application/json", forHTTPHeaderField: "Accept")
-        request.setValue("AtField \(token)", forHTTPHeaderField: "Authorization")
-        request.setValue("SolianWatch/1.0", forHTTPHeaderField: "User-Agent")
-
-        let body: [String: Any] = ["title": title, "content": content]
-        request.httpBody = try JSONSerialization.data(withJSONObject: body)
-
-        let (data, response) = try await session.data(for: request)
-
-        if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode != 201 {
-            let responseBody = String(data: data, encoding: .utf8) ?? ""
-            print("[watchOS] createPost failed with status code: \(httpResponse.statusCode), body: \(responseBody)")
-            throw URLError(URLError.Code(rawValue: httpResponse.statusCode))
-        }
-    }
-}
--- a/App/State/AppState.swift
+++ b/App/State/AppState.swift
@@ -1,38 +0,0 @@
-//
-//  AppState.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-import Combine
-
-// MARK: - App State
-
-@MainActor
-class AppState: ObservableObject {
-    @Published var token: String? = nil
-    @Published var serverUrl: String? = nil
-    @Published var isReady = false
-    
-    private var wcService = WatchConnectivityService()
-    private var cancellables = Set<AnyCancellable>()
-
-    init() {
-        wcService.$token.combineLatest(wcService.$serverUrl)
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] token, serverUrl in
-                self?.token = token
-                self?.serverUrl = serverUrl
-                if token != nil && serverUrl != nil {
-                    self?.isReady = true
-                }
-            }
-            .store(in: &cancellables)
-    }
-    
-    func requestData() {
-        wcService.requestDataFromPhone()
-    }
-}
--- a/App/State/WatchConnectivityService.swift
+++ b/App/State/WatchConnectivityService.swift
@@ -1,72 +0,0 @@
-//
-//  WatchConnectivityService.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import Foundation
-import WatchConnectivity
-import Combine
-
-// MARK: - Watch Connectivity
-
-class WatchConnectivityService: NSObject, WCSessionDelegate, ObservableObject {
-    @Published var token: String?
-    @Published var serverUrl: String?
-
-    private let session: WCSession
-
-    override init() {
-        self.session = .default
-        super.init()
-        print("[watchOS] Activating WCSession")
-        self.session.delegate = self
-        self.session.activate()
-    }
-
-    func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {
-        if let error = error {
-            print("[watchOS] WCSession activation failed with error: \(error.localizedDescription)")
-            return
-        }
-        print("[watchOS] WCSession activated with state: \(activationState.rawValue)")
-        if activationState == .activated {
-            requestDataFromPhone()
-        }
-    }
-
-    func session(_ session: WCSession, didReceiveMessage message: [String : Any]) {
-        print("[watchOS] Received message: \(message)")
-        DispatchQueue.main.async {
-            if let token = message["token"] as? String {
-                self.token = token
-            }
-            if let serverUrl = message["serverUrl"] as? String {
-                self.serverUrl = serverUrl
-            }
-        }
-    }
-
-    func requestDataFromPhone() {
-        guard session.isReachable else {
-            print("[watchOS] Phone is not reachable")
-            return
-        }
-        
-        print("[watchOS] Requesting data from phone")
-        session.sendMessage(["request": "data"]) { [weak self] response in
-            print("[watchOS] Received reply: \(response)")
-            DispatchQueue.main.async {
-                if let token = response["token"] as? String {
-                    self?.token = token
-                }
-                if let serverUrl = response["serverUrl"] as? String {
-                    self?.serverUrl = serverUrl
-                }
-            }
-        } errorHandler: { error in
-            print("[watchOS] sendMessage failed with error: \(error.localizedDescription)")
-        }
-    }
-}
--- a/App/Utils/AttachmentUtils.swift
+++ b/App/Utils/AttachmentUtils.swift
@@ -1,21 +0,0 @@
-//
-//  AttachmentUtils.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import Foundation
-
-// MARK: - Helper Functions
-
-func getAttachmentUrl(for fileId: String, serverUrl: String) -> URL? {
-    let urlString: String
-    if fileId.starts(with: "http") {
-        urlString = fileId
-    } else {
-        urlString = "\(serverUrl)/drive/files/\(fileId)"
-    }
-    print("[watchOS] Generated image URL: \(urlString)")
-    return URL(string: urlString)
-}
--- a/App/ViewModels/ActivityViewModel.swift
+++ b/App/ViewModels/ActivityViewModel.swift
@@ -1,50 +0,0 @@
-//
-//  ActivityViewModel.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import Foundation
-import Combine
-
-// MARK: - View Models
-
-@MainActor
-class ActivityViewModel: ObservableObject {
-    @Published var activities: [SnActivity] = []
-    @Published var isLoading = false
-    @Published var errorMessage: String?
-
-    private let networkService = NetworkService()
-    let filter: String
-    private var isMock = false
-    private var hasFetched = false // Add this
-
-    init(filter: String, mockActivities: [SnActivity]? = nil) {
-        self.filter = filter
-        if let mockActivities = mockActivities {
-            self.activities = mockActivities
-            self.isMock = true
-        }
-    }
-
-    func fetchActivities(token: String, serverUrl: String) async {
-        if isMock || hasFetched { return } // Check hasFetched
-        guard !isLoading else { return }
-        isLoading = true
-        errorMessage = nil
-        hasFetched = true // Set hasFetched
-
-        do {
-            let fetchedActivities = try await networkService.fetchActivities(filter: filter, token: token, serverUrl: serverUrl)
-            self.activities = fetchedActivities
-        } catch {
-            self.errorMessage = error.localizedDescription
-            print("[watchOS] fetchActivities failed with error: \(error)")
-            hasFetched = false // Reset on error
-        }
-
-        isLoading = false
-    }
-}
--- a/App/ViewModels/ComposePostViewModel.swift
+++ b/App/ViewModels/ComposePostViewModel.swift
@@ -1,35 +0,0 @@
-//
-//  ComposePostViewModel.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import Foundation
-import Combine
-
-@MainActor
-class ComposePostViewModel: ObservableObject {
-    @Published var title = ""
-    @Published var content = ""
-    @Published var isPosting = false
-    @Published var errorMessage: String?
-    @Published var didPost = false
-
-    private let networkService = NetworkService()
-
-    func createPost(token: String, serverUrl: String) async {
-        guard !isPosting else { return }
-        isPosting = true
-        errorMessage = nil
-
-        do {
-            try await networkService.createPost(title: title, content: content, token: token, serverUrl: serverUrl)
-            didPost = true
-        } catch {
-            errorMessage = error.localizedDescription
-        }
-
-        isPosting = false
-    }
-}
--- a/App/Views/ActivityListView.swift
+++ b/App/Views/ActivityListView.swift
@@ -1,66 +0,0 @@
-//
-//  ActivityListView.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-
-// MARK: - Views
-
-struct ActivityListView: View {
-    @StateObject private var viewModel: ActivityViewModel
-    @EnvironmentObject var appState: AppState
-    
-    init(filter: String, mockActivities: [SnActivity]? = nil) {
-        _viewModel = StateObject(wrappedValue: ActivityViewModel(filter: filter, mockActivities: mockActivities))
-    }
-    
-    var body: some View {
-        Group {
-            if viewModel.isLoading {
-                ProgressView()
-            } else if let errorMessage = viewModel.errorMessage {
-                VStack {
-                    Text("Error fetching data")
-                        .font(.headline)
-                    Text(errorMessage)
-                        .font(.caption)
-                        .lineLimit(nil)
-                }
-                .padding()
-            } else if viewModel.activities.isEmpty {
-                Text("No activities found.")
-            } else {
-                List(viewModel.activities) { activity in
-                    switch activity.type {
-                    case "posts.new", "posts.new.replies":
-                        if case .post(let post) = activity.data {
-                            NavigationLink(
-                                destination: PostDetailView(post: post).environmentObject(appState)
-                            ) {
-                                PostRowView(post: post)
-                            }
-                        }
-                    case "discovery":
-                        if case .discovery(let discoveryData) = activity.data {
-                            DiscoveryView(discoveryData: discoveryData)
-                        }
-                    default:
-                        Text("Unknown activity type: \(activity.type)")
-                    }
-                }
-            }
-        }
-        .onAppear {
-            if appState.isReady, let token = appState.token, let serverUrl = appState.serverUrl {
-                Task.detached {
-                    await viewModel.fetchActivities(token: token, serverUrl: serverUrl)
-                }
-            }
-        }
-        .navigationTitle(viewModel.filter)
-        .navigationBarTitleDisplayMode(.inline)
-    }
-}
--- a/App/Views/AttachmentImageView.swift
+++ b/App/Views/AttachmentImageView.swift
@@ -1,38 +0,0 @@
-//
-//  AttachmentImageView.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-
-struct AttachmentImageView: View {
-    let attachment: SnCloudFile
-    @EnvironmentObject var appState: AppState
-    @StateObject private var imageLoader = ImageLoader()
-
-    var body: some View {
-        Group {
-            if imageLoader.isLoading {
-                ProgressView()
-            } else if let image = imageLoader.image {
-                image
-                    .resizable()
-                    .aspectRatio(contentMode: .fit)
-                    .frame(maxWidth: .infinity)
-            } else if let errorMessage = imageLoader.errorMessage {
-                Text("Failed to load attachment: \(errorMessage)")
-                    .font(.caption)
-                    .foregroundColor(.red)
-            } else {
-                Text("File: \(attachment.id)")
-            }
-        }
-        .task(id: attachment.id) {
-            if let serverUrl = appState.serverUrl, let imageUrl = getAttachmentUrl(for: attachment.id, serverUrl: serverUrl), let token = appState.token, attachment.mimeType?.starts(with: "image") == true {
-                await imageLoader.loadImage(from: imageUrl, token: token)
-            }
-        }
-    }
-}
--- a/App/Views/ComposePostView.swift
+++ b/App/Views/ComposePostView.swift
@@ -1,52 +0,0 @@
-//
-//  ComposePostView.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-
-struct ComposePostView: View {
-    @StateObject private var viewModel = ComposePostViewModel()
-    @EnvironmentObject var appState: AppState
-    @Environment(\.dismiss) private var dismiss
-
-    var body: some View {
-        NavigationStack {
-            Form {
-                TextField("Title", text: $viewModel.title)
-                TextField("Content", text: $viewModel.content)
-                    .frame(height: 100)
-            }
-            .navigationTitle("New Post")
-            .toolbar {
-                ToolbarItem(placement: .cancellationAction) {
-                    Button("Cancel") {
-                        dismiss()
-                    }
-                }
-                ToolbarItem(placement: .confirmationAction) {
-                    Button("Post") {
-                        Task {
-                            if let token = appState.token, let serverUrl = appState.serverUrl {
-                                await viewModel.createPost(token: token, serverUrl: serverUrl)
-                            }
-                        }
-                    }
-                    .disabled(viewModel.isPosting)
-                }
-            }
-            .onChange(of: viewModel.didPost) {
-                if viewModel.didPost {
-                    dismiss()
-                }
-            }
-            .alert("Error", isPresented: .constant(viewModel.errorMessage != nil), actions: {
-                Button("OK") { viewModel.errorMessage = nil }
-            }, message: {
-                Text(viewModel.errorMessage ?? "")
-            })
-        }
-    }
-}
--- a/App/Views/DiscoveryViews.swift
+++ b/App/Views/DiscoveryViews.swift
@@ -1,110 +0,0 @@
-//
-//  DiscoveryViews.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-
-struct DiscoveryView: View {
-    let discoveryData: DiscoveryData
-
-    var body: some View {
-        NavigationLink(destination: DiscoveryDetailView(discoveryData: discoveryData)) {
-            VStack(alignment: .leading) {
-                Text("Discovery")
-                    .font(.headline)
-                Text("\(discoveryData.items.count) new items to discover")
-                    .font(.subheadline)
-                    .foregroundColor(.secondary)
-            }
-        }
-    }
-}
-
-struct DiscoveryDetailView: View {
-    let discoveryData: DiscoveryData
-
-    var body: some View {
-        List(discoveryData.items) { item in
-            NavigationLink(destination: destinationView(for: item)) {
-                itemView(for: item)
-            }
-        }
-        .navigationTitle("Discovery")
-    }
-
-    @ViewBuilder
-    private func itemView(for item: DiscoveryItem) -> some View {
-        VStack(alignment: .leading) {
-            switch item.data {
-            case .realm(let realm):
-                Text("Realm").font(.headline)
-                Text(realm.name).foregroundColor(.secondary)
-            case .publisher(let publisher):
-                Text("Publisher").font(.headline)
-                Text(publisher.name).foregroundColor(.secondary)
-            case .article(let article):
-                Text("Article").font(.headline)
-                Text(article.title).foregroundColor(.secondary)
-            case .unknown:
-                Text("Unknown item")
-            }
-        }
-    }
-    
-    @ViewBuilder
-    private func destinationView(for item: DiscoveryItem) -> some View {
-        switch item.data {
-        case .realm(let realm):
-            RealmDetailView(realm: realm)
-        case .publisher(let publisher):
-            PublisherDetailView(publisher: publisher)
-        case .article(let article):
-            ArticleDetailView(article: article)
-        case .unknown:
-            Text("Detail view not available")
-        }
-    }
-}
-
-struct RealmDetailView: View {
-    let realm: SnRealm
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Text(realm.name).font(.headline)
-            if let description = realm.description {
-                Text(description).font(.body)
-            }
-        }
-        .navigationTitle("Realm")
-    }
-}
-
-struct PublisherDetailView: View {
-    let publisher: SnPublisher
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Text(publisher.name).font(.headline)
-            if let description = publisher.description {
-                Text(description).font(.body)
-            }
-        }
-        .navigationTitle("Publisher")
-    }
-}
-
-struct ArticleDetailView: View {
-    let article: SnWebArticle
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Text(article.title).font(.headline)
-            Text(article.url).font(.caption).foregroundColor(.secondary)
-        }
-        .navigationTitle("Article")
-    }
-}
--- a/App/Views/ExploreView.swift
+++ b/App/Views/ExploreView.swift
@@ -1,59 +0,0 @@
-//
-//  ExploreView.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-
-// The main view with the TabView for filtering.
-struct ExploreView: View {
-    @StateObject private var appState = AppState()
-    @State private var isComposing = false
-    @State private var selectedTab: String = "Explore"
-
-    var body: some View {
-        NavigationStack {
-            if appState.isReady {
-                TabView(selection: $selectedTab) {
-                    ActivityListView(filter: "Explore")
-                        .tag("Explore")
-                        .tabItem {
-                            Label("Explore", systemImage: "safari")
-                        }
-
-                    ActivityListView(filter: "Subscriptions")
-                        .tag("Subscriptions")
-                        .tabItem {
-                            Label("Subscriptions", systemImage: "star")
-                        }
-
-                    ActivityListView(filter: "Friends")
-                        .tag("Friends")
-                        .tabItem {
-                            Label("Friends", systemImage: "person.2")
-                        }
-                }
-                .navigationTitle(selectedTab)
-                .toolbar {
-                    ToolbarItem(placement: .primaryAction) {
-                        Button(action: { isComposing = true }) {
-                            Label("Compose", systemImage: "plus")
-                        }
-                    }
-                }
-                .environmentObject(appState)
-            } else {
-                ProgressView { Text("Connecting to phone...") }
-                    .onAppear {
-                        appState.requestData()
-                    }
-            }
-        }
-        .sheet(isPresented: $isComposing) {
-            ComposePostView()
-                .environmentObject(appState)
-        }
-    }
-}
--- a/App/Views/PostViews.swift
+++ b/App/Views/PostViews.swift
@@ -1,142 +0,0 @@
-//
-//  PostViews.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/29.
-//
-
-import SwiftUI
-
-struct PostRowView: View {
-    let post: SnPost
-    @EnvironmentObject var appState: AppState
-    @StateObject private var imageLoader = ImageLoader() // Instantiate ImageLoader
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 4) {
-            HStack {
-                if let serverUrl = appState.serverUrl, let pictureId = post.publisher.picture?.id, let imageUrl = getAttachmentUrl(for: pictureId, serverUrl: serverUrl), let token = appState.token {
-                    if imageLoader.isLoading {
-                        ProgressView()
-                            .frame(width: 24, height: 24)
-                    } else if let image = imageLoader.image {
-                        image
-                            .resizable()
-                            .frame(width: 24, height: 24)
-                            .clipShape(Circle())
-                    } else if let errorMessage = imageLoader.errorMessage {
-                        Text("Failed: \(errorMessage)")
-                            .font(.caption)
-                            .foregroundColor(.red)
-                            .frame(width: 24, height: 24)
-                    } else {
-                        // Placeholder if no image and not loading
-                        Image(systemName: "person.circle.fill")
-                            .resizable()
-                            .frame(width: 24, height: 24)
-                            .clipShape(Circle())
-                            .foregroundColor(.gray)
-                    }
-                }
-                Text(post.publisher.nick ?? post.publisher.name)
-                    .font(.subheadline)
-                    .bold()
-            }
-            .task(id: post.publisher.picture?.id) { // Use task(id:) to reload image when pictureId changes
-                if let serverUrl = appState.serverUrl, let pictureId = post.publisher.picture?.id, let imageUrl = getAttachmentUrl(for: pictureId, serverUrl: serverUrl), let token = appState.token {
-                    await imageLoader.loadImage(from: imageUrl, token: token)
-                }
-            }
-            
-            if let title = post.title, !title.isEmpty {
-                Text(title)
-                    .font(.headline)
-            }
-            
-            if let content = post.content, !content.isEmpty {
-                Text(content)
-                    .font(.body)
-            }
-        }
-    }
-}
-
-struct PostDetailView: View {
-    let post: SnPost
-    @EnvironmentObject var appState: AppState
-    @StateObject private var publisherImageLoader = ImageLoader() // Instantiate ImageLoader for publisher avatar
-
-    var body: some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 8) {
-                HStack {
-                    if let serverUrl = appState.serverUrl, let pictureId = post.publisher.picture?.id, let imageUrl = getAttachmentUrl(for: pictureId, serverUrl: serverUrl), let token = appState.token {
-                        if publisherImageLoader.isLoading {
-                            ProgressView()
-                                .frame(width: 32, height: 32)
-                        } else if let image = publisherImageLoader.image {
-                            image
-                                .resizable()
-                                .frame(width: 32, height: 32)
-                                .clipShape(Circle())
-                        } else if let errorMessage = publisherImageLoader.errorMessage {
-                            Text("Failed: \(errorMessage)")
-                                .font(.caption)
-                                .foregroundColor(.red)
-                                .frame(width: 32, height: 32)
-                        } else {
-                            Image(systemName: "person.circle.fill")
-                                .resizable()
-                                .frame(width: 32, height: 32)
-                                .clipShape(Circle())
-                                .foregroundColor(.gray)
-                        }
-                    }
-                    Text("@\(post.publisher.name)")
-                        .font(.headline)
-                }
-                .task(id: post.publisher.picture?.id) { // Use task(id:) to reload image when pictureId changes
-                    if let serverUrl = appState.serverUrl, let pictureId = post.publisher.picture?.id, let imageUrl = getAttachmentUrl(for: pictureId, serverUrl: serverUrl), let token = appState.token {
-                        await publisherImageLoader.loadImage(from: imageUrl, token: token)
-                    }
-                }
-                
-                if let title = post.title, !title.isEmpty {
-                    Text(title)
-                        .font(.title2)
-                        .bold()
-                }
-                
-                if let content = post.content, !content.isEmpty {
-                    Text(content)
-                        .font(.body)
-                }
-                
-                if !post.attachments.isEmpty {
-                    Divider()
-                    Text("Attachments").font(.headline)
-                    ForEach(post.attachments) { attachment in
-                        AttachmentImageView(attachment: attachment)
-                    }
-                }
-                
-                if !post.tags.isEmpty {
-                    Divider()
-                    Text("Tags").font(.headline)
-                    FlowLayout(alignment: .leading, spacing: 4) {
-                        ForEach(post.tags) { tag in
-                            Text("#\(tag.name ?? tag.slug)")
-                                .font(.caption)
-                                .padding(.horizontal, 6)
-                                .padding(.vertical, 3)
-                                .background(Capsule().fill(Color.accentColor.opacity(0.2)))
-                                .cornerRadius(5)
-                        }
-                    }
-                }
-            }
-            .padding()
-        }
-        .navigationTitle("Post")
-    }
-}
--- a/App/WatchRunnerApp.swift
+++ b/App/WatchRunnerApp.swift
@@ -1,17 +0,0 @@
-//
-//  WatchRunnerApp.swift
-//  WatchRunner Watch App
-//
-//  Created by LittleSheep on 2025/10/28.
-//
-
-import SwiftUI
-
-@main
-struct WatchRunner_Watch_AppApp: App {
-    var body: some Scene {
-        WindowGroup {
-            ContentView()
-        }
-    }
-}
--- a/lib/models/chat.dart
+++ b/lib/models/chat.dart
@@ -149,6 +149,8 @@ sealed class CallParticipant with _$CallParticipant {
  const factory CallParticipant({
    required String identity,
    required String name,
+    required String accountId,
+    @Default(null) SnAccount? account,
    required DateTime joinedAt,
  }) = _CallParticipant;

--- a/lib/models/chat.freezed.dart
+++ b/lib/models/chat.freezed.dart
@@ -2241,7 +2241,7 @@ as List<CallParticipant>,
 /// @nodoc
 mixin _$CallParticipant {

- String get identity; String get name; DateTime get joinedAt;
+ String get identity; String get name; String get accountId; SnAccount? get account; DateTime get joinedAt;
 /// Create a copy of CallParticipant
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -2254,16 +2254,16 @@ $CallParticipantCopyWith<CallParticipant> get copyWith => _$CallParticipantCopyW

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is CallParticipant&&(identical(other.identity, identity) || other.identity == identity)&&(identical(other.name, name) || other.name == name)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CallParticipant&&(identical(other.identity, identity) || other.identity == identity)&&(identical(other.name, name) || other.name == name)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,identity,name,joinedAt);
+int get hashCode => Object.hash(runtimeType,identity,name,accountId,account,joinedAt);

@override
 String toString() {
-  return 'CallParticipant(identity: $identity, name: $name, joinedAt: $joinedAt)';
+  return 'CallParticipant(identity: $identity, name: $name, accountId: $accountId, account: $account, joinedAt: $joinedAt)';
 }


@@ -2274,11 +2274,11 @@ abstract mixin class $CallParticipantCopyWith<$Res>  {
  factory $CallParticipantCopyWith(CallParticipant value, $Res Function(CallParticipant) _then) = _$CallParticipantCopyWithImpl;
@useResult
 $Res call({
- String identity, String name, DateTime joinedAt
+ String identity, String name, String accountId, SnAccount? account, DateTime joinedAt
 });


-
+$SnAccountCopyWith<$Res>? get account;

 }
 /// @nodoc
@@ -2291,15 +2291,29 @@ class _$CallParticipantCopyWithImpl<$Res>

 /// Create a copy of CallParticipant
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? identity = null,Object? name = null,Object? joinedAt = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? identity = null,Object? name = null,Object? accountId = null,Object? account = freezed,Object? joinedAt = null,}) {
  return _then(_self.copyWith(
 identity: null == identity ? _self.identity : identity // ignore: cast_nullable_to_non_nullable
 as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
-as String,joinedAt: null == joinedAt ? _self.joinedAt : joinedAt // ignore: cast_nullable_to_non_nullable
+as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount?,joinedAt: null == joinedAt ? _self.joinedAt : joinedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,
  ));
 }
+/// Create a copy of CallParticipant
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res>? get account {
+    if (_self.account == null) {
+    return null;
+  }

+  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}
 }


@@ -2378,10 +2392,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String identity,  String name,  DateTime joinedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String identity,  String name,  String accountId,  SnAccount? account,  DateTime joinedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _CallParticipant() when $default != null:
-return $default(_that.identity,_that.name,_that.joinedAt);case _:
+return $default(_that.identity,_that.name,_that.accountId,_that.account,_that.joinedAt);case _:
  return orElse();

 }
@@ -2399,10 +2413,10 @@ return $default(_that.identity,_that.name,_that.joinedAt);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String identity,  String name,  DateTime joinedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String identity,  String name,  String accountId,  SnAccount? account,  DateTime joinedAt)  $default,) {final _that = this;
 switch (_that) {
 case _CallParticipant():
-return $default(_that.identity,_that.name,_that.joinedAt);}
+return $default(_that.identity,_that.name,_that.accountId,_that.account,_that.joinedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -2416,10 +2430,10 @@ return $default(_that.identity,_that.name,_that.joinedAt);}
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String identity,  String name,  DateTime joinedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String identity,  String name,  String accountId,  SnAccount? account,  DateTime joinedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _CallParticipant() when $default != null:
-return $default(_that.identity,_that.name,_that.joinedAt);case _:
+return $default(_that.identity,_that.name,_that.accountId,_that.account,_that.joinedAt);case _:
  return null;

 }
@@ -2431,11 +2445,13 @@ return $default(_that.identity,_that.name,_that.joinedAt);case _:
@JsonSerializable()

 class _CallParticipant implements CallParticipant {
-  const _CallParticipant({required this.identity, required this.name, required this.joinedAt});
+  const _CallParticipant({required this.identity, required this.name, required this.accountId, this.account = null, required this.joinedAt});
  factory _CallParticipant.fromJson(Map<String, dynamic> json) => _$CallParticipantFromJson(json);

@override final  String identity;
@override final  String name;
+@override final  String accountId;
+@override@JsonKey() final  SnAccount? account;
@override final  DateTime joinedAt;

 /// Create a copy of CallParticipant
@@ -2451,16 +2467,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CallParticipant&&(identical(other.identity, identity) || other.identity == identity)&&(identical(other.name, name) || other.name == name)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CallParticipant&&(identical(other.identity, identity) || other.identity == identity)&&(identical(other.name, name) || other.name == name)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,identity,name,joinedAt);
+int get hashCode => Object.hash(runtimeType,identity,name,accountId,account,joinedAt);

@override
 String toString() {
-  return 'CallParticipant(identity: $identity, name: $name, joinedAt: $joinedAt)';
+  return 'CallParticipant(identity: $identity, name: $name, accountId: $accountId, account: $account, joinedAt: $joinedAt)';
 }


@@ -2471,11 +2487,11 @@ abstract mixin class _$CallParticipantCopyWith<$Res> implements $CallParticipant
  factory _$CallParticipantCopyWith(_CallParticipant value, $Res Function(_CallParticipant) _then) = __$CallParticipantCopyWithImpl;
@override @useResult
 $Res call({
- String identity, String name, DateTime joinedAt
+ String identity, String name, String accountId, SnAccount? account, DateTime joinedAt
 });


-
+@override $SnAccountCopyWith<$Res>? get account;

 }
 /// @nodoc
@@ -2488,16 +2504,30 @@ class __$CallParticipantCopyWithImpl<$Res>

 /// Create a copy of CallParticipant
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? identity = null,Object? name = null,Object? joinedAt = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? identity = null,Object? name = null,Object? accountId = null,Object? account = freezed,Object? joinedAt = null,}) {
  return _then(_CallParticipant(
 identity: null == identity ? _self.identity : identity // ignore: cast_nullable_to_non_nullable
 as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
-as String,joinedAt: null == joinedAt ? _self.joinedAt : joinedAt // ignore: cast_nullable_to_non_nullable
+as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount?,joinedAt: null == joinedAt ? _self.joinedAt : joinedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,
  ));
 }

+/// Create a copy of CallParticipant
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res>? get account {
+    if (_self.account == null) {
+    return null;
+  }

+  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}
 }


--- a/lib/models/chat.g.dart
+++ b/lib/models/chat.g.dart
@@ -275,6 +275,11 @@ _CallParticipant _$CallParticipantFromJson(Map<String, dynamic> json) =>
    _CallParticipant(
      identity: json['identity'] as String,
      name: json['name'] as String,
+      accountId: json['account_id'] as String,
+      account:
+          json['account'] == null
+              ? null
+              : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
      joinedAt: DateTime.parse(json['joined_at'] as String),
    );

@@ -282,6 +287,8 @@ Map<String, dynamic> _$CallParticipantToJson(_CallParticipant instance) =>
    <String, dynamic>{
      'identity': instance.identity,
      'name': instance.name,
+      'account_id': instance.accountId,
+      'account': instance.account?.toJson(),
      'joined_at': instance.joinedAt.toIso8601String(),
    };

--- a/lib/models/post.dart
+++ b/lib/models/post.dart
@@ -47,12 +47,9 @@ sealed class SnPost with _$SnPost {
    @Default([]) List<SnPostTag> tags,
    @Default([]) List<SnPostCategory> categories,
    @Default([]) List<dynamic> collections,
-    @Default([]) List<SnPostFeaturedRecord> featuredRecords,
    @Default(null) DateTime? createdAt,
    @Default(null) DateTime? updatedAt,
    DateTime? deletedAt,
-    @Default(false) bool repliedGone,
-    @Default(false) bool forwardedGone,
    @Default(false) bool isTruncated,
  }) = _SnPost;

@@ -164,19 +161,3 @@ sealed class SnPostReaction with _$SnPostReaction {
  factory SnPostReaction.fromJson(Map<String, dynamic> json) =>
      _$SnPostReactionFromJson(json);
 }
-
-@freezed
-sealed class SnPostFeaturedRecord with _$SnPostFeaturedRecord {
-  const factory SnPostFeaturedRecord({
-    required String id,
-    required String postId,
-    required DateTime? featuredAt,
-    required int socialCredits,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
-  }) = _SnPostFeaturedRecord;
-
-  factory SnPostFeaturedRecord.fromJson(Map<String, dynamic> json) =>
-      _$SnPostFeaturedRecordFromJson(json);
-}
--- a/lib/models/post.freezed.dart
+++ b/lib/models/post.freezed.dart
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnPost {

- String get id; String? get title; String? get description; String? get language; DateTime? get editedAt; DateTime? get publishedAt; int get visibility; String? get content; String? get slug; int get type; Map<String, dynamic>? get meta; SnPostEmbedView? get embedView; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; int get awardedScore; int? get pinMode; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; String? get realmId; SnRealm? get realm; List<SnCloudFile> get attachments; SnPublisher get publisher; Map<String, int> get reactionsCount; Map<String, bool> get reactionsMade; List<dynamic> get reactions; List<SnPostTag> get tags; List<SnPostCategory> get categories; List<dynamic> get collections; List<SnPostFeaturedRecord> get featuredRecords; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt; bool get repliedGone; bool get forwardedGone; bool get isTruncated;
+ String get id; String? get title; String? get description; String? get language; DateTime? get editedAt; DateTime? get publishedAt; int get visibility; String? get content; String? get slug; int get type; Map<String, dynamic>? get meta; SnPostEmbedView? get embedView; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; int get awardedScore; int? get pinMode; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; String? get realmId; SnRealm? get realm; List<SnCloudFile> get attachments; SnPublisher get publisher; Map<String, int> get reactionsCount; Map<String, bool> get reactionsMade; List<dynamic> get reactions; List<SnPostTag> get tags; List<SnPostCategory> get categories; List<dynamic> get collections; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt; bool get isTruncated;
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $SnPostCopyWith<SnPost> get copyWith => _$SnPostCopyWithImpl<SnPost>(this as SnP

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.embedView, embedView) || other.embedView == embedView)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.awardedScore, awardedScore) || other.awardedScore == awardedScore)&&(identical(other.pinMode, pinMode) || other.pinMode == pinMode)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other.reactionsCount, reactionsCount)&&const DeepCollectionEquality().equals(other.reactionsMade, reactionsMade)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&const DeepCollectionEquality().equals(other.tags, tags)&&const DeepCollectionEquality().equals(other.categories, categories)&&const DeepCollectionEquality().equals(other.collections, collections)&&const DeepCollectionEquality().equals(other.featuredRecords, featuredRecords)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.repliedGone, repliedGone) || other.repliedGone == repliedGone)&&(identical(other.forwardedGone, forwardedGone) || other.forwardedGone == forwardedGone)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.embedView, embedView) || other.embedView == embedView)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.awardedScore, awardedScore) || other.awardedScore == awardedScore)&&(identical(other.pinMode, pinMode) || other.pinMode == pinMode)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other.reactionsCount, reactionsCount)&&const DeepCollectionEquality().equals(other.reactionsMade, reactionsMade)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&const DeepCollectionEquality().equals(other.tags, tags)&&const DeepCollectionEquality().equals(other.categories, categories)&&const DeepCollectionEquality().equals(other.collections, collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,slug,type,const DeepCollectionEquality().hash(meta),embedView,viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,awardedScore,pinMode,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,realmId,realm,const DeepCollectionEquality().hash(attachments),publisher,const DeepCollectionEquality().hash(reactionsCount),const DeepCollectionEquality().hash(reactionsMade),const DeepCollectionEquality().hash(reactions),const DeepCollectionEquality().hash(tags),const DeepCollectionEquality().hash(categories),const DeepCollectionEquality().hash(collections),const DeepCollectionEquality().hash(featuredRecords),createdAt,updatedAt,deletedAt,repliedGone,forwardedGone,isTruncated]);
+int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,slug,type,const DeepCollectionEquality().hash(meta),embedView,viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,awardedScore,pinMode,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,realmId,realm,const DeepCollectionEquality().hash(attachments),publisher,const DeepCollectionEquality().hash(reactionsCount),const DeepCollectionEquality().hash(reactionsMade),const DeepCollectionEquality().hash(reactions),const DeepCollectionEquality().hash(tags),const DeepCollectionEquality().hash(categories),const DeepCollectionEquality().hash(collections),createdAt,updatedAt,deletedAt,isTruncated]);

@override
 String toString() {
-  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, slug: $slug, type: $type, meta: $meta, embedView: $embedView, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, awardedScore: $awardedScore, pinMode: $pinMode, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, realmId: $realmId, realm: $realm, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactionsMade: $reactionsMade, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, featuredRecords: $featuredRecords, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, repliedGone: $repliedGone, forwardedGone: $forwardedGone, isTruncated: $isTruncated)';
+  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, slug: $slug, type: $type, meta: $meta, embedView: $embedView, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, awardedScore: $awardedScore, pinMode: $pinMode, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, realmId: $realmId, realm: $realm, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactionsMade: $reactionsMade, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, isTruncated: $isTruncated)';
 }


@@ -48,7 +48,7 @@ abstract mixin class $SnPostCopyWith<$Res>  {
  factory $SnPostCopyWith(SnPost value, $Res Function(SnPost) _then) = _$SnPostCopyWithImpl;
@useResult
 $Res call({
- String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, String? slug, int type, Map<String, dynamic>? meta, SnPostEmbedView? embedView, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, int awardedScore, int? pinMode, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, String? realmId, SnRealm? realm, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, Map<String, bool> reactionsMade, List<dynamic> reactions, List<SnPostTag> tags, List<SnPostCategory> categories, List<dynamic> collections, List<SnPostFeaturedRecord> featuredRecords, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool repliedGone, bool forwardedGone, bool isTruncated
+ String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, String? slug, int type, Map<String, dynamic>? meta, SnPostEmbedView? embedView, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, int awardedScore, int? pinMode, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, String? realmId, SnRealm? realm, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, Map<String, bool> reactionsMade, List<dynamic> reactions, List<SnPostTag> tags, List<SnPostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
 });


@@ -65,7 +65,7 @@ class _$SnPostCopyWithImpl<$Res>

 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? slug = freezed,Object? type = null,Object? meta = freezed,Object? embedView = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? awardedScore = null,Object? pinMode = freezed,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? realmId = freezed,Object? realm = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactionsMade = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? featuredRecords = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? repliedGone = null,Object? forwardedGone = null,Object? isTruncated = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? slug = freezed,Object? type = null,Object? meta = freezed,Object? embedView = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? awardedScore = null,Object? pinMode = freezed,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? realmId = freezed,Object? realm = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactionsMade = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
  return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
@@ -102,13 +102,10 @@ as Map<String, bool>,reactions: null == reactions ? _self.reactions : reactions
 as List<dynamic>,tags: null == tags ? _self.tags : tags // ignore: cast_nullable_to_non_nullable
 as List<SnPostTag>,categories: null == categories ? _self.categories : categories // ignore: cast_nullable_to_non_nullable
 as List<SnPostCategory>,collections: null == collections ? _self.collections : collections // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,featuredRecords: null == featuredRecords ? _self.featuredRecords : featuredRecords // ignore: cast_nullable_to_non_nullable
-as List<SnPostFeaturedRecord>,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as List<dynamic>,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,repliedGone: null == repliedGone ? _self.repliedGone : repliedGone // ignore: cast_nullable_to_non_nullable
-as bool,forwardedGone: null == forwardedGone ? _self.forwardedGone : forwardedGone // ignore: cast_nullable_to_non_nullable
-as bool,isTruncated: null == isTruncated ? _self.isTruncated : isTruncated // ignore: cast_nullable_to_non_nullable
+as DateTime?,isTruncated: null == isTruncated ? _self.isTruncated : isTruncated // ignore: cast_nullable_to_non_nullable
 as bool,
  ));
 }
@@ -260,10 +257,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  List<SnPostFeaturedRecord> featuredRecords,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool repliedGone,  bool forwardedGone,  bool isTruncated)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnPost() when $default != null:
-return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.featuredRecords,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.repliedGone,_that.forwardedGone,_that.isTruncated);case _:
+return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);case _:
  return orElse();

 }
@@ -281,10 +278,10 @@ return $default(_that.id,_that.title,_that.description,_that.language,_that.edit
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  List<SnPostFeaturedRecord> featuredRecords,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool repliedGone,  bool forwardedGone,  bool isTruncated)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)  $default,) {final _that = this;
 switch (_that) {
 case _SnPost():
-return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.featuredRecords,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.repliedGone,_that.forwardedGone,_that.isTruncated);}
+return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -298,10 +295,10 @@ return $default(_that.id,_that.title,_that.description,_that.language,_that.edit
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  List<SnPostFeaturedRecord> featuredRecords,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool repliedGone,  bool forwardedGone,  bool isTruncated)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)?  $default,) {final _that = this;
 switch (_that) {
 case _SnPost() when $default != null:
-return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.featuredRecords,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.repliedGone,_that.forwardedGone,_that.isTruncated);case _:
+return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);case _:
  return null;

 }
@@ -313,7 +310,7 @@ return $default(_that.id,_that.title,_that.description,_that.language,_that.edit
@JsonSerializable()

 class _SnPost implements SnPost {
-  const _SnPost({required this.id, this.title, this.description, this.language, this.editedAt, this.publishedAt = null, this.visibility = 0, this.content, this.slug, this.type = 0, final  Map<String, dynamic>? meta, this.embedView, this.viewsUnique = 0, this.viewsTotal = 0, this.upvotes = 0, this.downvotes = 0, this.repliesCount = 0, this.awardedScore = 0, this.pinMode, this.threadedPostId, this.threadedPost, this.repliedPostId, this.repliedPost, this.forwardedPostId, this.forwardedPost, this.realmId, this.realm, final  List<SnCloudFile> attachments = const [], required this.publisher, final  Map<String, int> reactionsCount = const {}, final  Map<String, bool> reactionsMade = const {}, final  List<dynamic> reactions = const [], final  List<SnPostTag> tags = const [], final  List<SnPostCategory> categories = const [], final  List<dynamic> collections = const [], final  List<SnPostFeaturedRecord> featuredRecords = const [], this.createdAt = null, this.updatedAt = null, this.deletedAt, this.repliedGone = false, this.forwardedGone = false, this.isTruncated = false}): _meta = meta,_attachments = attachments,_reactionsCount = reactionsCount,_reactionsMade = reactionsMade,_reactions = reactions,_tags = tags,_categories = categories,_collections = collections,_featuredRecords = featuredRecords;
+  const _SnPost({required this.id, this.title, this.description, this.language, this.editedAt, this.publishedAt = null, this.visibility = 0, this.content, this.slug, this.type = 0, final  Map<String, dynamic>? meta, this.embedView, this.viewsUnique = 0, this.viewsTotal = 0, this.upvotes = 0, this.downvotes = 0, this.repliesCount = 0, this.awardedScore = 0, this.pinMode, this.threadedPostId, this.threadedPost, this.repliedPostId, this.repliedPost, this.forwardedPostId, this.forwardedPost, this.realmId, this.realm, final  List<SnCloudFile> attachments = const [], required this.publisher, final  Map<String, int> reactionsCount = const {}, final  Map<String, bool> reactionsMade = const {}, final  List<dynamic> reactions = const [], final  List<SnPostTag> tags = const [], final  List<SnPostCategory> categories = const [], final  List<dynamic> collections = const [], this.createdAt = null, this.updatedAt = null, this.deletedAt, this.isTruncated = false}): _meta = meta,_attachments = attachments,_reactionsCount = reactionsCount,_reactionsMade = reactionsMade,_reactions = reactions,_tags = tags,_categories = categories,_collections = collections;
  factory _SnPost.fromJson(Map<String, dynamic> json) => _$SnPostFromJson(json);

@override final  String id;
@@ -401,18 +398,9 @@ class _SnPost implements SnPost {
  return EqualUnmodifiableListView(_collections);
 }

- final  List<SnPostFeaturedRecord> _featuredRecords;
-@override@JsonKey() List<SnPostFeaturedRecord> get featuredRecords {
-  if (_featuredRecords is EqualUnmodifiableListView) return _featuredRecords;
-  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_featuredRecords);
-}
-
@override@JsonKey() final  DateTime? createdAt;
@override@JsonKey() final  DateTime? updatedAt;
@override final  DateTime? deletedAt;
-@override@JsonKey() final  bool repliedGone;
-@override@JsonKey() final  bool forwardedGone;
@override@JsonKey() final  bool isTruncated;

 /// Create a copy of SnPost
@@ -428,16 +416,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.embedView, embedView) || other.embedView == embedView)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.awardedScore, awardedScore) || other.awardedScore == awardedScore)&&(identical(other.pinMode, pinMode) || other.pinMode == pinMode)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other._reactionsCount, _reactionsCount)&&const DeepCollectionEquality().equals(other._reactionsMade, _reactionsMade)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&const DeepCollectionEquality().equals(other._tags, _tags)&&const DeepCollectionEquality().equals(other._categories, _categories)&&const DeepCollectionEquality().equals(other._collections, _collections)&&const DeepCollectionEquality().equals(other._featuredRecords, _featuredRecords)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.repliedGone, repliedGone) || other.repliedGone == repliedGone)&&(identical(other.forwardedGone, forwardedGone) || other.forwardedGone == forwardedGone)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.embedView, embedView) || other.embedView == embedView)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.awardedScore, awardedScore) || other.awardedScore == awardedScore)&&(identical(other.pinMode, pinMode) || other.pinMode == pinMode)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other._reactionsCount, _reactionsCount)&&const DeepCollectionEquality().equals(other._reactionsMade, _reactionsMade)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&const DeepCollectionEquality().equals(other._tags, _tags)&&const DeepCollectionEquality().equals(other._categories, _categories)&&const DeepCollectionEquality().equals(other._collections, _collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,slug,type,const DeepCollectionEquality().hash(_meta),embedView,viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,awardedScore,pinMode,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,realmId,realm,const DeepCollectionEquality().hash(_attachments),publisher,const DeepCollectionEquality().hash(_reactionsCount),const DeepCollectionEquality().hash(_reactionsMade),const DeepCollectionEquality().hash(_reactions),const DeepCollectionEquality().hash(_tags),const DeepCollectionEquality().hash(_categories),const DeepCollectionEquality().hash(_collections),const DeepCollectionEquality().hash(_featuredRecords),createdAt,updatedAt,deletedAt,repliedGone,forwardedGone,isTruncated]);
+int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,slug,type,const DeepCollectionEquality().hash(_meta),embedView,viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,awardedScore,pinMode,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,realmId,realm,const DeepCollectionEquality().hash(_attachments),publisher,const DeepCollectionEquality().hash(_reactionsCount),const DeepCollectionEquality().hash(_reactionsMade),const DeepCollectionEquality().hash(_reactions),const DeepCollectionEquality().hash(_tags),const DeepCollectionEquality().hash(_categories),const DeepCollectionEquality().hash(_collections),createdAt,updatedAt,deletedAt,isTruncated]);

@override
 String toString() {
-  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, slug: $slug, type: $type, meta: $meta, embedView: $embedView, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, awardedScore: $awardedScore, pinMode: $pinMode, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, realmId: $realmId, realm: $realm, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactionsMade: $reactionsMade, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, featuredRecords: $featuredRecords, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, repliedGone: $repliedGone, forwardedGone: $forwardedGone, isTruncated: $isTruncated)';
+  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, slug: $slug, type: $type, meta: $meta, embedView: $embedView, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, awardedScore: $awardedScore, pinMode: $pinMode, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, realmId: $realmId, realm: $realm, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactionsMade: $reactionsMade, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, isTruncated: $isTruncated)';
 }


@@ -448,7 +436,7 @@ abstract mixin class _$SnPostCopyWith<$Res> implements $SnPostCopyWith<$Res> {
  factory _$SnPostCopyWith(_SnPost value, $Res Function(_SnPost) _then) = __$SnPostCopyWithImpl;
@override @useResult
 $Res call({
- String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, String? slug, int type, Map<String, dynamic>? meta, SnPostEmbedView? embedView, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, int awardedScore, int? pinMode, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, String? realmId, SnRealm? realm, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, Map<String, bool> reactionsMade, List<dynamic> reactions, List<SnPostTag> tags, List<SnPostCategory> categories, List<dynamic> collections, List<SnPostFeaturedRecord> featuredRecords, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool repliedGone, bool forwardedGone, bool isTruncated
+ String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, String? slug, int type, Map<String, dynamic>? meta, SnPostEmbedView? embedView, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, int awardedScore, int? pinMode, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, String? realmId, SnRealm? realm, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, Map<String, bool> reactionsMade, List<dynamic> reactions, List<SnPostTag> tags, List<SnPostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
 });


@@ -465,7 +453,7 @@ class __$SnPostCopyWithImpl<$Res>

 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? slug = freezed,Object? type = null,Object? meta = freezed,Object? embedView = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? awardedScore = null,Object? pinMode = freezed,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? realmId = freezed,Object? realm = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactionsMade = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? featuredRecords = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? repliedGone = null,Object? forwardedGone = null,Object? isTruncated = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? slug = freezed,Object? type = null,Object? meta = freezed,Object? embedView = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? awardedScore = null,Object? pinMode = freezed,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? realmId = freezed,Object? realm = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactionsMade = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
  return _then(_SnPost(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
@@ -502,13 +490,10 @@ as Map<String, bool>,reactions: null == reactions ? _self._reactions : reactions
 as List<dynamic>,tags: null == tags ? _self._tags : tags // ignore: cast_nullable_to_non_nullable
 as List<SnPostTag>,categories: null == categories ? _self._categories : categories // ignore: cast_nullable_to_non_nullable
 as List<SnPostCategory>,collections: null == collections ? _self._collections : collections // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,featuredRecords: null == featuredRecords ? _self._featuredRecords : featuredRecords // ignore: cast_nullable_to_non_nullable
-as List<SnPostFeaturedRecord>,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as List<dynamic>,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,repliedGone: null == repliedGone ? _self.repliedGone : repliedGone // ignore: cast_nullable_to_non_nullable
-as bool,forwardedGone: null == forwardedGone ? _self.forwardedGone : forwardedGone // ignore: cast_nullable_to_non_nullable
-as bool,isTruncated: null == isTruncated ? _self.isTruncated : isTruncated // ignore: cast_nullable_to_non_nullable
+as DateTime?,isTruncated: null == isTruncated ? _self.isTruncated : isTruncated // ignore: cast_nullable_to_non_nullable
 as bool,
  ));
 }
@@ -2220,279 +2205,4 @@ $SnAccountCopyWith<$Res>? get account {
 }
 }

-
-/// @nodoc
-mixin _$SnPostFeaturedRecord {
-
- String get id; String get postId; DateTime? get featuredAt; int get socialCredits; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
-/// Create a copy of SnPostFeaturedRecord
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$SnPostFeaturedRecordCopyWith<SnPostFeaturedRecord> get copyWith => _$SnPostFeaturedRecordCopyWithImpl<SnPostFeaturedRecord>(this as SnPostFeaturedRecord, _$identity);
-
-  /// Serializes this SnPostFeaturedRecord to a JSON map.
-  Map<String, dynamic> toJson();
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPostFeaturedRecord&&(identical(other.id, id) || other.id == id)&&(identical(other.postId, postId) || other.postId == postId)&&(identical(other.featuredAt, featuredAt) || other.featuredAt == featuredAt)&&(identical(other.socialCredits, socialCredits) || other.socialCredits == socialCredits)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,id,postId,featuredAt,socialCredits,createdAt,updatedAt,deletedAt);
-
-@override
-String toString() {
-  return 'SnPostFeaturedRecord(id: $id, postId: $postId, featuredAt: $featuredAt, socialCredits: $socialCredits, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $SnPostFeaturedRecordCopyWith<$Res>  {
-  factory $SnPostFeaturedRecordCopyWith(SnPostFeaturedRecord value, $Res Function(SnPostFeaturedRecord) _then) = _$SnPostFeaturedRecordCopyWithImpl;
-@useResult
-$Res call({
- String id, String postId, DateTime? featuredAt, int socialCredits, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
-});
-
-
-
-
-}
-/// @nodoc
-class _$SnPostFeaturedRecordCopyWithImpl<$Res>
-    implements $SnPostFeaturedRecordCopyWith<$Res> {
-  _$SnPostFeaturedRecordCopyWithImpl(this._self, this._then);
-
-  final SnPostFeaturedRecord _self;
-  final $Res Function(SnPostFeaturedRecord) _then;
-
-/// Create a copy of SnPostFeaturedRecord
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? postId = null,Object? featuredAt = freezed,Object? socialCredits = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
-  return _then(_self.copyWith(
-id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,postId: null == postId ? _self.postId : postId // ignore: cast_nullable_to_non_nullable
-as String,featuredAt: freezed == featuredAt ? _self.featuredAt : featuredAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,socialCredits: null == socialCredits ? _self.socialCredits : socialCredits // ignore: cast_nullable_to_non_nullable
-as int,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
-  ));
-}
-
-}
-
-
-/// Adds pattern-matching-related methods to [SnPostFeaturedRecord].
-extension SnPostFeaturedRecordPatterns on SnPostFeaturedRecord {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnPostFeaturedRecord value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _SnPostFeaturedRecord() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnPostFeaturedRecord value)  $default,){
-final _that = this;
-switch (_that) {
-case _SnPostFeaturedRecord():
-return $default(_that);}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnPostFeaturedRecord value)?  $default,){
-final _that = this;
-switch (_that) {
-case _SnPostFeaturedRecord() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String postId,  DateTime? featuredAt,  int socialCredits,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _SnPostFeaturedRecord() when $default != null:
-return $default(_that.id,_that.postId,_that.featuredAt,_that.socialCredits,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String postId,  DateTime? featuredAt,  int socialCredits,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
-switch (_that) {
-case _SnPostFeaturedRecord():
-return $default(_that.id,_that.postId,_that.featuredAt,_that.socialCredits,_that.createdAt,_that.updatedAt,_that.deletedAt);}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String postId,  DateTime? featuredAt,  int socialCredits,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
-switch (_that) {
-case _SnPostFeaturedRecord() when $default != null:
-return $default(_that.id,_that.postId,_that.featuredAt,_that.socialCredits,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
-  return null;
-
-}
-}
-
-}
-
-/// @nodoc
-@JsonSerializable()
-
-class _SnPostFeaturedRecord implements SnPostFeaturedRecord {
-  const _SnPostFeaturedRecord({required this.id, required this.postId, required this.featuredAt, required this.socialCredits, required this.createdAt, required this.updatedAt, required this.deletedAt});
-  factory _SnPostFeaturedRecord.fromJson(Map<String, dynamic> json) => _$SnPostFeaturedRecordFromJson(json);
-
-@override final  String id;
-@override final  String postId;
-@override final  DateTime? featuredAt;
-@override final  int socialCredits;
-@override final  DateTime createdAt;
-@override final  DateTime updatedAt;
-@override final  DateTime? deletedAt;
-
-/// Create a copy of SnPostFeaturedRecord
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$SnPostFeaturedRecordCopyWith<_SnPostFeaturedRecord> get copyWith => __$SnPostFeaturedRecordCopyWithImpl<_SnPostFeaturedRecord>(this, _$identity);
-
-@override
-Map<String, dynamic> toJson() {
-  return _$SnPostFeaturedRecordToJson(this, );
-}
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPostFeaturedRecord&&(identical(other.id, id) || other.id == id)&&(identical(other.postId, postId) || other.postId == postId)&&(identical(other.featuredAt, featuredAt) || other.featuredAt == featuredAt)&&(identical(other.socialCredits, socialCredits) || other.socialCredits == socialCredits)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,id,postId,featuredAt,socialCredits,createdAt,updatedAt,deletedAt);
-
-@override
-String toString() {
-  return 'SnPostFeaturedRecord(id: $id, postId: $postId, featuredAt: $featuredAt, socialCredits: $socialCredits, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$SnPostFeaturedRecordCopyWith<$Res> implements $SnPostFeaturedRecordCopyWith<$Res> {
-  factory _$SnPostFeaturedRecordCopyWith(_SnPostFeaturedRecord value, $Res Function(_SnPostFeaturedRecord) _then) = __$SnPostFeaturedRecordCopyWithImpl;
-@override @useResult
-$Res call({
- String id, String postId, DateTime? featuredAt, int socialCredits, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
-});
-
-
-
-
-}
-/// @nodoc
-class __$SnPostFeaturedRecordCopyWithImpl<$Res>
-    implements _$SnPostFeaturedRecordCopyWith<$Res> {
-  __$SnPostFeaturedRecordCopyWithImpl(this._self, this._then);
-
-  final _SnPostFeaturedRecord _self;
-  final $Res Function(_SnPostFeaturedRecord) _then;
-
-/// Create a copy of SnPostFeaturedRecord
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? postId = null,Object? featuredAt = freezed,Object? socialCredits = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
-  return _then(_SnPostFeaturedRecord(
-id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,postId: null == postId ? _self.postId : postId // ignore: cast_nullable_to_non_nullable
-as String,featuredAt: freezed == featuredAt ? _self.featuredAt : featuredAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,socialCredits: null == socialCredits ? _self.socialCredits : socialCredits // ignore: cast_nullable_to_non_nullable
-as int,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
-  ));
-}
-
-
-}
-
 // dart format on
--- a/lib/models/post.g.dart
+++ b/lib/models/post.g.dart
@@ -85,11 +85,6 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
          .toList() ??
      const [],
  collections: json['collections'] as List<dynamic>? ?? const [],
-  featuredRecords:
-      (json['featured_records'] as List<dynamic>?)
-          ?.map((e) => SnPostFeaturedRecord.fromJson(e as Map<String, dynamic>))
-          .toList() ??
-      const [],
  createdAt:
      json['created_at'] == null
          ? null
@@ -102,8 +97,6 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
      json['deleted_at'] == null
          ? null
          : DateTime.parse(json['deleted_at'] as String),
-  repliedGone: json['replied_gone'] as bool? ?? false,
-  forwardedGone: json['forwarded_gone'] as bool? ?? false,
  isTruncated: json['is_truncated'] as bool? ?? false,
 );

@@ -143,12 +136,9 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
  'tags': instance.tags.map((e) => e.toJson()).toList(),
  'categories': instance.categories.map((e) => e.toJson()).toList(),
  'collections': instance.collections,
-  'featured_records': instance.featuredRecords.map((e) => e.toJson()).toList(),
  'created_at': instance.createdAt?.toIso8601String(),
  'updated_at': instance.updatedAt?.toIso8601String(),
  'deleted_at': instance.deletedAt?.toIso8601String(),
-  'replied_gone': instance.repliedGone,
-  'forwarded_gone': instance.forwardedGone,
  'is_truncated': instance.isTruncated,
 };

@@ -272,33 +262,3 @@ Map<String, dynamic> _$SnPostReactionToJson(_SnPostReaction instance) =>
      'account': instance.account?.toJson(),
      'deleted_at': instance.deletedAt?.toIso8601String(),
    };
-
-_SnPostFeaturedRecord _$SnPostFeaturedRecordFromJson(
-  Map<String, dynamic> json,
-) => _SnPostFeaturedRecord(
-  id: json['id'] as String,
-  postId: json['post_id'] as String,
-  featuredAt:
-      json['featured_at'] == null
-          ? null
-          : DateTime.parse(json['featured_at'] as String),
-  socialCredits: (json['social_credits'] as num).toInt(),
-  createdAt: DateTime.parse(json['created_at'] as String),
-  updatedAt: DateTime.parse(json['updated_at'] as String),
-  deletedAt:
-      json['deleted_at'] == null
-          ? null
-          : DateTime.parse(json['deleted_at'] as String),
-);
-
-Map<String, dynamic> _$SnPostFeaturedRecordToJson(
-  _SnPostFeaturedRecord instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'post_id': instance.postId,
-  'featured_at': instance.featuredAt?.toIso8601String(),
-  'social_credits': instance.socialCredits,
-  'created_at': instance.createdAt.toIso8601String(),
-  'updated_at': instance.updatedAt.toIso8601String(),
-  'deleted_at': instance.deletedAt?.toIso8601String(),
-};
--- a/lib/models/sticker.dart
+++ b/lib/models/sticker.dart
@@ -10,6 +10,7 @@ sealed class SnSticker with _$SnSticker {
  const factory SnSticker({
    required String id,
    required String slug,
+    required String imageId,
    required SnCloudFile image,
    required String packId,
    required SnStickerPack? pack,
--- a/lib/models/sticker.freezed.dart
+++ b/lib/models/sticker.freezed.dart
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnSticker {

- String get id; String get slug; SnCloudFile get image; String get packId; SnStickerPack? get pack; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String get slug; String get imageId; SnCloudFile get image; String get packId; SnStickerPack? get pack; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnSticker
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $SnStickerCopyWith<SnSticker> get copyWith => _$SnStickerCopyWithImpl<SnSticker>

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnSticker&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.image, image) || other.image == image)&&(identical(other.packId, packId) || other.packId == packId)&&(identical(other.pack, pack) || other.pack == pack)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnSticker&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.imageId, imageId) || other.imageId == imageId)&&(identical(other.image, image) || other.image == image)&&(identical(other.packId, packId) || other.packId == packId)&&(identical(other.pack, pack) || other.pack == pack)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,id,slug,image,packId,pack,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,slug,imageId,image,packId,pack,createdAt,updatedAt,deletedAt);

@override
 String toString() {
-  return 'SnSticker(id: $id, slug: $slug, image: $image, packId: $packId, pack: $pack, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnSticker(id: $id, slug: $slug, imageId: $imageId, image: $image, packId: $packId, pack: $pack, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }


@@ -48,7 +48,7 @@ abstract mixin class $SnStickerCopyWith<$Res>  {
  factory $SnStickerCopyWith(SnSticker value, $Res Function(SnSticker) _then) = _$SnStickerCopyWithImpl;
@useResult
 $Res call({
- String id, String slug, SnCloudFile image, String packId, SnStickerPack? pack, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String slug, String imageId, SnCloudFile image, String packId, SnStickerPack? pack, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });


@@ -65,10 +65,11 @@ class _$SnStickerCopyWithImpl<$Res>

 /// Create a copy of SnSticker
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? image = null,Object? packId = null,Object? pack = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? imageId = null,Object? image = null,Object? packId = null,Object? pack = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,imageId: null == imageId ? _self.imageId : imageId // ignore: cast_nullable_to_non_nullable
 as String,image: null == image ? _self.image : image // ignore: cast_nullable_to_non_nullable
 as SnCloudFile,packId: null == packId ? _self.packId : packId // ignore: cast_nullable_to_non_nullable
 as String,pack: freezed == pack ? _self.pack : pack // ignore: cast_nullable_to_non_nullable
@@ -178,10 +179,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String slug,  SnCloudFile image,  String packId,  SnStickerPack? pack,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String slug,  String imageId,  SnCloudFile image,  String packId,  SnStickerPack? pack,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnSticker() when $default != null:
-return $default(_that.id,_that.slug,_that.image,_that.packId,_that.pack,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.slug,_that.imageId,_that.image,_that.packId,_that.pack,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
  return orElse();

 }
@@ -199,10 +200,10 @@ return $default(_that.id,_that.slug,_that.image,_that.packId,_that.pack,_that.cr
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String slug,  SnCloudFile image,  String packId,  SnStickerPack? pack,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String slug,  String imageId,  SnCloudFile image,  String packId,  SnStickerPack? pack,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnSticker():
-return $default(_that.id,_that.slug,_that.image,_that.packId,_that.pack,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.slug,_that.imageId,_that.image,_that.packId,_that.pack,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -216,10 +217,10 @@ return $default(_that.id,_that.slug,_that.image,_that.packId,_that.pack,_that.cr
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String slug,  SnCloudFile image,  String packId,  SnStickerPack? pack,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String slug,  String imageId,  SnCloudFile image,  String packId,  SnStickerPack? pack,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnSticker() when $default != null:
-return $default(_that.id,_that.slug,_that.image,_that.packId,_that.pack,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.slug,_that.imageId,_that.image,_that.packId,_that.pack,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
  return null;

 }
@@ -231,11 +232,12 @@ return $default(_that.id,_that.slug,_that.image,_that.packId,_that.pack,_that.cr
@JsonSerializable()

 class _SnSticker implements SnSticker {
-  const _SnSticker({required this.id, required this.slug, required this.image, required this.packId, required this.pack, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  const _SnSticker({required this.id, required this.slug, required this.imageId, required this.image, required this.packId, required this.pack, required this.createdAt, required this.updatedAt, required this.deletedAt});
  factory _SnSticker.fromJson(Map<String, dynamic> json) => _$SnStickerFromJson(json);

@override final  String id;
@override final  String slug;
+@override final  String imageId;
@override final  SnCloudFile image;
@override final  String packId;
@override final  SnStickerPack? pack;
@@ -256,16 +258,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnSticker&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.image, image) || other.image == image)&&(identical(other.packId, packId) || other.packId == packId)&&(identical(other.pack, pack) || other.pack == pack)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnSticker&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.imageId, imageId) || other.imageId == imageId)&&(identical(other.image, image) || other.image == image)&&(identical(other.packId, packId) || other.packId == packId)&&(identical(other.pack, pack) || other.pack == pack)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,id,slug,image,packId,pack,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,slug,imageId,image,packId,pack,createdAt,updatedAt,deletedAt);

@override
 String toString() {
-  return 'SnSticker(id: $id, slug: $slug, image: $image, packId: $packId, pack: $pack, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnSticker(id: $id, slug: $slug, imageId: $imageId, image: $image, packId: $packId, pack: $pack, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }


@@ -276,7 +278,7 @@ abstract mixin class _$SnStickerCopyWith<$Res> implements $SnStickerCopyWith<$Re
  factory _$SnStickerCopyWith(_SnSticker value, $Res Function(_SnSticker) _then) = __$SnStickerCopyWithImpl;
@override @useResult
 $Res call({
- String id, String slug, SnCloudFile image, String packId, SnStickerPack? pack, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String slug, String imageId, SnCloudFile image, String packId, SnStickerPack? pack, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });


@@ -293,10 +295,11 @@ class __$SnStickerCopyWithImpl<$Res>

 /// Create a copy of SnSticker
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? image = null,Object? packId = null,Object? pack = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? imageId = null,Object? image = null,Object? packId = null,Object? pack = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_SnSticker(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,imageId: null == imageId ? _self.imageId : imageId // ignore: cast_nullable_to_non_nullable
 as String,image: null == image ? _self.image : image // ignore: cast_nullable_to_non_nullable
 as SnCloudFile,packId: null == packId ? _self.packId : packId // ignore: cast_nullable_to_non_nullable
 as String,pack: freezed == pack ? _self.pack : pack // ignore: cast_nullable_to_non_nullable
--- a/lib/models/sticker.g.dart
+++ b/lib/models/sticker.g.dart
@@ -9,6 +9,7 @@ part of 'sticker.dart';
 _SnSticker _$SnStickerFromJson(Map<String, dynamic> json) => _SnSticker(
  id: json['id'] as String,
  slug: json['slug'] as String,
+  imageId: json['image_id'] as String,
  image: SnCloudFile.fromJson(json['image'] as Map<String, dynamic>),
  packId: json['pack_id'] as String,
  pack:
@@ -27,6 +28,7 @@ Map<String, dynamic> _$SnStickerToJson(_SnSticker instance) =>
    <String, dynamic>{
      'id': instance.id,
      'slug': instance.slug,
+      'image_id': instance.imageId,
      'image': instance.image.toJson(),
      'pack_id': instance.packId,
      'pack': instance.pack?.toJson(),
--- a/lib/models/thought.dart
+++ b/lib/models/thought.dart
@@ -1,116 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:island/models/file.dart';
-
-part 'thought.freezed.dart';
-part 'thought.g.dart';
-
-enum ThinkingThoughtRole {
-  assistant(0),
-  user(1);
-
-  const ThinkingThoughtRole(this.value);
-  final int value;
-
-  static ThinkingThoughtRole fromValue(int value) {
-    return values.firstWhere((e) => e.value == value);
-  }
-}
-
-class ThinkingThoughtRoleConverter
-    implements JsonConverter<ThinkingThoughtRole, int> {
-  const ThinkingThoughtRoleConverter();
-
-  @override
-  ThinkingThoughtRole fromJson(int json) => ThinkingThoughtRole.fromValue(json);
-
-  @override
-  int toJson(ThinkingThoughtRole object) => object.value;
-}
-
-class ThinkingChunkTypeConverter
-    implements JsonConverter<ThinkingChunkType, int> {
-  const ThinkingChunkTypeConverter();
-
-  @override
-  ThinkingChunkType fromJson(int json) => ThinkingChunkType.fromValue(json);
-
-  @override
-  int toJson(ThinkingChunkType object) => object.value;
-}
-
-@freezed
-sealed class StreamThinkingRequest with _$StreamThinkingRequest {
-  const factory StreamThinkingRequest({
-    required String userMessage,
-    String? sequenceId,
-    @Default([]) List<String> accpetProposals,
-    List<String>? attachedPosts,
-    List<Map<String, dynamic>>? attachedMessages,
-  }) = _StreamThinkingRequest;
-
-  factory StreamThinkingRequest.fromJson(Map<String, dynamic> json) =>
-      _$StreamThinkingRequestFromJson(json);
-}
-
-enum ThinkingChunkType {
-  text(0),
-  reasoning(1),
-  functionCall(2),
-  unknown(3);
-
-  const ThinkingChunkType(this.value);
-  final int value;
-
-  static ThinkingChunkType fromValue(int value) {
-    return values.firstWhere((e) => e.value == value);
-  }
-}
-
-@freezed
-sealed class SnThinkingChunk with _$SnThinkingChunk {
-  const factory SnThinkingChunk({
-    @ThinkingChunkTypeConverter() required ThinkingChunkType type,
-    Map<String, dynamic>? data,
-  }) = _SnThinkingChunk;
-
-  factory SnThinkingChunk.fromJson(Map<String, dynamic> json) =>
-      _$SnThinkingChunkFromJson(json);
-}
-
-@freezed
-sealed class SnThinkingSequence with _$SnThinkingSequence {
-  const factory SnThinkingSequence({
-    required String id,
-    String? topic,
-    @Default(0) int totalToken,
-    @Default(0) int paidToken,
-    required String accountId,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    DateTime? deletedAt,
-  }) = _SnThinkingSequence;
-
-  factory SnThinkingSequence.fromJson(Map<String, dynamic> json) =>
-      _$SnThinkingSequenceFromJson(json);
-}
-
-@freezed
-sealed class SnThinkingThought with _$SnThinkingThought {
-  const factory SnThinkingThought({
-    required String id,
-    String? content,
-    @Default([]) List<SnCloudFile> files,
-    @Default([]) List<SnThinkingChunk> chunks,
-    @ThinkingThoughtRoleConverter() required ThinkingThoughtRole role,
-    int? tokenCount,
-    String? modelName,
-    required String sequenceId,
-    SnThinkingSequence? sequence,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    DateTime? deletedAt,
-  }) = _SnThinkingThought;
-
-  factory SnThinkingThought.fromJson(Map<String, dynamic> json) =>
-      _$SnThinkingThoughtFromJson(json);
-}
--- a/lib/models/thought.freezed.dart
+++ b/lib/models/thought.freezed.dart
--- a/lib/models/thought.g.dart
+++ b/lib/models/thought.g.dart
@@ -1,128 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'thought.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-_StreamThinkingRequest _$StreamThinkingRequestFromJson(
-  Map<String, dynamic> json,
-) => _StreamThinkingRequest(
-  userMessage: json['user_message'] as String,
-  sequenceId: json['sequence_id'] as String?,
-  accpetProposals:
-      (json['accpet_proposals'] as List<dynamic>?)
-          ?.map((e) => e as String)
-          .toList() ??
-      const [],
-  attachedPosts:
-      (json['attached_posts'] as List<dynamic>?)
-          ?.map((e) => e as String)
-          .toList(),
-  attachedMessages:
-      (json['attached_messages'] as List<dynamic>?)
-          ?.map((e) => e as Map<String, dynamic>)
-          .toList(),
-);
-
-Map<String, dynamic> _$StreamThinkingRequestToJson(
-  _StreamThinkingRequest instance,
-) => <String, dynamic>{
-  'user_message': instance.userMessage,
-  'sequence_id': instance.sequenceId,
-  'accpet_proposals': instance.accpetProposals,
-  'attached_posts': instance.attachedPosts,
-  'attached_messages': instance.attachedMessages,
-};
-
-_SnThinkingChunk _$SnThinkingChunkFromJson(Map<String, dynamic> json) =>
-    _SnThinkingChunk(
-      type: const ThinkingChunkTypeConverter().fromJson(
-        (json['type'] as num).toInt(),
-      ),
-      data: json['data'] as Map<String, dynamic>?,
-    );
-
-Map<String, dynamic> _$SnThinkingChunkToJson(_SnThinkingChunk instance) =>
-    <String, dynamic>{
-      'type': const ThinkingChunkTypeConverter().toJson(instance.type),
-      'data': instance.data,
-    };
-
-_SnThinkingSequence _$SnThinkingSequenceFromJson(Map<String, dynamic> json) =>
-    _SnThinkingSequence(
-      id: json['id'] as String,
-      topic: json['topic'] as String?,
-      totalToken: (json['total_token'] as num?)?.toInt() ?? 0,
-      paidToken: (json['paid_token'] as num?)?.toInt() ?? 0,
-      accountId: json['account_id'] as String,
-      createdAt: DateTime.parse(json['created_at'] as String),
-      updatedAt: DateTime.parse(json['updated_at'] as String),
-      deletedAt:
-          json['deleted_at'] == null
-              ? null
-              : DateTime.parse(json['deleted_at'] as String),
-    );
-
-Map<String, dynamic> _$SnThinkingSequenceToJson(_SnThinkingSequence instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'topic': instance.topic,
-      'total_token': instance.totalToken,
-      'paid_token': instance.paidToken,
-      'account_id': instance.accountId,
-      'created_at': instance.createdAt.toIso8601String(),
-      'updated_at': instance.updatedAt.toIso8601String(),
-      'deleted_at': instance.deletedAt?.toIso8601String(),
-    };
-
-_SnThinkingThought _$SnThinkingThoughtFromJson(Map<String, dynamic> json) =>
-    _SnThinkingThought(
-      id: json['id'] as String,
-      content: json['content'] as String?,
-      files:
-          (json['files'] as List<dynamic>?)
-              ?.map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
-      chunks:
-          (json['chunks'] as List<dynamic>?)
-              ?.map((e) => SnThinkingChunk.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
-      role: const ThinkingThoughtRoleConverter().fromJson(
-        (json['role'] as num).toInt(),
-      ),
-      tokenCount: (json['token_count'] as num?)?.toInt(),
-      modelName: json['model_name'] as String?,
-      sequenceId: json['sequence_id'] as String,
-      sequence:
-          json['sequence'] == null
-              ? null
-              : SnThinkingSequence.fromJson(
-                json['sequence'] as Map<String, dynamic>,
-              ),
-      createdAt: DateTime.parse(json['created_at'] as String),
-      updatedAt: DateTime.parse(json['updated_at'] as String),
-      deletedAt:
-          json['deleted_at'] == null
-              ? null
-              : DateTime.parse(json['deleted_at'] as String),
-    );
-
-Map<String, dynamic> _$SnThinkingThoughtToJson(_SnThinkingThought instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'content': instance.content,
-      'files': instance.files.map((e) => e.toJson()).toList(),
-      'chunks': instance.chunks.map((e) => e.toJson()).toList(),
-      'role': const ThinkingThoughtRoleConverter().toJson(instance.role),
-      'token_count': instance.tokenCount,
-      'model_name': instance.modelName,
-      'sequence_id': instance.sequenceId,
-      'sequence': instance.sequence?.toJson(),
-      'created_at': instance.createdAt.toIso8601String(),
-      'updated_at': instance.updatedAt.toIso8601String(),
-      'deleted_at': instance.deletedAt?.toIso8601String(),
-    };
--- a/lib/models/wallet.dart
+++ b/lib/models/wallet.dart
@@ -211,44 +211,3 @@ sealed class SnWalletFundRecipient with _$SnWalletFundRecipient {
  factory SnWalletFundRecipient.fromJson(Map<String, dynamic> json) =>
      _$SnWalletFundRecipientFromJson(json);
 }
-
-@freezed
-sealed class SnLotteryTicket with _$SnLotteryTicket {
-  const factory SnLotteryTicket({
-    required String id,
-    required String accountId,
-    required SnAccount? account,
-    required List<int> regionOneNumbers,
-    required int regionTwoNumber,
-    required int multiplier,
-    required int drawStatus,
-    required DateTime? drawDate,
-    required List<int>? matchedRegionOneNumbers,
-    required int? matchedRegionTwoNumber,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
-  }) = _SnLotteryTicket;
-
-  factory SnLotteryTicket.fromJson(Map<String, dynamic> json) =>
-      _$SnLotteryTicketFromJson(json);
-}
-
-@freezed
-sealed class SnLotteryRecord with _$SnLotteryRecord {
-  const factory SnLotteryRecord({
-    required String id,
-    required DateTime drawDate,
-    required List<int> winningRegionOneNumbers,
-    required int winningRegionTwoNumber,
-    required int totalTickets,
-    required int totalPrizesAwarded,
-    required double totalPrizeAmount,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
-  }) = _SnLotteryRecord;
-
-  factory SnLotteryRecord.fromJson(Map<String, dynamic> json) =>
-      _$SnLotteryRecordFromJson(json);
-}
--- a/lib/models/wallet.freezed.dart
+++ b/lib/models/wallet.freezed.dart
@@ -3184,625 +3184,4 @@ $SnAccountCopyWith<$Res>? get recipientAccount {
 }
 }

-
-/// @nodoc
-mixin _$SnLotteryTicket {
-
- String get id; String get accountId; SnAccount? get account; List<int> get regionOneNumbers; int get regionTwoNumber; int get multiplier; int get drawStatus; DateTime? get drawDate; List<int>? get matchedRegionOneNumbers; int? get matchedRegionTwoNumber; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
-/// Create a copy of SnLotteryTicket
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$SnLotteryTicketCopyWith<SnLotteryTicket> get copyWith => _$SnLotteryTicketCopyWithImpl<SnLotteryTicket>(this as SnLotteryTicket, _$identity);
-
-  /// Serializes this SnLotteryTicket to a JSON map.
-  Map<String, dynamic> toJson();
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnLotteryTicket&&(identical(other.id, id) || other.id == id)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&const DeepCollectionEquality().equals(other.regionOneNumbers, regionOneNumbers)&&(identical(other.regionTwoNumber, regionTwoNumber) || other.regionTwoNumber == regionTwoNumber)&&(identical(other.multiplier, multiplier) || other.multiplier == multiplier)&&(identical(other.drawStatus, drawStatus) || other.drawStatus == drawStatus)&&(identical(other.drawDate, drawDate) || other.drawDate == drawDate)&&const DeepCollectionEquality().equals(other.matchedRegionOneNumbers, matchedRegionOneNumbers)&&(identical(other.matchedRegionTwoNumber, matchedRegionTwoNumber) || other.matchedRegionTwoNumber == matchedRegionTwoNumber)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,id,accountId,account,const DeepCollectionEquality().hash(regionOneNumbers),regionTwoNumber,multiplier,drawStatus,drawDate,const DeepCollectionEquality().hash(matchedRegionOneNumbers),matchedRegionTwoNumber,createdAt,updatedAt,deletedAt);
-
-@override
-String toString() {
-  return 'SnLotteryTicket(id: $id, accountId: $accountId, account: $account, regionOneNumbers: $regionOneNumbers, regionTwoNumber: $regionTwoNumber, multiplier: $multiplier, drawStatus: $drawStatus, drawDate: $drawDate, matchedRegionOneNumbers: $matchedRegionOneNumbers, matchedRegionTwoNumber: $matchedRegionTwoNumber, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $SnLotteryTicketCopyWith<$Res>  {
-  factory $SnLotteryTicketCopyWith(SnLotteryTicket value, $Res Function(SnLotteryTicket) _then) = _$SnLotteryTicketCopyWithImpl;
-@useResult
-$Res call({
- String id, String accountId, SnAccount? account, List<int> regionOneNumbers, int regionTwoNumber, int multiplier, int drawStatus, DateTime? drawDate, List<int>? matchedRegionOneNumbers, int? matchedRegionTwoNumber, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
-});
-
-
-$SnAccountCopyWith<$Res>? get account;
-
-}
-/// @nodoc
-class _$SnLotteryTicketCopyWithImpl<$Res>
-    implements $SnLotteryTicketCopyWith<$Res> {
-  _$SnLotteryTicketCopyWithImpl(this._self, this._then);
-
-  final SnLotteryTicket _self;
-  final $Res Function(SnLotteryTicket) _then;
-
-/// Create a copy of SnLotteryTicket
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? accountId = null,Object? account = freezed,Object? regionOneNumbers = null,Object? regionTwoNumber = null,Object? multiplier = null,Object? drawStatus = null,Object? drawDate = freezed,Object? matchedRegionOneNumbers = freezed,Object? matchedRegionTwoNumber = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
-  return _then(_self.copyWith(
-id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
-as String,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
-as SnAccount?,regionOneNumbers: null == regionOneNumbers ? _self.regionOneNumbers : regionOneNumbers // ignore: cast_nullable_to_non_nullable
-as List<int>,regionTwoNumber: null == regionTwoNumber ? _self.regionTwoNumber : regionTwoNumber // ignore: cast_nullable_to_non_nullable
-as int,multiplier: null == multiplier ? _self.multiplier : multiplier // ignore: cast_nullable_to_non_nullable
-as int,drawStatus: null == drawStatus ? _self.drawStatus : drawStatus // ignore: cast_nullable_to_non_nullable
-as int,drawDate: freezed == drawDate ? _self.drawDate : drawDate // ignore: cast_nullable_to_non_nullable
-as DateTime?,matchedRegionOneNumbers: freezed == matchedRegionOneNumbers ? _self.matchedRegionOneNumbers : matchedRegionOneNumbers // ignore: cast_nullable_to_non_nullable
-as List<int>?,matchedRegionTwoNumber: freezed == matchedRegionTwoNumber ? _self.matchedRegionTwoNumber : matchedRegionTwoNumber // ignore: cast_nullable_to_non_nullable
-as int?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
-  ));
-}
-/// Create a copy of SnLotteryTicket
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnAccountCopyWith<$Res>? get account {
-    if (_self.account == null) {
-    return null;
-  }
-
-  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
-    return _then(_self.copyWith(account: value));
-  });
-}
-}
-
-
-/// Adds pattern-matching-related methods to [SnLotteryTicket].
-extension SnLotteryTicketPatterns on SnLotteryTicket {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnLotteryTicket value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _SnLotteryTicket() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnLotteryTicket value)  $default,){
-final _that = this;
-switch (_that) {
-case _SnLotteryTicket():
-return $default(_that);}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnLotteryTicket value)?  $default,){
-final _that = this;
-switch (_that) {
-case _SnLotteryTicket() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String accountId,  SnAccount? account,  List<int> regionOneNumbers,  int regionTwoNumber,  int multiplier,  int drawStatus,  DateTime? drawDate,  List<int>? matchedRegionOneNumbers,  int? matchedRegionTwoNumber,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _SnLotteryTicket() when $default != null:
-return $default(_that.id,_that.accountId,_that.account,_that.regionOneNumbers,_that.regionTwoNumber,_that.multiplier,_that.drawStatus,_that.drawDate,_that.matchedRegionOneNumbers,_that.matchedRegionTwoNumber,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String accountId,  SnAccount? account,  List<int> regionOneNumbers,  int regionTwoNumber,  int multiplier,  int drawStatus,  DateTime? drawDate,  List<int>? matchedRegionOneNumbers,  int? matchedRegionTwoNumber,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
-switch (_that) {
-case _SnLotteryTicket():
-return $default(_that.id,_that.accountId,_that.account,_that.regionOneNumbers,_that.regionTwoNumber,_that.multiplier,_that.drawStatus,_that.drawDate,_that.matchedRegionOneNumbers,_that.matchedRegionTwoNumber,_that.createdAt,_that.updatedAt,_that.deletedAt);}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String accountId,  SnAccount? account,  List<int> regionOneNumbers,  int regionTwoNumber,  int multiplier,  int drawStatus,  DateTime? drawDate,  List<int>? matchedRegionOneNumbers,  int? matchedRegionTwoNumber,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
-switch (_that) {
-case _SnLotteryTicket() when $default != null:
-return $default(_that.id,_that.accountId,_that.account,_that.regionOneNumbers,_that.regionTwoNumber,_that.multiplier,_that.drawStatus,_that.drawDate,_that.matchedRegionOneNumbers,_that.matchedRegionTwoNumber,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
-  return null;
-
-}
-}
-
-}
-
-/// @nodoc
-@JsonSerializable()
-
-class _SnLotteryTicket implements SnLotteryTicket {
-  const _SnLotteryTicket({required this.id, required this.accountId, required this.account, required final  List<int> regionOneNumbers, required this.regionTwoNumber, required this.multiplier, required this.drawStatus, required this.drawDate, required final  List<int>? matchedRegionOneNumbers, required this.matchedRegionTwoNumber, required this.createdAt, required this.updatedAt, required this.deletedAt}): _regionOneNumbers = regionOneNumbers,_matchedRegionOneNumbers = matchedRegionOneNumbers;
-  factory _SnLotteryTicket.fromJson(Map<String, dynamic> json) => _$SnLotteryTicketFromJson(json);
-
-@override final  String id;
-@override final  String accountId;
-@override final  SnAccount? account;
- final  List<int> _regionOneNumbers;
-@override List<int> get regionOneNumbers {
-  if (_regionOneNumbers is EqualUnmodifiableListView) return _regionOneNumbers;
-  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_regionOneNumbers);
-}
-
-@override final  int regionTwoNumber;
-@override final  int multiplier;
-@override final  int drawStatus;
-@override final  DateTime? drawDate;
- final  List<int>? _matchedRegionOneNumbers;
-@override List<int>? get matchedRegionOneNumbers {
-  final value = _matchedRegionOneNumbers;
-  if (value == null) return null;
-  if (_matchedRegionOneNumbers is EqualUnmodifiableListView) return _matchedRegionOneNumbers;
-  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(value);
-}
-
-@override final  int? matchedRegionTwoNumber;
-@override final  DateTime createdAt;
-@override final  DateTime updatedAt;
-@override final  DateTime? deletedAt;
-
-/// Create a copy of SnLotteryTicket
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$SnLotteryTicketCopyWith<_SnLotteryTicket> get copyWith => __$SnLotteryTicketCopyWithImpl<_SnLotteryTicket>(this, _$identity);
-
-@override
-Map<String, dynamic> toJson() {
-  return _$SnLotteryTicketToJson(this, );
-}
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnLotteryTicket&&(identical(other.id, id) || other.id == id)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&const DeepCollectionEquality().equals(other._regionOneNumbers, _regionOneNumbers)&&(identical(other.regionTwoNumber, regionTwoNumber) || other.regionTwoNumber == regionTwoNumber)&&(identical(other.multiplier, multiplier) || other.multiplier == multiplier)&&(identical(other.drawStatus, drawStatus) || other.drawStatus == drawStatus)&&(identical(other.drawDate, drawDate) || other.drawDate == drawDate)&&const DeepCollectionEquality().equals(other._matchedRegionOneNumbers, _matchedRegionOneNumbers)&&(identical(other.matchedRegionTwoNumber, matchedRegionTwoNumber) || other.matchedRegionTwoNumber == matchedRegionTwoNumber)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,id,accountId,account,const DeepCollectionEquality().hash(_regionOneNumbers),regionTwoNumber,multiplier,drawStatus,drawDate,const DeepCollectionEquality().hash(_matchedRegionOneNumbers),matchedRegionTwoNumber,createdAt,updatedAt,deletedAt);
-
-@override
-String toString() {
-  return 'SnLotteryTicket(id: $id, accountId: $accountId, account: $account, regionOneNumbers: $regionOneNumbers, regionTwoNumber: $regionTwoNumber, multiplier: $multiplier, drawStatus: $drawStatus, drawDate: $drawDate, matchedRegionOneNumbers: $matchedRegionOneNumbers, matchedRegionTwoNumber: $matchedRegionTwoNumber, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$SnLotteryTicketCopyWith<$Res> implements $SnLotteryTicketCopyWith<$Res> {
-  factory _$SnLotteryTicketCopyWith(_SnLotteryTicket value, $Res Function(_SnLotteryTicket) _then) = __$SnLotteryTicketCopyWithImpl;
-@override @useResult
-$Res call({
- String id, String accountId, SnAccount? account, List<int> regionOneNumbers, int regionTwoNumber, int multiplier, int drawStatus, DateTime? drawDate, List<int>? matchedRegionOneNumbers, int? matchedRegionTwoNumber, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
-});
-
-
-@override $SnAccountCopyWith<$Res>? get account;
-
-}
-/// @nodoc
-class __$SnLotteryTicketCopyWithImpl<$Res>
-    implements _$SnLotteryTicketCopyWith<$Res> {
-  __$SnLotteryTicketCopyWithImpl(this._self, this._then);
-
-  final _SnLotteryTicket _self;
-  final $Res Function(_SnLotteryTicket) _then;
-
-/// Create a copy of SnLotteryTicket
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? accountId = null,Object? account = freezed,Object? regionOneNumbers = null,Object? regionTwoNumber = null,Object? multiplier = null,Object? drawStatus = null,Object? drawDate = freezed,Object? matchedRegionOneNumbers = freezed,Object? matchedRegionTwoNumber = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
-  return _then(_SnLotteryTicket(
-id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
-as String,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
-as SnAccount?,regionOneNumbers: null == regionOneNumbers ? _self._regionOneNumbers : regionOneNumbers // ignore: cast_nullable_to_non_nullable
-as List<int>,regionTwoNumber: null == regionTwoNumber ? _self.regionTwoNumber : regionTwoNumber // ignore: cast_nullable_to_non_nullable
-as int,multiplier: null == multiplier ? _self.multiplier : multiplier // ignore: cast_nullable_to_non_nullable
-as int,drawStatus: null == drawStatus ? _self.drawStatus : drawStatus // ignore: cast_nullable_to_non_nullable
-as int,drawDate: freezed == drawDate ? _self.drawDate : drawDate // ignore: cast_nullable_to_non_nullable
-as DateTime?,matchedRegionOneNumbers: freezed == matchedRegionOneNumbers ? _self._matchedRegionOneNumbers : matchedRegionOneNumbers // ignore: cast_nullable_to_non_nullable
-as List<int>?,matchedRegionTwoNumber: freezed == matchedRegionTwoNumber ? _self.matchedRegionTwoNumber : matchedRegionTwoNumber // ignore: cast_nullable_to_non_nullable
-as int?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
-  ));
-}
-
-/// Create a copy of SnLotteryTicket
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnAccountCopyWith<$Res>? get account {
-    if (_self.account == null) {
-    return null;
-  }
-
-  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
-    return _then(_self.copyWith(account: value));
-  });
-}
-}
-
-
-/// @nodoc
-mixin _$SnLotteryRecord {
-
- String get id; DateTime get drawDate; List<int> get winningRegionOneNumbers; int get winningRegionTwoNumber; int get totalTickets; int get totalPrizesAwarded; double get totalPrizeAmount; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
-/// Create a copy of SnLotteryRecord
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$SnLotteryRecordCopyWith<SnLotteryRecord> get copyWith => _$SnLotteryRecordCopyWithImpl<SnLotteryRecord>(this as SnLotteryRecord, _$identity);
-
-  /// Serializes this SnLotteryRecord to a JSON map.
-  Map<String, dynamic> toJson();
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnLotteryRecord&&(identical(other.id, id) || other.id == id)&&(identical(other.drawDate, drawDate) || other.drawDate == drawDate)&&const DeepCollectionEquality().equals(other.winningRegionOneNumbers, winningRegionOneNumbers)&&(identical(other.winningRegionTwoNumber, winningRegionTwoNumber) || other.winningRegionTwoNumber == winningRegionTwoNumber)&&(identical(other.totalTickets, totalTickets) || other.totalTickets == totalTickets)&&(identical(other.totalPrizesAwarded, totalPrizesAwarded) || other.totalPrizesAwarded == totalPrizesAwarded)&&(identical(other.totalPrizeAmount, totalPrizeAmount) || other.totalPrizeAmount == totalPrizeAmount)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,id,drawDate,const DeepCollectionEquality().hash(winningRegionOneNumbers),winningRegionTwoNumber,totalTickets,totalPrizesAwarded,totalPrizeAmount,createdAt,updatedAt,deletedAt);
-
-@override
-String toString() {
-  return 'SnLotteryRecord(id: $id, drawDate: $drawDate, winningRegionOneNumbers: $winningRegionOneNumbers, winningRegionTwoNumber: $winningRegionTwoNumber, totalTickets: $totalTickets, totalPrizesAwarded: $totalPrizesAwarded, totalPrizeAmount: $totalPrizeAmount, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $SnLotteryRecordCopyWith<$Res>  {
-  factory $SnLotteryRecordCopyWith(SnLotteryRecord value, $Res Function(SnLotteryRecord) _then) = _$SnLotteryRecordCopyWithImpl;
-@useResult
-$Res call({
- String id, DateTime drawDate, List<int> winningRegionOneNumbers, int winningRegionTwoNumber, int totalTickets, int totalPrizesAwarded, double totalPrizeAmount, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
-});
-
-
-
-
-}
-/// @nodoc
-class _$SnLotteryRecordCopyWithImpl<$Res>
-    implements $SnLotteryRecordCopyWith<$Res> {
-  _$SnLotteryRecordCopyWithImpl(this._self, this._then);
-
-  final SnLotteryRecord _self;
-  final $Res Function(SnLotteryRecord) _then;
-
-/// Create a copy of SnLotteryRecord
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? drawDate = null,Object? winningRegionOneNumbers = null,Object? winningRegionTwoNumber = null,Object? totalTickets = null,Object? totalPrizesAwarded = null,Object? totalPrizeAmount = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
-  return _then(_self.copyWith(
-id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,drawDate: null == drawDate ? _self.drawDate : drawDate // ignore: cast_nullable_to_non_nullable
-as DateTime,winningRegionOneNumbers: null == winningRegionOneNumbers ? _self.winningRegionOneNumbers : winningRegionOneNumbers // ignore: cast_nullable_to_non_nullable
-as List<int>,winningRegionTwoNumber: null == winningRegionTwoNumber ? _self.winningRegionTwoNumber : winningRegionTwoNumber // ignore: cast_nullable_to_non_nullable
-as int,totalTickets: null == totalTickets ? _self.totalTickets : totalTickets // ignore: cast_nullable_to_non_nullable
-as int,totalPrizesAwarded: null == totalPrizesAwarded ? _self.totalPrizesAwarded : totalPrizesAwarded // ignore: cast_nullable_to_non_nullable
-as int,totalPrizeAmount: null == totalPrizeAmount ? _self.totalPrizeAmount : totalPrizeAmount // ignore: cast_nullable_to_non_nullable
-as double,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
-  ));
-}
-
-}
-
-
-/// Adds pattern-matching-related methods to [SnLotteryRecord].
-extension SnLotteryRecordPatterns on SnLotteryRecord {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnLotteryRecord value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _SnLotteryRecord() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnLotteryRecord value)  $default,){
-final _that = this;
-switch (_that) {
-case _SnLotteryRecord():
-return $default(_that);}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnLotteryRecord value)?  $default,){
-final _that = this;
-switch (_that) {
-case _SnLotteryRecord() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  DateTime drawDate,  List<int> winningRegionOneNumbers,  int winningRegionTwoNumber,  int totalTickets,  int totalPrizesAwarded,  double totalPrizeAmount,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _SnLotteryRecord() when $default != null:
-return $default(_that.id,_that.drawDate,_that.winningRegionOneNumbers,_that.winningRegionTwoNumber,_that.totalTickets,_that.totalPrizesAwarded,_that.totalPrizeAmount,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  DateTime drawDate,  List<int> winningRegionOneNumbers,  int winningRegionTwoNumber,  int totalTickets,  int totalPrizesAwarded,  double totalPrizeAmount,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
-switch (_that) {
-case _SnLotteryRecord():
-return $default(_that.id,_that.drawDate,_that.winningRegionOneNumbers,_that.winningRegionTwoNumber,_that.totalTickets,_that.totalPrizesAwarded,_that.totalPrizeAmount,_that.createdAt,_that.updatedAt,_that.deletedAt);}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  DateTime drawDate,  List<int> winningRegionOneNumbers,  int winningRegionTwoNumber,  int totalTickets,  int totalPrizesAwarded,  double totalPrizeAmount,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
-switch (_that) {
-case _SnLotteryRecord() when $default != null:
-return $default(_that.id,_that.drawDate,_that.winningRegionOneNumbers,_that.winningRegionTwoNumber,_that.totalTickets,_that.totalPrizesAwarded,_that.totalPrizeAmount,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
-  return null;
-
-}
-}
-
-}
-
-/// @nodoc
-@JsonSerializable()
-
-class _SnLotteryRecord implements SnLotteryRecord {
-  const _SnLotteryRecord({required this.id, required this.drawDate, required final  List<int> winningRegionOneNumbers, required this.winningRegionTwoNumber, required this.totalTickets, required this.totalPrizesAwarded, required this.totalPrizeAmount, required this.createdAt, required this.updatedAt, required this.deletedAt}): _winningRegionOneNumbers = winningRegionOneNumbers;
-  factory _SnLotteryRecord.fromJson(Map<String, dynamic> json) => _$SnLotteryRecordFromJson(json);
-
-@override final  String id;
-@override final  DateTime drawDate;
- final  List<int> _winningRegionOneNumbers;
-@override List<int> get winningRegionOneNumbers {
-  if (_winningRegionOneNumbers is EqualUnmodifiableListView) return _winningRegionOneNumbers;
-  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_winningRegionOneNumbers);
-}
-
-@override final  int winningRegionTwoNumber;
-@override final  int totalTickets;
-@override final  int totalPrizesAwarded;
-@override final  double totalPrizeAmount;
-@override final  DateTime createdAt;
-@override final  DateTime updatedAt;
-@override final  DateTime? deletedAt;
-
-/// Create a copy of SnLotteryRecord
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$SnLotteryRecordCopyWith<_SnLotteryRecord> get copyWith => __$SnLotteryRecordCopyWithImpl<_SnLotteryRecord>(this, _$identity);
-
-@override
-Map<String, dynamic> toJson() {
-  return _$SnLotteryRecordToJson(this, );
-}
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnLotteryRecord&&(identical(other.id, id) || other.id == id)&&(identical(other.drawDate, drawDate) || other.drawDate == drawDate)&&const DeepCollectionEquality().equals(other._winningRegionOneNumbers, _winningRegionOneNumbers)&&(identical(other.winningRegionTwoNumber, winningRegionTwoNumber) || other.winningRegionTwoNumber == winningRegionTwoNumber)&&(identical(other.totalTickets, totalTickets) || other.totalTickets == totalTickets)&&(identical(other.totalPrizesAwarded, totalPrizesAwarded) || other.totalPrizesAwarded == totalPrizesAwarded)&&(identical(other.totalPrizeAmount, totalPrizeAmount) || other.totalPrizeAmount == totalPrizeAmount)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,id,drawDate,const DeepCollectionEquality().hash(_winningRegionOneNumbers),winningRegionTwoNumber,totalTickets,totalPrizesAwarded,totalPrizeAmount,createdAt,updatedAt,deletedAt);
-
-@override
-String toString() {
-  return 'SnLotteryRecord(id: $id, drawDate: $drawDate, winningRegionOneNumbers: $winningRegionOneNumbers, winningRegionTwoNumber: $winningRegionTwoNumber, totalTickets: $totalTickets, totalPrizesAwarded: $totalPrizesAwarded, totalPrizeAmount: $totalPrizeAmount, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$SnLotteryRecordCopyWith<$Res> implements $SnLotteryRecordCopyWith<$Res> {
-  factory _$SnLotteryRecordCopyWith(_SnLotteryRecord value, $Res Function(_SnLotteryRecord) _then) = __$SnLotteryRecordCopyWithImpl;
-@override @useResult
-$Res call({
- String id, DateTime drawDate, List<int> winningRegionOneNumbers, int winningRegionTwoNumber, int totalTickets, int totalPrizesAwarded, double totalPrizeAmount, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
-});
-
-
-
-
-}
-/// @nodoc
-class __$SnLotteryRecordCopyWithImpl<$Res>
-    implements _$SnLotteryRecordCopyWith<$Res> {
-  __$SnLotteryRecordCopyWithImpl(this._self, this._then);
-
-  final _SnLotteryRecord _self;
-  final $Res Function(_SnLotteryRecord) _then;
-
-/// Create a copy of SnLotteryRecord
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? drawDate = null,Object? winningRegionOneNumbers = null,Object? winningRegionTwoNumber = null,Object? totalTickets = null,Object? totalPrizesAwarded = null,Object? totalPrizeAmount = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
-  return _then(_SnLotteryRecord(
-id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,drawDate: null == drawDate ? _self.drawDate : drawDate // ignore: cast_nullable_to_non_nullable
-as DateTime,winningRegionOneNumbers: null == winningRegionOneNumbers ? _self._winningRegionOneNumbers : winningRegionOneNumbers // ignore: cast_nullable_to_non_nullable
-as List<int>,winningRegionTwoNumber: null == winningRegionTwoNumber ? _self.winningRegionTwoNumber : winningRegionTwoNumber // ignore: cast_nullable_to_non_nullable
-as int,totalTickets: null == totalTickets ? _self.totalTickets : totalTickets // ignore: cast_nullable_to_non_nullable
-as int,totalPrizesAwarded: null == totalPrizesAwarded ? _self.totalPrizesAwarded : totalPrizesAwarded // ignore: cast_nullable_to_non_nullable
-as int,totalPrizeAmount: null == totalPrizeAmount ? _self.totalPrizeAmount : totalPrizeAmount // ignore: cast_nullable_to_non_nullable
-as double,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
-  ));
-}
-
-
-}
-
 // dart format on
--- a/lib/models/wallet.g.dart
+++ b/lib/models/wallet.g.dart
@@ -414,88 +414,3 @@ Map<String, dynamic> _$SnWalletFundRecipientToJson(
  'updated_at': instance.updatedAt.toIso8601String(),
  'deleted_at': instance.deletedAt?.toIso8601String(),
 };
-
-_SnLotteryTicket _$SnLotteryTicketFromJson(Map<String, dynamic> json) =>
-    _SnLotteryTicket(
-      id: json['id'] as String,
-      accountId: json['account_id'] as String,
-      account:
-          json['account'] == null
-              ? null
-              : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
-      regionOneNumbers:
-          (json['region_one_numbers'] as List<dynamic>)
-              .map((e) => (e as num).toInt())
-              .toList(),
-      regionTwoNumber: (json['region_two_number'] as num).toInt(),
-      multiplier: (json['multiplier'] as num).toInt(),
-      drawStatus: (json['draw_status'] as num).toInt(),
-      drawDate:
-          json['draw_date'] == null
-              ? null
-              : DateTime.parse(json['draw_date'] as String),
-      matchedRegionOneNumbers:
-          (json['matched_region_one_numbers'] as List<dynamic>?)
-              ?.map((e) => (e as num).toInt())
-              .toList(),
-      matchedRegionTwoNumber:
-          (json['matched_region_two_number'] as num?)?.toInt(),
-      createdAt: DateTime.parse(json['created_at'] as String),
-      updatedAt: DateTime.parse(json['updated_at'] as String),
-      deletedAt:
-          json['deleted_at'] == null
-              ? null
-              : DateTime.parse(json['deleted_at'] as String),
-    );
-
-Map<String, dynamic> _$SnLotteryTicketToJson(_SnLotteryTicket instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'account_id': instance.accountId,
-      'account': instance.account?.toJson(),
-      'region_one_numbers': instance.regionOneNumbers,
-      'region_two_number': instance.regionTwoNumber,
-      'multiplier': instance.multiplier,
-      'draw_status': instance.drawStatus,
-      'draw_date': instance.drawDate?.toIso8601String(),
-      'matched_region_one_numbers': instance.matchedRegionOneNumbers,
-      'matched_region_two_number': instance.matchedRegionTwoNumber,
-      'created_at': instance.createdAt.toIso8601String(),
-      'updated_at': instance.updatedAt.toIso8601String(),
-      'deleted_at': instance.deletedAt?.toIso8601String(),
-    };
-
-_SnLotteryRecord _$SnLotteryRecordFromJson(Map<String, dynamic> json) =>
-    _SnLotteryRecord(
-      id: json['id'] as String,
-      drawDate: DateTime.parse(json['draw_date'] as String),
-      winningRegionOneNumbers:
-          (json['winning_region_one_numbers'] as List<dynamic>)
-              .map((e) => (e as num).toInt())
-              .toList(),
-      winningRegionTwoNumber:
-          (json['winning_region_two_number'] as num).toInt(),
-      totalTickets: (json['total_tickets'] as num).toInt(),
-      totalPrizesAwarded: (json['total_prizes_awarded'] as num).toInt(),
-      totalPrizeAmount: (json['total_prize_amount'] as num).toDouble(),
-      createdAt: DateTime.parse(json['created_at'] as String),
-      updatedAt: DateTime.parse(json['updated_at'] as String),
-      deletedAt:
-          json['deleted_at'] == null
-              ? null
-              : DateTime.parse(json['deleted_at'] as String),
-    );
-
-Map<String, dynamic> _$SnLotteryRecordToJson(_SnLotteryRecord instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'draw_date': instance.drawDate.toIso8601String(),
-      'winning_region_one_numbers': instance.winningRegionOneNumbers,
-      'winning_region_two_number': instance.winningRegionTwoNumber,
-      'total_tickets': instance.totalTickets,
-      'total_prizes_awarded': instance.totalPrizesAwarded,
-      'total_prize_amount': instance.totalPrizeAmount,
-      'created_at': instance.createdAt.toIso8601String(),
-      'updated_at': instance.updatedAt.toIso8601String(),
-      'deleted_at': instance.deletedAt?.toIso8601String(),
-    };
--- a/lib/pods/activity/activity_rpc.dart
+++ b/lib/pods/activity/activity_rpc.dart
@@ -433,7 +433,7 @@ Future<void> setRemoteActivityStatus(
 ) async {
  final apiClient = ref.read(apiClientProvider);
  await apiClient.post(
-    '/pass/accounts/me/statuses',
+    '/id/accounts/me/statuses',
    data: {
      'is_invisible': false,
      'is_not_disturb': false,
@@ -448,7 +448,7 @@ Future<void> setRemoteActivityStatus(
 Future<void> unsetRemoteActivityStatus(Ref ref, String appId) async {
  final apiClient = ref.read(apiClientProvider);
  await apiClient.delete(
-    '/pass/accounts/me/statuses',
+    '/id/accounts/me/statuses',
    queryParameters: {'app': appId},
  );
 }
--- a/lib/pods/chat/call.dart
+++ b/lib/pods/chat/call.dart
@@ -3,13 +3,15 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart';
-import 'package:island/widgets/alert.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/userinfo.dart';
 import 'package:island/widgets/chat/call_button.dart';
-import 'package:livekit_client/livekit_client.dart' as lk;
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/models/chat.dart';
+import 'package:island/models/account.dart';
+import 'package:island/pods/chat/webrtc_manager.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 import 'package:island/talker.dart';

@@ -43,193 +45,212 @@ sealed class CallParticipantLive with _$CallParticipantLive {

  const factory CallParticipantLive({
    required CallParticipant participant,
-    required lk.Participant remoteParticipant,
+    required WebRTCParticipant remoteParticipant,
  }) = _CallParticipantLive;

-  bool get isSpeaking => remoteParticipant.isSpeaking;
-  bool get isMuted =>
-      remoteParticipant.isMuted || !remoteParticipant.isMicrophoneEnabled();
-  bool get isScreenSharing => remoteParticipant.isScreenShareEnabled();
-  bool get isScreenSharingWithAudio =>
-      remoteParticipant.isScreenShareAudioEnabled();
+  bool get isSpeaking {
+    // Use the actual audio level from WebRTC monitoring
+    return remoteParticipant.audioLevel > 0.1; // Threshold for speaking
+  }

-  bool get hasVideo => remoteParticipant.hasVideo;
-  bool get hasAudio => remoteParticipant.hasAudio;
+  double get audioLevel => remoteParticipant.audioLevel;
+
+  bool get isMuted => !remoteParticipant.isAudioEnabled;
+  bool get isScreenSharing => remoteParticipant.isVideoEnabled; // Simplified
+  bool get isScreenSharingWithAudio => false; // TODO: Implement screen sharing
+
+  bool get hasVideo => remoteParticipant.isVideoEnabled;
+  bool get hasAudio => remoteParticipant.isAudioEnabled;
 }

@Riverpod(keepAlive: true)
 class CallNotifier extends _$CallNotifier {
-  lk.Room? _room;
-  lk.LocalParticipant? _localParticipant;
+  WebRTCManager? _webrtcManager;
  List<CallParticipantLive> _participants = [];
  final Map<String, CallParticipant> _participantInfoByIdentity = {};
-  lk.EventsListener? _roomListener;
+  StreamSubscription<WebRTCParticipant>? _participantJoinedSubscription;
+  StreamSubscription<String>? _participantLeftSubscription;

  List<CallParticipantLive> get participants =>
      List.unmodifiable(_participants);
-  lk.LocalParticipant? get localParticipant => _localParticipant;

  Map<String, double> participantsVolumes = {};

  Timer? _durationTimer;

-  lk.Room? get room => _room;
+  String? _roomId;
+  String? get roomId => _roomId;
+  WebRTCManager? get webrtcManager => _webrtcManager;

  @override
  CallState build() {
    // Subscribe to websocket updates
    return const CallState(
      isConnected: false,
-      isMicrophoneEnabled: true,
-      isCameraEnabled: false,
+      isMicrophoneEnabled:
+          true, // Audio enabled by default (matches WebRTC init)
+      isCameraEnabled: true, // Video enabled by default (matches WebRTC init)
      isScreenSharing: false,
      isSpeakerphone: true,
    );
  }

-  void _initRoomListeners() {
-    if (_room == null) return;
-    _roomListener?.dispose();
-    _roomListener = _room!.createListener();
-    _room!.addListener(_onRoomChange);
-    _roomListener!
-      ..on<lk.ParticipantConnectedEvent>((e) {
-        _refreshLiveParticipants();
-      })
-      ..on<lk.RoomDisconnectedEvent>((e) {
-        _participants = [];
-        state = state.copyWith();
-      });
-  }
+  void _initWebRTCListeners() {
+    _participantJoinedSubscription?.cancel();
+    _participantLeftSubscription?.cancel();

-  void _onRoomChange() {
-    _refreshLiveParticipants();
-  }
-
-  void _refreshLiveParticipants() {
-    if (_room == null) return;
-    final remoteParticipants = _room!.remoteParticipants;
-    _participants = [];
-    // Add local participant first if available
-    if (_localParticipant != null) {
-      final localInfo = _buildParticipant();
-      _participants.add(
-        CallParticipantLive(
-          participant: localInfo,
-          remoteParticipant: _localParticipant!,
-        ),
-      );
-    }
-    // Add remote participants
-    _participants.addAll(
-      remoteParticipants.values.map((remote) {
-        final match =
-            _participantInfoByIdentity[remote.identity] ??
-            CallParticipant(
-              identity: remote.identity,
-              name: remote.identity,
-              joinedAt: DateTime.now(),
-            );
-        return CallParticipantLive(
-          participant: match,
-          remoteParticipant: remote,
-        );
-      }),
+    _participantJoinedSubscription = _webrtcManager?.onParticipantJoined.listen(
+      (participant) {
+        _updateLiveParticipantsFromWebRTC();
+      },
    );
+
+    _participantLeftSubscription = _webrtcManager?.onParticipantLeft.listen((
+      participantId,
+    ) {
+      _participants.removeWhere((p) => p.remoteParticipant.id == participantId);
+      state = state.copyWith();
+    });
+
+    // Add local participant immediately when WebRTC is initialized
+    final userinfo = ref.watch(userInfoProvider);
+    if (userinfo.value != null) {
+      _addLocalParticipant(userinfo.value!);
+    }
+  }
+
+  void _addLocalParticipant(SnAccount userinfo) {
+    if (_webrtcManager == null) return;
+
+    // Remove any existing local participant first
+    _participants.removeWhere((p) => p.participant.identity == userinfo.id);
+
+    // Add local participant (current user)
+    final localParticipant = CallParticipantLive(
+      participant: CallParticipant(
+        identity: userinfo.id, // Use roomId as local identity
+        name: userinfo.name,
+        accountId: userinfo.id,
+        account: userinfo,
+        joinedAt: DateTime.now(),
+      ),
+      remoteParticipant: WebRTCParticipant(
+        id: _webrtcManager!.roomId,
+        name: userinfo.nick,
+        userinfo: userinfo,
+        isLocal: true,
+      )..remoteStream = _webrtcManager!.localStream, // Access local stream
+    );
+
+    _participants.insert(0, localParticipant); // Add at the beginning
    state = state.copyWith();
  }

-  /// Builds the CallParticipant object for the local participant.
-  /// Optionally, pass [participants] if you want to prioritize info from the latest list.
-  CallParticipant _buildParticipant({List<CallParticipant>? participants}) {
-    if (_localParticipant == null) {
-      throw StateError('No local participant available');
-    }
-    // Prefer info from the latest participants list if available
-    if (participants != null) {
-      final idx = participants.indexWhere(
-        (p) => p.identity == _localParticipant!.identity,
-      );
-      if (idx != -1) return participants[idx];
-    }
+  void _updateLiveParticipantsFromWebRTC() {
+    if (_webrtcManager == null) return;

-    // Otherwise, use info from the identity map or fallback to minimal
-    return _participantInfoByIdentity[_localParticipant!.identity] ??
-        CallParticipant(
-          identity: _localParticipant!.identity,
-          name: _localParticipant!.identity,
-          joinedAt: DateTime.now(),
-        );
-  }
+    final webrtcParticipants = _webrtcManager!.participants;

-  void _updateLiveParticipants(List<CallParticipant> participants) {
-    // Update the info map for lookup
-    for (final p in participants) {
-      _participantInfoByIdentity[p.identity] = p;
-    }
-    if (_room == null) {
-      // Can't build live objects, just store empty
-      _participants = [];
-      state = state.copyWith();
-      return;
-    }
-    final remoteParticipants = _room!.remoteParticipants;
-    final remotes = remoteParticipants.values.toList();
-    _participants = [];
-    // Add local participant if present in the list
-    if (_localParticipant != null) {
-      final localInfo = _buildParticipant(participants: participants);
-      _participants.add(
-        CallParticipantLive(
-          participant: localInfo,
-          remoteParticipant: _localParticipant!,
-        ),
-      );
-      state = state.copyWith();
-    }
-    // Add remote participants
-    _participants.addAll(
-      participants.map((p) {
-        lk.RemoteParticipant? remote;
-        for (final r in remotes) {
-          if (r.identity == p.identity) {
-            remote = r;
-            break;
-          }
-        }
-        if (_localParticipant != null &&
-            p.identity == _localParticipant!.identity) {
-          return null; // Already added local
-        }
-        return remote != null
-            ? CallParticipantLive(participant: p, remoteParticipant: remote)
+    // Always ensure local participant exists
+    final existingLocalParticipant =
+        _participants.isNotEmpty &&
+                _participants[0].remoteParticipant.id == _webrtcManager!.roomId
+            ? _participants[0]
            : null;
-      }).whereType<CallParticipantLive>(),
-    );
+
+    final localParticipant =
+        existingLocalParticipant ?? _createLocalParticipant();
+
+    // Add remote participants
+    final remoteParticipants =
+        webrtcParticipants.map((p) {
+          final participantInfo =
+              _participantInfoByIdentity[p.id] ??
+              CallParticipant(
+                identity: p.id,
+                name: p.name,
+                accountId: p.userinfo.id,
+                account: p.userinfo,
+                joinedAt: DateTime.now(),
+              );
+          return CallParticipantLive(
+            participant: participantInfo,
+            remoteParticipant: p,
+          );
+        }).toList();
+
+    // Combine local participant with remote participants
+    _participants = [localParticipant, ...remoteParticipants];
+
    state = state.copyWith();
  }

-  String? _roomId;
-  String? get roomId => _roomId;
+  CallParticipantLive _createLocalParticipant() {
+    return CallParticipantLive(
+      participant: CallParticipant(
+        identity: _webrtcManager!.roomId, // Use roomId as local identity
+        name: 'You',
+        accountId: '',
+        account: null,
+        joinedAt: DateTime.now(),
+      ),
+      remoteParticipant: WebRTCParticipant(
+        id: _webrtcManager!.roomId,
+        name: 'You',
+        userinfo: SnAccount(
+          id: '',
+          name: '',
+          nick: '',
+          language: '',
+          isSuperuser: false,
+          automatedId: null,
+          profile: SnAccountProfile(
+            id: '',
+            firstName: '',
+            middleName: '',
+            lastName: '',
+            bio: '',
+            gender: '',
+            pronouns: '',
+            location: '',
+            timeZone: '',
+            links: [],
+            experience: 0,
+            level: 0,
+            socialCredits: 0,
+            socialCreditsLevel: 0,
+            levelingProgress: 0,
+            picture: null,
+            background: null,
+            verification: null,
+            usernameColor: null,
+            createdAt: DateTime.now(),
+            updatedAt: DateTime.now(),
+            deletedAt: null,
+          ),
+          perkSubscription: null,
+          createdAt: DateTime.now(),
+          updatedAt: DateTime.now(),
+          deletedAt: null,
+        ),
+      )..remoteStream = _webrtcManager!.localStream, // Access local stream
+    );
+  }

  Future<void> joinRoom(String roomId) async {
-    if (_roomId == roomId && _room != null) {
-      talker.info('[Call] Call skipped. Already has data');
-      return;
-    } else if (_room != null) {
-      if (!_room!.isDisposed &&
-          _room!.connectionState != lk.ConnectionState.disconnected) {
-        throw Exception('Call already connected');
+    if (_roomId == roomId && _webrtcManager != null) {
+      talker.info('[Call] Call skipped. Already connected to this room');
+      // Ensure state is connected even if we skip the join process
+      if (!state.isConnected) {
+        state = state.copyWith(isConnected: true);
      }
+      return;
    }
    _roomId = roomId;
-    if (_room != null) {
-      await _room!.disconnect();
-      await _room!.dispose();
-      _room = null;
-      _localParticipant = null;
-      _participants = [];
-    }
+
+    // Clean up existing connection
+    await disconnect();
+
    try {
      final apiClient = ref.read(apiClientProvider);
      final ongoingCall = await ref.read(ongoingCallProvider(roomId).future);
@@ -241,8 +262,11 @@ class CallNotifier extends _$CallNotifier {
        // Parse join response
        final joinResponse = ChatRealtimeJoinResponse.fromJson(data);
        final participants = joinResponse.participants;
-        final String endpoint = joinResponse.endpoint;
-        final String token = joinResponse.token;
+
+        // Update participant info map
+        for (final p in participants) {
+          _participantInfoByIdentity[p.identity] = p;
+        }

        // Setup duration timer
        _durationTimer?.cancel();
@@ -257,47 +281,18 @@ class CallNotifier extends _$CallNotifier {
          );
        });

-        // Connect to LiveKit
-        _room = lk.Room();
+        // Initialize WebRTC manager
+        final serverUrl = ref.watch(serverUrlProvider);

-        await _room!.connect(
-          endpoint,
-          token,
-          connectOptions: lk.ConnectOptions(autoSubscribe: true),
-          roomOptions: lk.RoomOptions(adaptiveStream: true, dynacast: true),
-          fastConnectOptions: lk.FastConnectOptions(
-            microphone: lk.TrackOption(enabled: true),
-          ),
-        );
-        _localParticipant = _room!.localParticipant;
+        _webrtcManager = WebRTCManager(roomId: roomId, serverUrl: serverUrl);

-        _initRoomListeners();
-        _updateLiveParticipants(participants);
+        await _webrtcManager!.initialize(ref);
+        _initWebRTCListeners();

        if (!kIsWeb && (Platform.isIOS || Platform.isAndroid)) {
-          lk.Hardware.instance.setSpeakerphoneOn(true);
+          // TODO: Implement speakerphone control for WebRTC
        }

-        // Listen for connection updates
-        _room!.addListener(() {
-          final wasConnected = state.isConnected;
-          final isNowConnected =
-              _room!.connectionState == lk.ConnectionState.connected;
-          state = state.copyWith(
-            isConnected: isNowConnected,
-            isMicrophoneEnabled: _localParticipant!.isMicrophoneEnabled(),
-            isCameraEnabled: _localParticipant!.isCameraEnabled(),
-            isScreenSharing: _localParticipant!.isScreenShareEnabled(),
-          );
-          // Enable wakelock when call connects
-          if (!wasConnected && isNowConnected) {
-            WakelockPlus.enable();
-          }
-          // Disable wakelock when call disconnects
-          else if (wasConnected && !isNowConnected) {
-            WakelockPlus.disable();
-          }
-        });
        state = state.copyWith(isConnected: true);
        // Enable wakelock when call connects
        WakelockPlus.enable();
@@ -310,104 +305,114 @@ class CallNotifier extends _$CallNotifier {
  }

  Future<void> toggleMicrophone() async {
-    if (_localParticipant != null) {
-      const autostop = true;
-      final target = !_localParticipant!.isMicrophoneEnabled();
-      state = state.copyWith(isMicrophoneEnabled: target);
-      if (target) {
-        await _localParticipant!.audioTrackPublications.firstOrNull?.unmute(
-          stopOnMute: autostop,
-        );
-      } else {
-        await _localParticipant!.audioTrackPublications.firstOrNull?.mute(
-          stopOnMute: autostop,
-        );
-      }
-      state = state.copyWith();
+    final target = !state.isMicrophoneEnabled;
+    state = state.copyWith(isMicrophoneEnabled: target);
+    await _webrtcManager?.toggleMicrophone(target);
+
+    // Update local participant's audio state
+    if (_participants.isNotEmpty) {
+      _participants[0].remoteParticipant.isAudioEnabled = target;
+      state = state.copyWith(); // Trigger UI update
    }
  }

  Future<void> toggleCamera() async {
-    if (_localParticipant != null) {
-      final target = !_localParticipant!.isCameraEnabled();
-      state = state.copyWith(isCameraEnabled: target);
-      await _localParticipant!.setCameraEnabled(target);
-      state = state.copyWith();
+    final target = !state.isCameraEnabled;
+    state = state.copyWith(isCameraEnabled: target);
+    await _webrtcManager?.toggleCamera(target);
+
+    // Update local participant's video state
+    if (_participants.isNotEmpty) {
+      _participants[0].remoteParticipant.isVideoEnabled = target;
+      state = state.copyWith(); // Trigger UI update
    }
  }

  Future<void> toggleScreenShare(BuildContext context) async {
-    if (_localParticipant != null) {
-      final target = !_localParticipant!.isScreenShareEnabled();
-      state = state.copyWith(isScreenSharing: target);
+    if (_webrtcManager == null) return;

-      if (target && lk.lkPlatformIsDesktop()) {
-        try {
-          final source = await showDialog<DesktopCapturerSource>(
-            context: context,
-            builder: (context) => lk.ScreenSelectDialog(),
-          );
-          if (source == null) {
-            return;
-          }
-          var track = await lk.LocalVideoTrack.createScreenShareTrack(
-            lk.ScreenShareCaptureOptions(
-              sourceId: source.id,
-              maxFrameRate: 30.0,
-              captureScreenAudio: true,
-            ),
-          );
-          await _localParticipant!.publishVideoTrack(track);
-        } catch (err) {
-          showErrorAlert(err);
-        }
-        return;
+    try {
+      if (state.isScreenSharing) {
+        // Stop screen sharing - switch back to camera
+        await _webrtcManager!.toggleCamera(state.isCameraEnabled);
+        state = state.copyWith(isScreenSharing: false);
      } else {
-        await _localParticipant!.setScreenShareEnabled(target);
-      }
+        // Start screen sharing
+        if (WebRTC.platformIsDesktop) {
+          // For desktop, we need to get screen capture source
+          // This would require implementing a screen selection dialog
+          // For now, just toggle the state
+          state = state.copyWith(isScreenSharing: true);
+        } else if (WebRTC.platformIsWeb) {
+          // For web, get display media directly
+          await navigator.mediaDevices.getDisplayMedia({
+            'video': true,
+            'audio':
+                false, // Screen sharing typically doesn't include system audio
+          });

-      state = state.copyWith();
+          // Replace video track with screen sharing track
+          // This is a simplified implementation
+          state = state.copyWith(isScreenSharing: true);
+        }
+      }
+    } catch (e) {
+      talker.error('[Call] Screen sharing error: $e');
+      state = state.copyWith(error: 'Failed to toggle screen sharing: $e');
    }
  }

  Future<void> toggleSpeakerphone() async {
-    state = state.copyWith(isSpeakerphone: !state.isSpeakerphone);
-    await lk.Hardware.instance.setSpeakerphoneOn(state.isSpeakerphone);
-    state = state.copyWith();
+    if (!kIsWeb && (Platform.isIOS || Platform.isAndroid)) {
+      try {
+        // For mobile platforms, we can control audio routing
+        // This is a simplified implementation
+        final newSpeakerphoneState = !state.isSpeakerphone;
+        state = state.copyWith(isSpeakerphone: newSpeakerphoneState);
+
+        // Note: Actual speakerphone control would require platform-specific code
+        // For a full implementation, you'd need to use platform channels
+        // to control audio routing on iOS/Android
+        talker.info('[Call] Speakerphone toggled to: $newSpeakerphoneState');
+      } catch (e) {
+        talker.error('[Call] Speakerphone control error: $e');
+        state = state.copyWith(error: 'Failed to toggle speakerphone: $e');
+      }
+    } else {
+      // For web/desktop, speakerphone control is handled by the browser/OS
+      state = state.copyWith(isSpeakerphone: !state.isSpeakerphone);
+    }
  }

  Future<void> disconnect() async {
-    if (_room != null) {
-      await _room!.disconnect();
-      state = state.copyWith(
-        isConnected: false,
-        isMicrophoneEnabled: false,
-        isCameraEnabled: false,
-        isScreenSharing: false,
-      );
-      // Disable wakelock when call disconnects
-      WakelockPlus.disable();
-    }
+    _webrtcManager?.dispose();
+    _webrtcManager = null;
+    _participantJoinedSubscription?.cancel();
+    _participantLeftSubscription?.cancel();
+    _participants.clear();
+    state = state.copyWith(
+      isConnected: false,
+      isMicrophoneEnabled: false,
+      isCameraEnabled: false,
+      isScreenSharing: false,
+    );
+    // Disable wakelock when call disconnects
+    WakelockPlus.disable();
  }

  void setParticipantVolume(CallParticipantLive live, double volume) {
-    if (participantsVolumes[live.remoteParticipant.sid] == null) {
-      participantsVolumes[live.remoteParticipant.sid] = 1;
-    }
-    Helper.setVolume(
-      volume,
-      live
-          .remoteParticipant
-          .audioTrackPublications
-          .first
-          .track!
-          .mediaStreamTrack,
+    // Store volume setting for this participant
+    // Note: WebRTC doesn't have built-in per-participant volume control
+    // This is just storing the preference for UI purposes
+    // Actual volume control would need to be implemented at the audio rendering level
+    participantsVolumes[live.remoteParticipant.id] = volume.clamp(0.0, 1.0);
+    talker.info(
+      '[Call] Volume set to $volume for participant ${live.remoteParticipant.id}',
    );
-    participantsVolumes[live.remoteParticipant.sid] = volume;
  }

  double getParticipantVolume(CallParticipantLive live) {
-    return participantsVolumes[live.remoteParticipant.sid] ?? 1;
+    return participantsVolumes[live.remoteParticipant.id] ?? 1.0;
  }

  void dispose() {
@@ -418,9 +423,10 @@ class CallNotifier extends _$CallNotifier {
      isCameraEnabled: false,
      isScreenSharing: false,
    );
-    _roomListener?.dispose();
-    _room?.removeListener(_onRoomChange);
-    _room?.dispose();
+    _participantJoinedSubscription?.cancel();
+    _participantLeftSubscription?.cancel();
+    _webrtcManager?.dispose();
+    _webrtcManager = null;
    _durationTimer?.cancel();
    _roomId = null;
    participantsVolumes = {};
--- a/lib/pods/chat/call.freezed.dart
+++ b/lib/pods/chat/call.freezed.dart
@@ -295,7 +295,7 @@ as String?,
 /// @nodoc
 mixin _$CallParticipantLive implements DiagnosticableTreeMixin {

- CallParticipant get participant; lk.Participant get remoteParticipant;
+ CallParticipant get participant; WebRTCParticipant get remoteParticipant;
 /// Create a copy of CallParticipantLive
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -332,7 +332,7 @@ abstract mixin class $CallParticipantLiveCopyWith<$Res>  {
  factory $CallParticipantLiveCopyWith(CallParticipantLive value, $Res Function(CallParticipantLive) _then) = _$CallParticipantLiveCopyWithImpl;
@useResult
 $Res call({
- CallParticipant participant, lk.Participant remoteParticipant
+ CallParticipant participant, WebRTCParticipant remoteParticipant
 });


@@ -353,7 +353,7 @@ class _$CallParticipantLiveCopyWithImpl<$Res>
  return _then(_self.copyWith(
 participant: null == participant ? _self.participant : participant // ignore: cast_nullable_to_non_nullable
 as CallParticipant,remoteParticipant: null == remoteParticipant ? _self.remoteParticipant : remoteParticipant // ignore: cast_nullable_to_non_nullable
-as lk.Participant,
+as WebRTCParticipant,
  ));
 }
 /// Create a copy of CallParticipantLive
@@ -444,7 +444,7 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( CallParticipant participant,  lk.Participant remoteParticipant)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( CallParticipant participant,  WebRTCParticipant remoteParticipant)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _CallParticipantLive() when $default != null:
 return $default(_that.participant,_that.remoteParticipant);case _:
@@ -465,7 +465,7 @@ return $default(_that.participant,_that.remoteParticipant);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( CallParticipant participant,  lk.Participant remoteParticipant)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( CallParticipant participant,  WebRTCParticipant remoteParticipant)  $default,) {final _that = this;
 switch (_that) {
 case _CallParticipantLive():
 return $default(_that.participant,_that.remoteParticipant);}
@@ -482,7 +482,7 @@ return $default(_that.participant,_that.remoteParticipant);}
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( CallParticipant participant,  lk.Participant remoteParticipant)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( CallParticipant participant,  WebRTCParticipant remoteParticipant)?  $default,) {final _that = this;
 switch (_that) {
 case _CallParticipantLive() when $default != null:
 return $default(_that.participant,_that.remoteParticipant);case _:
@@ -501,7 +501,7 @@ class _CallParticipantLive extends CallParticipantLive with DiagnosticableTreeMi
  

@override final  CallParticipant participant;
-@override final  lk.Participant remoteParticipant;
+@override final  WebRTCParticipant remoteParticipant;

 /// Create a copy of CallParticipantLive
 /// with the given fields replaced by the non-null parameter values.
@@ -539,7 +539,7 @@ abstract mixin class _$CallParticipantLiveCopyWith<$Res> implements $CallPartici
  factory _$CallParticipantLiveCopyWith(_CallParticipantLive value, $Res Function(_CallParticipantLive) _then) = __$CallParticipantLiveCopyWithImpl;
@override @useResult
 $Res call({
- CallParticipant participant, lk.Participant remoteParticipant
+ CallParticipant participant, WebRTCParticipant remoteParticipant
 });


@@ -560,7 +560,7 @@ class __$CallParticipantLiveCopyWithImpl<$Res>
  return _then(_CallParticipantLive(
 participant: null == participant ? _self.participant : participant // ignore: cast_nullable_to_non_nullable
 as CallParticipant,remoteParticipant: null == remoteParticipant ? _self.remoteParticipant : remoteParticipant // ignore: cast_nullable_to_non_nullable
-as lk.Participant,
+as WebRTCParticipant,
  ));
 }

--- a/lib/pods/chat/call.g.dart
+++ b/lib/pods/chat/call.g.dart
@@ -6,7 +6,7 @@ part of 'call.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$callNotifierHash() => r'a8ca3f625c0db3ad9992033ae70864ce15efc281';
+String _$callNotifierHash() => r'4015d326388553c46859fe537e84d2c9da4236c9';

 /// See also [CallNotifier].
@ProviderFor(CallNotifier)
--- a/lib/pods/chat/webrtc_manager.dart
+++ b/lib/pods/chat/webrtc_manager.dart
@@ -0,0 +1,476 @@
+import 'dart:async';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_webrtc/flutter_webrtc.dart';
+import 'package:island/models/account.dart';
+import 'package:island/pods/chat/webrtc_signaling.dart';
+import 'package:island/pods/userinfo.dart';
+import 'package:island/talker.dart';
+
+class WebRTCParticipant {
+  final String id;
+  final String name;
+  final SnAccount userinfo;
+  RTCPeerConnection? peerConnection;
+  MediaStream? remoteStream;
+  List<RTCIceCandidate> remoteCandidates = [];
+  bool isAudioEnabled = true;
+  bool isVideoEnabled = false;
+  bool isConnected = false;
+  bool isLocal = false;
+  double audioLevel = 0.0;
+
+  WebRTCParticipant({
+    required this.id,
+    required this.name,
+    required this.userinfo,
+    this.isAudioEnabled = true,
+    this.isVideoEnabled = false,
+    this.isLocal = false,
+  });
+}
+
+class WebRTCManager {
+  final String roomId;
+  final String serverUrl;
+  late WebRTCSignaling _signaling;
+  final Map<String, WebRTCParticipant> _participants = {};
+  final Map<String, RTCPeerConnection> _peerConnections = {};
+
+  MediaStream? _localStream;
+  Timer? _audioLevelTimer;
+
+  MediaStream? get localStream => _localStream;
+  final StreamController<WebRTCParticipant> _participantController =
+      StreamController<WebRTCParticipant>.broadcast();
+  final StreamController<String> _participantLeftController =
+      StreamController<String>.broadcast();
+
+  Stream<WebRTCParticipant> get onParticipantJoined =>
+      _participantController.stream;
+  Stream<String> get onParticipantLeft => _participantLeftController.stream;
+
+  WebRTCManager({required this.roomId, required this.serverUrl}) {
+    _signaling = WebRTCSignaling(roomId: roomId);
+  }
+
+  Future<void> initialize(Ref ref) async {
+    final user = ref.watch(userInfoProvider).value!;
+    _signaling.userId = user.id;
+    _signaling.userName = user.name;
+    _signaling.user = user;
+    await _initializeLocalStream();
+    _setupSignalingListeners();
+    await _signaling.connect(ref);
+    _startAudioLevelMonitoring();
+  }
+
+  Future<void> _initializeLocalStream() async {
+    try {
+      _localStream = await navigator.mediaDevices.getUserMedia({
+        'audio': true,
+        'video': true,
+      });
+      talker.info('[WebRTC] Local stream initialized');
+    } catch (e) {
+      talker.error('[WebRTC] Failed to initialize local stream: $e');
+      rethrow;
+    }
+  }
+
+  void _setupSignalingListeners() {
+    _signaling.messages.listen((message) async {
+      switch (message.type) {
+        case 'offer':
+          await _handleOffer(message.accountId, message.account, message.data);
+          break;
+        case 'answer':
+          await _handleAnswer(message.accountId, message.data);
+          break;
+        case 'ice-candidate':
+          await _handleIceCandidate(message.accountId, message.data);
+          break;
+        // CHANGED: Listen for new users joining the room.
+        case 'user-joined':
+          await _handleUserJoined(message.accountId, message.account);
+          break;
+        default:
+          talker.warning(
+            '[WebRTC Manager] Receieved an unknown type singaling message: ${message.type} with ${message.data}',
+          );
+      }
+    });
+
+    // CHANGED: The welcome message now drives connection initiation.
+    _signaling.welcomeMessages.listen((welcome) {
+      talker.info('[WebRTC Manager] Connected to room: ${welcome.roomId}');
+      final existingParticipants =
+          welcome.participants; // Assuming the server sends this.
+      talker.info(
+        '[WebRTC Manager] Existing participants: $existingParticipants',
+      );
+
+      // The newcomer is responsible for initiating the connection to everyone else.
+      for (final participant in existingParticipants) {
+        if (participant.identity != _signaling.userId) {
+          if (!_participants.containsKey(participant.identity)) {
+            final webrtcParticipant = WebRTCParticipant(
+              id: participant.identity,
+              name: participant.name,
+              userinfo: participant.account!,
+            );
+            _participants[participant.identity] = webrtcParticipant;
+            _participantController.add(webrtcParticipant);
+          }
+          _createPeerConnection(participant.identity, isInitiator: true);
+        }
+      }
+    });
+  }
+
+  // CHANGED: New handler for when an existing user is notified of a new peer.
+  Future<void> _handleUserJoined(
+    String participantId,
+    SnAccount account,
+  ) async {
+    talker.info(
+      '[WebRTC Manager] User joined: $participantId. Waiting for their offer.',
+    );
+    // We don't need to be the initiator here. The newcomer will send us an offer.
+    // We just create the peer connection to be ready for it.
+    if (!_peerConnections.containsKey(participantId)) {
+      // Create a participant object to represent the new user
+      if (!_participants.containsKey(participantId)) {
+        final participant = WebRTCParticipant(
+          id: participantId,
+          name: participantId,
+          userinfo: account,
+        ); // Placeholder name
+        _participants[participantId] = participant;
+        _participantController.add(participant);
+      }
+      await _createPeerConnection(participantId, isInitiator: false);
+    }
+  }
+
+  Future<void> _createPeerConnection(
+    String participantId, {
+    bool isInitiator = false,
+  }) async {
+    talker.info(
+      '[WebRTC] Creating peer connection to $participantId (initiator: $isInitiator)',
+    );
+    final configuration = {
+      'iceServers': [
+        {'urls': 'stun:stun.l.google.com:19302'},
+      ],
+    };
+
+    final peerConnection = await createPeerConnection(configuration);
+    _peerConnections[participantId] = peerConnection;
+    _participants[participantId]!.peerConnection = peerConnection;
+
+    if (_localStream != null) {
+      for (final track in _localStream!.getTracks()) {
+        await peerConnection.addTrack(track, _localStream!);
+      }
+    }
+
+    peerConnection.onTrack = (event) {
+      if (event.streams.isNotEmpty) {
+        final participant = _participants[participantId];
+        if (participant != null) {
+          participant.remoteStream = event.streams[0];
+          participant.isConnected = true;
+
+          // Detect video tracks and update video enabled state
+          final videoTracks = event.streams[0].getVideoTracks();
+          if (videoTracks.isNotEmpty) {
+            participant.isVideoEnabled = true;
+          }
+
+          _participantController.add(participant);
+        }
+      }
+    };
+
+    peerConnection.onIceCandidate = (candidate) {
+      // CHANGED: Send candidate to the specific participant
+      _signaling.sendIceCandidate(participantId, candidate);
+    };
+
+    peerConnection.onConnectionState = (state) {
+      talker.info('[WebRTC] Connection state for $participantId: $state');
+      final participant = _participants[participantId];
+      if (participant != null) {
+        participant.isConnected =
+            state == RTCPeerConnectionState.RTCPeerConnectionStateConnected;
+        _participantController.add(participant);
+      }
+    };
+
+    if (isInitiator) {
+      final offer = await peerConnection.createOffer();
+      await peerConnection.setLocalDescription(offer);
+      // CHANGED: Send offer to the specific participant
+      _signaling.sendOffer(participantId, offer);
+    }
+  }
+
+  Future<void> _handleOffer(
+    String from,
+    SnAccount account,
+    Map<String, dynamic> data,
+  ) async {
+    final participantId = from;
+    talker.info('[WebRTC Manager] Handling offer from $participantId');
+    final offer = RTCSessionDescription(data['sdp'], data['type']);
+
+    if (!_peerConnections.containsKey(participantId)) {
+      if (!_participants.containsKey(participantId)) {
+        final participant = WebRTCParticipant(
+          id: participantId,
+          name: participantId,
+          userinfo: account,
+        );
+        _participants[participantId] = participant;
+        _participantController.add(participant);
+      }
+      await _createPeerConnection(participantId, isInitiator: false);
+    }
+
+    final peerConnection = _peerConnections[participantId]!;
+    await peerConnection.setRemoteDescription(offer);
+
+    final answer = await peerConnection.createAnswer();
+    await peerConnection.setLocalDescription(answer);
+    // CHANGED: Send answer to the specific participant
+    _signaling.sendAnswer(participantId, answer);
+
+    // Process any queued ICE candidates
+    final participant = _participants[participantId];
+    if (participant != null) {
+      for (final candidate in participant.remoteCandidates) {
+        await peerConnection.addCandidate(candidate);
+      }
+      participant.remoteCandidates.clear();
+    }
+  }
+
+  Future<void> _handleAnswer(String from, Map<String, dynamic> data) async {
+    final participantId = from;
+    talker.info('[WebRTC Manager] Handling answer from $participantId');
+    final answer = RTCSessionDescription(data['sdp'], data['type']);
+
+    final peerConnection = _peerConnections[participantId];
+    if (peerConnection != null) {
+      await peerConnection.setRemoteDescription(answer);
+
+      // Process any queued ICE candidates
+      final participant = _participants[participantId];
+      if (participant != null) {
+        for (final candidate in participant.remoteCandidates) {
+          await peerConnection.addCandidate(candidate);
+        }
+        participant.remoteCandidates.clear();
+      }
+    }
+  }
+
+  Future<void> _handleIceCandidate(
+    String from,
+    Map<String, dynamic> data,
+  ) async {
+    final participantId = from;
+    final candidate = RTCIceCandidate(
+      data['candidate'],
+      data['sdpMid'],
+      data['sdpMLineIndex'],
+    );
+
+    final participant = _participants[participantId];
+    if (participant != null) {
+      final pc = participant.peerConnection;
+      if (pc != null) {
+        await pc.addCandidate(candidate);
+      } else {
+        participant.remoteCandidates.add(candidate);
+      }
+    }
+  }
+
+  Future<void> replaceMediaStream(Map<String, dynamic> constraints) async {
+    try {
+      final newStream = await navigator.mediaDevices.getUserMedia(constraints);
+      final newVideoTrack = newStream.getVideoTracks().firstOrNull;
+      final newAudioTrack = newStream.getAudioTracks().firstOrNull;
+
+      if (_localStream != null) {
+        final oldVideoTrack = _localStream!.getVideoTracks().firstOrNull;
+        final oldAudioTrack = _localStream!.getAudioTracks().firstOrNull;
+
+        // Replace tracks in all existing peer connections
+        for (final pc in _peerConnections.values) {
+          final senders = await pc.getSenders();
+          for (final sender in senders) {
+            if (newVideoTrack != null && sender.track == oldVideoTrack) {
+              await sender.replaceTrack(newVideoTrack);
+            } else if (newAudioTrack != null && sender.track == oldAudioTrack) {
+              await sender.replaceTrack(newAudioTrack);
+            }
+          }
+        }
+
+        // Stop old tracks and update local stream
+        for (final track in _localStream!.getTracks()) {
+          track.stop();
+        }
+      }
+
+      _localStream = newStream;
+      talker.info('[WebRTC] Media stream replaced with new constraints');
+    } catch (e) {
+      talker.error('[WebRTC] Failed to replace media stream: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> toggleMicrophone(bool enabled) async {
+    if (_localStream != null) {
+      final audioTracks = _localStream!.getAudioTracks();
+      for (final track in audioTracks) {
+        track.enabled = enabled;
+      }
+    }
+  }
+
+  Future<void> toggleCamera(bool enabled) async {
+    if (_localStream != null) {
+      _localStream!.getVideoTracks().forEach((track) {
+        track.enabled = enabled;
+      });
+    }
+  }
+
+  Future<void> switchCamera(String deviceId) async {
+    await replaceMediaStream({
+      'audio': _localStream?.getAudioTracks().isNotEmpty ?? true,
+      'video': {'deviceId': deviceId},
+    });
+    talker.info('[WebRTC] Switched to camera device: $deviceId');
+  }
+
+  Future<void> switchMicrophone(String deviceId) async {
+    await replaceMediaStream({
+      'audio': {'deviceId': deviceId},
+      'video': _localStream?.getVideoTracks().isNotEmpty ?? true,
+    });
+    talker.info('[WebRTC] Switched to microphone device: $deviceId');
+  }
+
+  Future<List<MediaDeviceInfo>> getVideoDevices() async {
+    try {
+      final devices = await navigator.mediaDevices.enumerateDevices();
+      return devices.where((device) => device.kind == 'videoinput').toList();
+    } catch (e) {
+      talker.error('[WebRTC] Failed to enumerate video devices: $e');
+      return [];
+    }
+  }
+
+  Future<List<MediaDeviceInfo>> getAudioDevices() async {
+    try {
+      final devices = await navigator.mediaDevices.enumerateDevices();
+      return devices.where((device) => device.kind == 'audioinput').toList();
+    } catch (e) {
+      talker.error('[WebRTC] Failed to enumerate audio devices: $e');
+      return [];
+    }
+  }
+
+  void _startAudioLevelMonitoring() {
+    _audioLevelTimer?.cancel();
+    _audioLevelTimer = Timer.periodic(const Duration(milliseconds: 100), (_) {
+      _updateAudioLevels();
+    });
+  }
+
+  void _stopAudioLevelMonitoring() {
+    _audioLevelTimer?.cancel();
+    _audioLevelTimer = null;
+  }
+
+  Future<void> _updateAudioLevels() async {
+    bool hasUpdates = false;
+
+    for (final participant in _participants.values) {
+      if (participant.remoteStream != null && participant.isAudioEnabled) {
+        final audioTracks = participant.remoteStream!.getAudioTracks();
+        if (audioTracks.isNotEmpty) {
+          try {
+            // Try to get stats for more accurate audio level detection
+            final pc = participant.peerConnection;
+            if (pc != null) {
+              final stats = await pc.getStats();
+              double maxAudioLevel = 0.0;
+
+              // Look for audio receiver stats
+              for (var report in stats) {
+                if (report.type == 'inbound-rtp' &&
+                    report.values['mediaType'] == 'audio') {
+                  final audioLevel = report.values['audioLevel'] as double?;
+                  if (audioLevel != null && audioLevel > maxAudioLevel) {
+                    maxAudioLevel = audioLevel;
+                  }
+                }
+              }
+
+              // If we got stats, use them; otherwise use a simple heuristic
+              if (maxAudioLevel > 0) {
+                participant.audioLevel = maxAudioLevel.clamp(0.0, 1.0);
+              } else {
+                // Simple heuristic: if audio track is enabled, assume some level
+                // In a real app, you'd analyze the actual audio data
+                participant.audioLevel = audioTracks[0].enabled ? 0.5 : 0.0;
+              }
+            } else {
+              // Fallback for local participant or when no PC available
+              participant.audioLevel = participant.isLocal ? 0.0 : 0.3;
+            }
+
+            hasUpdates = true;
+          } catch (e) {
+            talker.warning('[WebRTC] Failed to update audio level for ${participant.id}: $e');
+            participant.audioLevel = 0.0;
+          }
+        } else {
+          participant.audioLevel = 0.0;
+        }
+      } else {
+        participant.audioLevel = 0.0;
+      }
+    }
+
+    // Notify listeners if there were updates (throttled to avoid excessive updates)
+    if (hasUpdates) {
+      // This will trigger UI updates for speaking indicators
+    }
+  }
+
+  List<WebRTCParticipant> get participants => _participants.values.toList();
+
+  void dispose() {
+    _stopAudioLevelMonitoring();
+    _signaling.disconnect();
+    for (final pc in _peerConnections.values) {
+      pc.close();
+    }
+    _peerConnections.clear();
+    for (var p in _participants.values) {
+      p.remoteCandidates.clear();
+    }
+    _participants.clear();
+    _localStream?.dispose();
+    _participantController.close();
+    _participantLeftController.close();
+  }
+}
--- a/lib/pods/chat/webrtc_signaling.dart
+++ b/lib/pods/chat/webrtc_signaling.dart
@@ -0,0 +1,211 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_webrtc/flutter_webrtc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/account.dart';
+import 'package:island/models/chat.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:web_socket_channel/io.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+import 'package:island/talker.dart';
+
+part 'webrtc_signaling.freezed.dart';
+part 'webrtc_signaling.g.dart';
+
+@freezed
+sealed class SignalingMessage with _$SignalingMessage {
+  const factory SignalingMessage({
+    required String type,
+    // CHANGED: Added 'to' field for directed messaging
+    String? to,
+    required String accountId,
+    required SnAccount account,
+    required Map<String, dynamic> data,
+  }) = _SignalingMessage;
+
+  factory SignalingMessage.fromJson(Map<String, dynamic> json) =>
+      _$SignalingMessageFromJson(json);
+}
+
+@freezed
+sealed class WebRTCWelcomeMessage with _$WebRTCWelcomeMessage {
+  const factory WebRTCWelcomeMessage({
+    required String userId,
+    required String roomId,
+    required String message,
+    required String timestamp,
+    // CHANGED: Added participants list
+    @Default([]) List<CallParticipant> participants,
+  }) = _WebRTCWelcomeMessage;
+
+  factory WebRTCWelcomeMessage.fromJson(Map<String, dynamic> json) =>
+      _$WebRTCWelcomeMessageFromJson(json);
+}
+
+class WebRTCSignaling {
+  final String roomId;
+  late final String userId;
+  late final String userName;
+  late SnAccount user;
+  final StreamController<SignalingMessage> _messageController =
+      StreamController<SignalingMessage>.broadcast();
+  final StreamController<WebRTCWelcomeMessage> _welcomeController =
+      StreamController<WebRTCWelcomeMessage>.broadcast();
+  WebSocketChannel? _channel;
+  Timer? _heartbeatTimer;
+
+  Stream<SignalingMessage> get messages => _messageController.stream;
+  Stream<WebRTCWelcomeMessage> get welcomeMessages => _welcomeController.stream;
+
+  WebRTCSignaling({required this.roomId});
+
+  Future<void> connect(Ref ref) async {
+    final baseUrl = ref.watch(serverUrlProvider);
+    final token = await getToken(ref.watch(tokenProvider));
+
+    final url = '$baseUrl/sphere/chat/realtime/$roomId'.replaceFirst(
+      'http',
+      'ws',
+    );
+
+    talker.info('[WebRTC Signaling] Trying connecting to $url');
+    try {
+      if (kIsWeb) {
+        _channel = WebSocketChannel.connect(Uri.parse('$url?tk=$token'));
+      } else {
+        _channel = IOWebSocketChannel.connect(
+          Uri.parse(url),
+          headers: {'Authorization': 'AtField $token'},
+        );
+      }
+      await _channel!.ready;
+
+      // Start heartbeat timer
+      _heartbeatTimer = Timer.periodic(const Duration(seconds: 30), (timer) => _sendHeartbeat());
+
+      _channel!.stream.listen(
+        (data) {
+          final dataStr =
+              data is Uint8List ? utf8.decode(data) : data.toString();
+          final packet = WebSocketPacket.fromJson(jsonDecode(dataStr));
+          talker.info(
+            '[WebRTC Signaling] Recieved a singal message with packet type: ${packet.type}',
+          );
+          if (packet.type == 'webrtc') {
+            try {
+              final welcomeMessage = WebRTCWelcomeMessage.fromJson(
+                packet.data!,
+              );
+              _welcomeController.add(welcomeMessage);
+              talker.info(
+                '[WebRTC Signaling] Welcome message received: ${welcomeMessage.message}',
+              );
+            } catch (e) {
+              talker.error(
+                '[WebRTC Signaling] Failed to parse welcome message: $e',
+              );
+            }
+          } else if (packet.type == 'webrtc.signal') {
+            try {
+              final signalingMessage = SignalingMessage.fromJson(packet.data!);
+              // CHANGED: Ensure we only process messages intended for us if the 'to' field is present
+              if (signalingMessage.to == null ||
+                  signalingMessage.to == userId) {
+                _messageController.add(signalingMessage);
+              }
+            } catch (e) {
+              talker.error(
+                '[WebRTC Signaling] Failed to parse signaling message: $e',
+              );
+            }
+          }
+        },
+        onError: (error) {
+          talker.error('[WebRTC Signaling] WebSocket error: $error');
+          _messageController.addError(error);
+          _welcomeController.addError(error);
+        },
+        onDone: () {
+          talker.info('[WebRTC Signaling] WebSocket connection closed');
+          _messageController.close();
+          _welcomeController.close();
+        },
+      );
+    } catch (err) {
+      talker.error('[WebRTC Signaling] Failed to connect: $err');
+      _messageController.addError(err);
+      _welcomeController.addError(err);
+    }
+  }
+
+  void sendMessage(SignalingMessage message) {
+    if (_channel == null) return;
+    talker.info(
+      '[WebRTC Signaling] Sending a message with message type: ${message.type} to ${message.to}',
+    );
+    final packet = WebSocketPacket(
+      type: 'webrtc.signal',
+      data: message.toJson(),
+    );
+    _channel!.sink.add(jsonEncode(packet.toJson()));
+  }
+
+  // CHANGED: All send methods now correctly use the `to` parameter
+  void sendOffer(String to, RTCSessionDescription offer) {
+    sendMessage(
+      SignalingMessage(
+        type: 'offer',
+        to: to,
+        accountId: userId,
+        account: user,
+        data: {'sdp': offer.sdp, 'type': offer.type},
+      ),
+    );
+  }
+
+  void sendAnswer(String to, RTCSessionDescription answer) {
+    sendMessage(
+      SignalingMessage(
+        type: 'answer',
+        to: to,
+        accountId: userId,
+        account: user,
+        data: {'sdp': answer.sdp, 'type': answer.type},
+      ),
+    );
+  }
+
+  void sendIceCandidate(String to, RTCIceCandidate candidate) {
+    sendMessage(
+      SignalingMessage(
+        type: 'ice-candidate',
+        to: to,
+        accountId: userId,
+        account: user,
+        data: {
+          'candidate': candidate.candidate,
+          'sdpMid': candidate.sdpMid,
+          'sdpMLineIndex': candidate.sdpMLineIndex,
+        },
+      ),
+    );
+  }
+
+  void _sendHeartbeat() {
+    if (_channel == null) return;
+    talker.info('[WebRTC Signaling] Sending heartbeat');
+    final packet = WebSocketPacket(type: 'heartbeat', data: null);
+    _channel!.sink.add(jsonEncode(packet.toJson()));
+  }
+
+  void disconnect() {
+    _heartbeatTimer?.cancel();
+    _channel?.sink.close();
+    _messageController.close();
+    _welcomeController.close();
+  }
+}
--- a/lib/pods/chat/webrtc_signaling.freezed.dart
+++ b/lib/pods/chat/webrtc_signaling.freezed.dart
@@ -0,0 +1,611 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'webrtc_signaling.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SignalingMessage implements DiagnosticableTreeMixin {
+
+ String get type;// CHANGED: Added 'to' field for directed messaging
+ String? get to; String get accountId; SnAccount get account; Map<String, dynamic> get data;
+/// Create a copy of SignalingMessage
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SignalingMessageCopyWith<SignalingMessage> get copyWith => _$SignalingMessageCopyWithImpl<SignalingMessage>(this as SignalingMessage, _$identity);
+
+  /// Serializes this SignalingMessage to a JSON map.
+  Map<String, dynamic> toJson();
+
+@override
+void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+  properties
+    ..add(DiagnosticsProperty('type', 'SignalingMessage'))
+    ..add(DiagnosticsProperty('type', type))..add(DiagnosticsProperty('to', to))..add(DiagnosticsProperty('accountId', accountId))..add(DiagnosticsProperty('account', account))..add(DiagnosticsProperty('data', data));
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SignalingMessage&&(identical(other.type, type) || other.type == type)&&(identical(other.to, to) || other.to == to)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&const DeepCollectionEquality().equals(other.data, data));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,type,to,accountId,account,const DeepCollectionEquality().hash(data));
+
+@override
+String toString({ DiagnosticLevel minLevel = DiagnosticLevel.info }) {
+  return 'SignalingMessage(type: $type, to: $to, accountId: $accountId, account: $account, data: $data)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SignalingMessageCopyWith<$Res>  {
+  factory $SignalingMessageCopyWith(SignalingMessage value, $Res Function(SignalingMessage) _then) = _$SignalingMessageCopyWithImpl;
+@useResult
+$Res call({
+ String type, String? to, String accountId, SnAccount account, Map<String, dynamic> data
+});
+
+
+$SnAccountCopyWith<$Res> get account;
+
+}
+/// @nodoc
+class _$SignalingMessageCopyWithImpl<$Res>
+    implements $SignalingMessageCopyWith<$Res> {
+  _$SignalingMessageCopyWithImpl(this._self, this._then);
+
+  final SignalingMessage _self;
+  final $Res Function(SignalingMessage) _then;
+
+/// Create a copy of SignalingMessage
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? type = null,Object? to = freezed,Object? accountId = null,Object? account = null,Object? data = null,}) {
+  return _then(_self.copyWith(
+type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,to: freezed == to ? _self.to : to // ignore: cast_nullable_to_non_nullable
+as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,account: null == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount,data: null == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>,
+  ));
+}
+/// Create a copy of SignalingMessage
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res> get account {
+  
+  return $SnAccountCopyWith<$Res>(_self.account, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [SignalingMessage].
+extension SignalingMessagePatterns on SignalingMessage {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SignalingMessage value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SignalingMessage() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SignalingMessage value)  $default,){
+final _that = this;
+switch (_that) {
+case _SignalingMessage():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SignalingMessage value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SignalingMessage() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String type,  String? to,  String accountId,  SnAccount account,  Map<String, dynamic> data)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SignalingMessage() when $default != null:
+return $default(_that.type,_that.to,_that.accountId,_that.account,_that.data);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String type,  String? to,  String accountId,  SnAccount account,  Map<String, dynamic> data)  $default,) {final _that = this;
+switch (_that) {
+case _SignalingMessage():
+return $default(_that.type,_that.to,_that.accountId,_that.account,_that.data);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String type,  String? to,  String accountId,  SnAccount account,  Map<String, dynamic> data)?  $default,) {final _that = this;
+switch (_that) {
+case _SignalingMessage() when $default != null:
+return $default(_that.type,_that.to,_that.accountId,_that.account,_that.data);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SignalingMessage with DiagnosticableTreeMixin implements SignalingMessage {
+  const _SignalingMessage({required this.type, this.to, required this.accountId, required this.account, required final  Map<String, dynamic> data}): _data = data;
+  factory _SignalingMessage.fromJson(Map<String, dynamic> json) => _$SignalingMessageFromJson(json);
+
+@override final  String type;
+// CHANGED: Added 'to' field for directed messaging
+@override final  String? to;
+@override final  String accountId;
+@override final  SnAccount account;
+ final  Map<String, dynamic> _data;
+@override Map<String, dynamic> get data {
+  if (_data is EqualUnmodifiableMapView) return _data;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(_data);
+}
+
+
+/// Create a copy of SignalingMessage
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SignalingMessageCopyWith<_SignalingMessage> get copyWith => __$SignalingMessageCopyWithImpl<_SignalingMessage>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SignalingMessageToJson(this, );
+}
+@override
+void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+  properties
+    ..add(DiagnosticsProperty('type', 'SignalingMessage'))
+    ..add(DiagnosticsProperty('type', type))..add(DiagnosticsProperty('to', to))..add(DiagnosticsProperty('accountId', accountId))..add(DiagnosticsProperty('account', account))..add(DiagnosticsProperty('data', data));
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SignalingMessage&&(identical(other.type, type) || other.type == type)&&(identical(other.to, to) || other.to == to)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&const DeepCollectionEquality().equals(other._data, _data));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,type,to,accountId,account,const DeepCollectionEquality().hash(_data));
+
+@override
+String toString({ DiagnosticLevel minLevel = DiagnosticLevel.info }) {
+  return 'SignalingMessage(type: $type, to: $to, accountId: $accountId, account: $account, data: $data)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SignalingMessageCopyWith<$Res> implements $SignalingMessageCopyWith<$Res> {
+  factory _$SignalingMessageCopyWith(_SignalingMessage value, $Res Function(_SignalingMessage) _then) = __$SignalingMessageCopyWithImpl;
+@override @useResult
+$Res call({
+ String type, String? to, String accountId, SnAccount account, Map<String, dynamic> data
+});
+
+
+@override $SnAccountCopyWith<$Res> get account;
+
+}
+/// @nodoc
+class __$SignalingMessageCopyWithImpl<$Res>
+    implements _$SignalingMessageCopyWith<$Res> {
+  __$SignalingMessageCopyWithImpl(this._self, this._then);
+
+  final _SignalingMessage _self;
+  final $Res Function(_SignalingMessage) _then;
+
+/// Create a copy of SignalingMessage
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? type = null,Object? to = freezed,Object? accountId = null,Object? account = null,Object? data = null,}) {
+  return _then(_SignalingMessage(
+type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,to: freezed == to ? _self.to : to // ignore: cast_nullable_to_non_nullable
+as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,account: null == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount,data: null == data ? _self._data : data // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>,
+  ));
+}
+
+/// Create a copy of SignalingMessage
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res> get account {
+  
+  return $SnAccountCopyWith<$Res>(_self.account, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}
+}
+
+
+/// @nodoc
+mixin _$WebRTCWelcomeMessage implements DiagnosticableTreeMixin {
+
+ String get userId; String get roomId; String get message; String get timestamp;// CHANGED: Added participants list
+ List<CallParticipant> get participants;
+/// Create a copy of WebRTCWelcomeMessage
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$WebRTCWelcomeMessageCopyWith<WebRTCWelcomeMessage> get copyWith => _$WebRTCWelcomeMessageCopyWithImpl<WebRTCWelcomeMessage>(this as WebRTCWelcomeMessage, _$identity);
+
+  /// Serializes this WebRTCWelcomeMessage to a JSON map.
+  Map<String, dynamic> toJson();
+
+@override
+void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+  properties
+    ..add(DiagnosticsProperty('type', 'WebRTCWelcomeMessage'))
+    ..add(DiagnosticsProperty('userId', userId))..add(DiagnosticsProperty('roomId', roomId))..add(DiagnosticsProperty('message', message))..add(DiagnosticsProperty('timestamp', timestamp))..add(DiagnosticsProperty('participants', participants));
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is WebRTCWelcomeMessage&&(identical(other.userId, userId) || other.userId == userId)&&(identical(other.roomId, roomId) || other.roomId == roomId)&&(identical(other.message, message) || other.message == message)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp)&&const DeepCollectionEquality().equals(other.participants, participants));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,userId,roomId,message,timestamp,const DeepCollectionEquality().hash(participants));
+
+@override
+String toString({ DiagnosticLevel minLevel = DiagnosticLevel.info }) {
+  return 'WebRTCWelcomeMessage(userId: $userId, roomId: $roomId, message: $message, timestamp: $timestamp, participants: $participants)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $WebRTCWelcomeMessageCopyWith<$Res>  {
+  factory $WebRTCWelcomeMessageCopyWith(WebRTCWelcomeMessage value, $Res Function(WebRTCWelcomeMessage) _then) = _$WebRTCWelcomeMessageCopyWithImpl;
+@useResult
+$Res call({
+ String userId, String roomId, String message, String timestamp, List<CallParticipant> participants
+});
+
+
+
+
+}
+/// @nodoc
+class _$WebRTCWelcomeMessageCopyWithImpl<$Res>
+    implements $WebRTCWelcomeMessageCopyWith<$Res> {
+  _$WebRTCWelcomeMessageCopyWithImpl(this._self, this._then);
+
+  final WebRTCWelcomeMessage _self;
+  final $Res Function(WebRTCWelcomeMessage) _then;
+
+/// Create a copy of WebRTCWelcomeMessage
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? userId = null,Object? roomId = null,Object? message = null,Object? timestamp = null,Object? participants = null,}) {
+  return _then(_self.copyWith(
+userId: null == userId ? _self.userId : userId // ignore: cast_nullable_to_non_nullable
+as String,roomId: null == roomId ? _self.roomId : roomId // ignore: cast_nullable_to_non_nullable
+as String,message: null == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
+as String,timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
+as String,participants: null == participants ? _self.participants : participants // ignore: cast_nullable_to_non_nullable
+as List<CallParticipant>,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [WebRTCWelcomeMessage].
+extension WebRTCWelcomeMessagePatterns on WebRTCWelcomeMessage {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _WebRTCWelcomeMessage value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _WebRTCWelcomeMessage() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _WebRTCWelcomeMessage value)  $default,){
+final _that = this;
+switch (_that) {
+case _WebRTCWelcomeMessage():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _WebRTCWelcomeMessage value)?  $default,){
+final _that = this;
+switch (_that) {
+case _WebRTCWelcomeMessage() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String userId,  String roomId,  String message,  String timestamp,  List<CallParticipant> participants)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _WebRTCWelcomeMessage() when $default != null:
+return $default(_that.userId,_that.roomId,_that.message,_that.timestamp,_that.participants);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String userId,  String roomId,  String message,  String timestamp,  List<CallParticipant> participants)  $default,) {final _that = this;
+switch (_that) {
+case _WebRTCWelcomeMessage():
+return $default(_that.userId,_that.roomId,_that.message,_that.timestamp,_that.participants);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String userId,  String roomId,  String message,  String timestamp,  List<CallParticipant> participants)?  $default,) {final _that = this;
+switch (_that) {
+case _WebRTCWelcomeMessage() when $default != null:
+return $default(_that.userId,_that.roomId,_that.message,_that.timestamp,_that.participants);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _WebRTCWelcomeMessage with DiagnosticableTreeMixin implements WebRTCWelcomeMessage {
+  const _WebRTCWelcomeMessage({required this.userId, required this.roomId, required this.message, required this.timestamp, final  List<CallParticipant> participants = const []}): _participants = participants;
+  factory _WebRTCWelcomeMessage.fromJson(Map<String, dynamic> json) => _$WebRTCWelcomeMessageFromJson(json);
+
+@override final  String userId;
+@override final  String roomId;
+@override final  String message;
+@override final  String timestamp;
+// CHANGED: Added participants list
+ final  List<CallParticipant> _participants;
+// CHANGED: Added participants list
+@override@JsonKey() List<CallParticipant> get participants {
+  if (_participants is EqualUnmodifiableListView) return _participants;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_participants);
+}
+
+
+/// Create a copy of WebRTCWelcomeMessage
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$WebRTCWelcomeMessageCopyWith<_WebRTCWelcomeMessage> get copyWith => __$WebRTCWelcomeMessageCopyWithImpl<_WebRTCWelcomeMessage>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$WebRTCWelcomeMessageToJson(this, );
+}
+@override
+void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+  properties
+    ..add(DiagnosticsProperty('type', 'WebRTCWelcomeMessage'))
+    ..add(DiagnosticsProperty('userId', userId))..add(DiagnosticsProperty('roomId', roomId))..add(DiagnosticsProperty('message', message))..add(DiagnosticsProperty('timestamp', timestamp))..add(DiagnosticsProperty('participants', participants));
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _WebRTCWelcomeMessage&&(identical(other.userId, userId) || other.userId == userId)&&(identical(other.roomId, roomId) || other.roomId == roomId)&&(identical(other.message, message) || other.message == message)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp)&&const DeepCollectionEquality().equals(other._participants, _participants));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,userId,roomId,message,timestamp,const DeepCollectionEquality().hash(_participants));
+
+@override
+String toString({ DiagnosticLevel minLevel = DiagnosticLevel.info }) {
+  return 'WebRTCWelcomeMessage(userId: $userId, roomId: $roomId, message: $message, timestamp: $timestamp, participants: $participants)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$WebRTCWelcomeMessageCopyWith<$Res> implements $WebRTCWelcomeMessageCopyWith<$Res> {
+  factory _$WebRTCWelcomeMessageCopyWith(_WebRTCWelcomeMessage value, $Res Function(_WebRTCWelcomeMessage) _then) = __$WebRTCWelcomeMessageCopyWithImpl;
+@override @useResult
+$Res call({
+ String userId, String roomId, String message, String timestamp, List<CallParticipant> participants
+});
+
+
+
+
+}
+/// @nodoc
+class __$WebRTCWelcomeMessageCopyWithImpl<$Res>
+    implements _$WebRTCWelcomeMessageCopyWith<$Res> {
+  __$WebRTCWelcomeMessageCopyWithImpl(this._self, this._then);
+
+  final _WebRTCWelcomeMessage _self;
+  final $Res Function(_WebRTCWelcomeMessage) _then;
+
+/// Create a copy of WebRTCWelcomeMessage
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? userId = null,Object? roomId = null,Object? message = null,Object? timestamp = null,Object? participants = null,}) {
+  return _then(_WebRTCWelcomeMessage(
+userId: null == userId ? _self.userId : userId // ignore: cast_nullable_to_non_nullable
+as String,roomId: null == roomId ? _self.roomId : roomId // ignore: cast_nullable_to_non_nullable
+as String,message: null == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
+as String,timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
+as String,participants: null == participants ? _self._participants : participants // ignore: cast_nullable_to_non_nullable
+as List<CallParticipant>,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/lib/pods/chat/webrtc_signaling.g.dart
+++ b/lib/pods/chat/webrtc_signaling.g.dart
@@ -0,0 +1,49 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'webrtc_signaling.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SignalingMessage _$SignalingMessageFromJson(Map<String, dynamic> json) =>
+    _SignalingMessage(
+      type: json['type'] as String,
+      to: json['to'] as String?,
+      accountId: json['account_id'] as String,
+      account: SnAccount.fromJson(json['account'] as Map<String, dynamic>),
+      data: json['data'] as Map<String, dynamic>,
+    );
+
+Map<String, dynamic> _$SignalingMessageToJson(_SignalingMessage instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'to': instance.to,
+      'account_id': instance.accountId,
+      'account': instance.account.toJson(),
+      'data': instance.data,
+    };
+
+_WebRTCWelcomeMessage _$WebRTCWelcomeMessageFromJson(
+  Map<String, dynamic> json,
+) => _WebRTCWelcomeMessage(
+  userId: json['user_id'] as String,
+  roomId: json['room_id'] as String,
+  message: json['message'] as String,
+  timestamp: json['timestamp'] as String,
+  participants:
+      (json['participants'] as List<dynamic>?)
+          ?.map((e) => CallParticipant.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+);
+
+Map<String, dynamic> _$WebRTCWelcomeMessageToJson(
+  _WebRTCWelcomeMessage instance,
+) => <String, dynamic>{
+  'user_id': instance.userId,
+  'room_id': instance.roomId,
+  'message': instance.message,
+  'timestamp': instance.timestamp,
+  'participants': instance.participants.map((e) => e.toJson()).toList(),
+};
--- a/lib/pods/config.dart
+++ b/lib/pods/config.dart
@@ -35,7 +35,6 @@ const kAppMessageDisplayStyle = 'app_message_display_style';
 const kAppThemeMode = 'app_theme_mode';
 const kMaterialYouToggleStoreKey = 'app_theme_material_you';
 const kAppDisableAnimation = 'app_disable_animation';
-const kAppFabPosition = 'app_fab_position';
 const kFeaturedPostsCollapsedId =
    'featured_posts_collapsed_id'; // Key for storing the ID of the collapsed featured post

@@ -99,7 +98,6 @@ sealed class AppSettings with _$AppSettings {
    required String? themeMode,
    required bool useMaterial3,
    required bool disableAnimation,
-    required String fabPosition,
  }) = _AppSettings;
 }

@@ -127,7 +125,6 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
      themeMode: prefs.getString(kAppThemeMode) ?? 'system',
      useMaterial3: prefs.getBool(kMaterialYouToggleStoreKey) ?? true,
      disableAnimation: prefs.getBool(kAppDisableAnimation) ?? false,
-      fabPosition: prefs.getString(kAppFabPosition) ?? 'center',
    );
  }

@@ -285,12 +282,6 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
    prefs.setBool(kAppDisableAnimation, value);
    state = state.copyWith(disableAnimation: value);
  }
-
-  void setFabPosition(String value) {
-    final prefs = ref.read(sharedPreferencesProvider);
-    prefs.setString(kAppFabPosition, value);
-    state = state.copyWith(fabPosition: value);
-  }
 }

 final updateInfoProvider =
--- a/lib/pods/config.freezed.dart
+++ b/lib/pods/config.freezed.dart
@@ -290,7 +290,7 @@ mixin _$AppSettings {
 ThemeColors? get customColors; Size? get windowSize;// The window size for desktop platforms
 double get windowOpacity;// The window opacity for desktop platforms
 double get cardTransparency;// The card background opacity
- String? get defaultPoolId; String get messageDisplayStyle; String? get themeMode; bool get useMaterial3; bool get disableAnimation; String get fabPosition;
+ String? get defaultPoolId; String get messageDisplayStyle; String? get themeMode; bool get useMaterial3; bool get disableAnimation;
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -301,16 +301,16 @@ $AppSettingsCopyWith<AppSettings> get copyWith => _$AppSettingsCopyWithImpl<AppS

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.customColors, customColors) || other.customColors == customColors)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.windowOpacity, windowOpacity) || other.windowOpacity == windowOpacity)&&(identical(other.cardTransparency, cardTransparency) || other.cardTransparency == cardTransparency)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId)&&(identical(other.messageDisplayStyle, messageDisplayStyle) || other.messageDisplayStyle == messageDisplayStyle)&&(identical(other.themeMode, themeMode) || other.themeMode == themeMode)&&(identical(other.useMaterial3, useMaterial3) || other.useMaterial3 == useMaterial3)&&(identical(other.disableAnimation, disableAnimation) || other.disableAnimation == disableAnimation)&&(identical(other.fabPosition, fabPosition) || other.fabPosition == fabPosition));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.customColors, customColors) || other.customColors == customColors)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.windowOpacity, windowOpacity) || other.windowOpacity == windowOpacity)&&(identical(other.cardTransparency, cardTransparency) || other.cardTransparency == cardTransparency)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId)&&(identical(other.messageDisplayStyle, messageDisplayStyle) || other.messageDisplayStyle == messageDisplayStyle)&&(identical(other.themeMode, themeMode) || other.themeMode == themeMode)&&(identical(other.useMaterial3, useMaterial3) || other.useMaterial3 == useMaterial3)&&(identical(other.disableAnimation, disableAnimation) || other.disableAnimation == disableAnimation));
 }


@override
-int get hashCode => Object.hashAll([runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,customColors,windowSize,windowOpacity,cardTransparency,defaultPoolId,messageDisplayStyle,themeMode,useMaterial3,disableAnimation,fabPosition]);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,customColors,windowSize,windowOpacity,cardTransparency,defaultPoolId,messageDisplayStyle,themeMode,useMaterial3,disableAnimation);

@override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, customColors: $customColors, windowSize: $windowSize, windowOpacity: $windowOpacity, cardTransparency: $cardTransparency, defaultPoolId: $defaultPoolId, messageDisplayStyle: $messageDisplayStyle, themeMode: $themeMode, useMaterial3: $useMaterial3, disableAnimation: $disableAnimation, fabPosition: $fabPosition)';
+  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, customColors: $customColors, windowSize: $windowSize, windowOpacity: $windowOpacity, cardTransparency: $cardTransparency, defaultPoolId: $defaultPoolId, messageDisplayStyle: $messageDisplayStyle, themeMode: $themeMode, useMaterial3: $useMaterial3, disableAnimation: $disableAnimation)';
 }


@@ -321,7 +321,7 @@ abstract mixin class $AppSettingsCopyWith<$Res>  {
  factory $AppSettingsCopyWith(AppSettings value, $Res Function(AppSettings) _then) = _$AppSettingsCopyWithImpl;
@useResult
 $Res call({
- bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, ThemeColors? customColors, Size? windowSize, double windowOpacity, double cardTransparency, String? defaultPoolId, String messageDisplayStyle, String? themeMode, bool useMaterial3, bool disableAnimation, String fabPosition
+ bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, ThemeColors? customColors, Size? windowSize, double windowOpacity, double cardTransparency, String? defaultPoolId, String messageDisplayStyle, String? themeMode, bool useMaterial3, bool disableAnimation
 });


@@ -338,7 +338,7 @@ class _$AppSettingsCopyWithImpl<$Res>

 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? customColors = freezed,Object? windowSize = freezed,Object? windowOpacity = null,Object? cardTransparency = null,Object? defaultPoolId = freezed,Object? messageDisplayStyle = null,Object? themeMode = freezed,Object? useMaterial3 = null,Object? disableAnimation = null,Object? fabPosition = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? customColors = freezed,Object? windowSize = freezed,Object? windowOpacity = null,Object? cardTransparency = null,Object? defaultPoolId = freezed,Object? messageDisplayStyle = null,Object? themeMode = freezed,Object? useMaterial3 = null,Object? disableAnimation = null,}) {
  return _then(_self.copyWith(
 autoTranslate: null == autoTranslate ? _self.autoTranslate : autoTranslate // ignore: cast_nullable_to_non_nullable
 as bool,dataSavingMode: null == dataSavingMode ? _self.dataSavingMode : dataSavingMode // ignore: cast_nullable_to_non_nullable
@@ -358,8 +358,7 @@ as String?,messageDisplayStyle: null == messageDisplayStyle ? _self.messageDispl
 as String,themeMode: freezed == themeMode ? _self.themeMode : themeMode // ignore: cast_nullable_to_non_nullable
 as String?,useMaterial3: null == useMaterial3 ? _self.useMaterial3 : useMaterial3 // ignore: cast_nullable_to_non_nullable
 as bool,disableAnimation: null == disableAnimation ? _self.disableAnimation : disableAnimation // ignore: cast_nullable_to_non_nullable
-as bool,fabPosition: null == fabPosition ? _self.fabPosition : fabPosition // ignore: cast_nullable_to_non_nullable
-as String,
+as bool,
  ));
 }
 /// Create a copy of AppSettings
@@ -453,10 +452,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  ThemeColors? customColors,  Size? windowSize,  double windowOpacity,  double cardTransparency,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode,  bool useMaterial3,  bool disableAnimation,  String fabPosition)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  ThemeColors? customColors,  Size? windowSize,  double windowOpacity,  double cardTransparency,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode,  bool useMaterial3,  bool disableAnimation)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _AppSettings() when $default != null:
-return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.customColors,_that.windowSize,_that.windowOpacity,_that.cardTransparency,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode,_that.useMaterial3,_that.disableAnimation,_that.fabPosition);case _:
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.customColors,_that.windowSize,_that.windowOpacity,_that.cardTransparency,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode,_that.useMaterial3,_that.disableAnimation);case _:
  return orElse();

 }
@@ -474,10 +473,10 @@ return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_tha
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  ThemeColors? customColors,  Size? windowSize,  double windowOpacity,  double cardTransparency,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode,  bool useMaterial3,  bool disableAnimation,  String fabPosition)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  ThemeColors? customColors,  Size? windowSize,  double windowOpacity,  double cardTransparency,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode,  bool useMaterial3,  bool disableAnimation)  $default,) {final _that = this;
 switch (_that) {
 case _AppSettings():
-return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.customColors,_that.windowSize,_that.windowOpacity,_that.cardTransparency,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode,_that.useMaterial3,_that.disableAnimation,_that.fabPosition);}
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.customColors,_that.windowSize,_that.windowOpacity,_that.cardTransparency,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode,_that.useMaterial3,_that.disableAnimation);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -491,10 +490,10 @@ return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_tha
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  ThemeColors? customColors,  Size? windowSize,  double windowOpacity,  double cardTransparency,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode,  bool useMaterial3,  bool disableAnimation,  String fabPosition)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  ThemeColors? customColors,  Size? windowSize,  double windowOpacity,  double cardTransparency,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode,  bool useMaterial3,  bool disableAnimation)?  $default,) {final _that = this;
 switch (_that) {
 case _AppSettings() when $default != null:
-return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.customColors,_that.windowSize,_that.windowOpacity,_that.cardTransparency,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode,_that.useMaterial3,_that.disableAnimation,_that.fabPosition);case _:
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.customColors,_that.windowSize,_that.windowOpacity,_that.cardTransparency,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode,_that.useMaterial3,_that.disableAnimation);case _:
  return null;

 }
@@ -506,7 +505,7 @@ return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_tha


 class _AppSettings implements AppSettings {
-  const _AppSettings({required this.autoTranslate, required this.dataSavingMode, required this.soundEffects, required this.aprilFoolFeatures, required this.enterToSend, required this.appBarTransparent, required this.showBackgroundImage, required this.customFonts, required this.appColorScheme, required this.customColors, required this.windowSize, required this.windowOpacity, required this.cardTransparency, required this.defaultPoolId, required this.messageDisplayStyle, required this.themeMode, required this.useMaterial3, required this.disableAnimation, required this.fabPosition});
+  const _AppSettings({required this.autoTranslate, required this.dataSavingMode, required this.soundEffects, required this.aprilFoolFeatures, required this.enterToSend, required this.appBarTransparent, required this.showBackgroundImage, required this.customFonts, required this.appColorScheme, required this.customColors, required this.windowSize, required this.windowOpacity, required this.cardTransparency, required this.defaultPoolId, required this.messageDisplayStyle, required this.themeMode, required this.useMaterial3, required this.disableAnimation});
  

@override final  bool autoTranslate;
@@ -531,7 +530,6 @@ class _AppSettings implements AppSettings {
@override final  String? themeMode;
@override final  bool useMaterial3;
@override final  bool disableAnimation;
-@override final  String fabPosition;

 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
@@ -543,16 +541,16 @@ _$AppSettingsCopyWith<_AppSettings> get copyWith => __$AppSettingsCopyWithImpl<_

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.customColors, customColors) || other.customColors == customColors)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.windowOpacity, windowOpacity) || other.windowOpacity == windowOpacity)&&(identical(other.cardTransparency, cardTransparency) || other.cardTransparency == cardTransparency)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId)&&(identical(other.messageDisplayStyle, messageDisplayStyle) || other.messageDisplayStyle == messageDisplayStyle)&&(identical(other.themeMode, themeMode) || other.themeMode == themeMode)&&(identical(other.useMaterial3, useMaterial3) || other.useMaterial3 == useMaterial3)&&(identical(other.disableAnimation, disableAnimation) || other.disableAnimation == disableAnimation)&&(identical(other.fabPosition, fabPosition) || other.fabPosition == fabPosition));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.customColors, customColors) || other.customColors == customColors)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.windowOpacity, windowOpacity) || other.windowOpacity == windowOpacity)&&(identical(other.cardTransparency, cardTransparency) || other.cardTransparency == cardTransparency)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId)&&(identical(other.messageDisplayStyle, messageDisplayStyle) || other.messageDisplayStyle == messageDisplayStyle)&&(identical(other.themeMode, themeMode) || other.themeMode == themeMode)&&(identical(other.useMaterial3, useMaterial3) || other.useMaterial3 == useMaterial3)&&(identical(other.disableAnimation, disableAnimation) || other.disableAnimation == disableAnimation));
 }


@override
-int get hashCode => Object.hashAll([runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,customColors,windowSize,windowOpacity,cardTransparency,defaultPoolId,messageDisplayStyle,themeMode,useMaterial3,disableAnimation,fabPosition]);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,customColors,windowSize,windowOpacity,cardTransparency,defaultPoolId,messageDisplayStyle,themeMode,useMaterial3,disableAnimation);

@override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, customColors: $customColors, windowSize: $windowSize, windowOpacity: $windowOpacity, cardTransparency: $cardTransparency, defaultPoolId: $defaultPoolId, messageDisplayStyle: $messageDisplayStyle, themeMode: $themeMode, useMaterial3: $useMaterial3, disableAnimation: $disableAnimation, fabPosition: $fabPosition)';
+  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, customColors: $customColors, windowSize: $windowSize, windowOpacity: $windowOpacity, cardTransparency: $cardTransparency, defaultPoolId: $defaultPoolId, messageDisplayStyle: $messageDisplayStyle, themeMode: $themeMode, useMaterial3: $useMaterial3, disableAnimation: $disableAnimation)';
 }


@@ -563,7 +561,7 @@ abstract mixin class _$AppSettingsCopyWith<$Res> implements $AppSettingsCopyWith
  factory _$AppSettingsCopyWith(_AppSettings value, $Res Function(_AppSettings) _then) = __$AppSettingsCopyWithImpl;
@override @useResult
 $Res call({
- bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, ThemeColors? customColors, Size? windowSize, double windowOpacity, double cardTransparency, String? defaultPoolId, String messageDisplayStyle, String? themeMode, bool useMaterial3, bool disableAnimation, String fabPosition
+ bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, ThemeColors? customColors, Size? windowSize, double windowOpacity, double cardTransparency, String? defaultPoolId, String messageDisplayStyle, String? themeMode, bool useMaterial3, bool disableAnimation
 });


@@ -580,7 +578,7 @@ class __$AppSettingsCopyWithImpl<$Res>

 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? customColors = freezed,Object? windowSize = freezed,Object? windowOpacity = null,Object? cardTransparency = null,Object? defaultPoolId = freezed,Object? messageDisplayStyle = null,Object? themeMode = freezed,Object? useMaterial3 = null,Object? disableAnimation = null,Object? fabPosition = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? customColors = freezed,Object? windowSize = freezed,Object? windowOpacity = null,Object? cardTransparency = null,Object? defaultPoolId = freezed,Object? messageDisplayStyle = null,Object? themeMode = freezed,Object? useMaterial3 = null,Object? disableAnimation = null,}) {
  return _then(_AppSettings(
 autoTranslate: null == autoTranslate ? _self.autoTranslate : autoTranslate // ignore: cast_nullable_to_non_nullable
 as bool,dataSavingMode: null == dataSavingMode ? _self.dataSavingMode : dataSavingMode // ignore: cast_nullable_to_non_nullable
@@ -600,8 +598,7 @@ as String?,messageDisplayStyle: null == messageDisplayStyle ? _self.messageDispl
 as String,themeMode: freezed == themeMode ? _self.themeMode : themeMode // ignore: cast_nullable_to_non_nullable
 as String?,useMaterial3: null == useMaterial3 ? _self.useMaterial3 : useMaterial3 // ignore: cast_nullable_to_non_nullable
 as bool,disableAnimation: null == disableAnimation ? _self.disableAnimation : disableAnimation // ignore: cast_nullable_to_non_nullable
-as bool,fabPosition: null == fabPosition ? _self.fabPosition : fabPosition // ignore: cast_nullable_to_non_nullable
-as String,
+as bool,
  ));
 }

--- a/lib/pods/config.g.dart
+++ b/lib/pods/config.g.dart
@@ -30,7 +30,7 @@ Map<String, dynamic> _$ThemeColorsToJson(_ThemeColors instance) =>
 // **************************************************************************

 String _$appSettingsNotifierHash() =>
-    r'22b695f2023e3251db3296858acd701f7211d757';
+    r'10ebd893c39d24ae588a4c0bf4144ee4656465a4';

 /// See also [AppSettingsNotifier].
@ProviderFor(AppSettingsNotifier)
--- a/lib/pods/event_calendar.dart
+++ b/lib/pods/event_calendar.dart
@@ -44,7 +44,7 @@ Future<List<SnEventCalendarEntry>> eventCalendar(
 ) async {
  final client = ref.watch(apiClientProvider);
  final resp = await client.get(
-    '/pass/accounts/${query.uname ?? 'me'}/calendar',
+    '/id/accounts/${query.uname ?? 'me'}/calendar',
    queryParameters: {'year': query.year, 'month': query.month},
  );
  return resp.data
--- a/lib/pods/event_calendar.g.dart
+++ b/lib/pods/event_calendar.g.dart
@@ -6,7 +6,7 @@ part of 'event_calendar.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$eventCalendarHash() => r'3a33581c28bcd44bc5eb3abdb770171b4d275a5d';
+String _$eventCalendarHash() => r'72232fc044ac3c99b855dca37ff2f06a64be0afb';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/pods/theme.dart
+++ b/lib/pods/theme.dart
@@ -88,7 +88,7 @@ ThemeData createAppTheme(Brightness brightness, AppSettings settings) {
      color: colorScheme.surfaceContainer.withOpacity(
        settings.cardTransparency,
      ),
-      elevation: settings.cardTransparency < 1 ? 0 : null,
+      elevation: settings.cardTransparency <= 1 ? 0 : null,
    ),
    pageTransitionsTheme: PageTransitionsTheme(
      builders: {
--- a/lib/pods/userinfo.dart
+++ b/lib/pods/userinfo.dart
@@ -26,7 +26,7 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
    }
    try {
      final client = _ref.read(apiClientProvider);
-      final response = await client.get('/pass/accounts/me');
+      final response = await client.get('/id/accounts/me');
      final user = SnAccount.fromJson(response.data);
      state = AsyncValue.data(user);

--- a/lib/pods/websocket.dart
+++ b/lib/pods/websocket.dart
@@ -100,12 +100,16 @@ class WebSocketService {
          }
        },
        onDone: () {
-          talker.info('[WebSocket] Connection closed, attempting to reconnect...');
+          talker.info(
+            '[WebSocket] Connection closed, attempting to reconnect...',
+          );
          _scheduleReconnect();
          _statusStreamController.sink.add(WebSocketState.disconnected());
        },
        onError: (error) {
-          talker.error('[WebSocket] Error occurred: $error, attempting to reconnect...');
+          talker.error(
+            '[WebSocket] Error occurred: $error, attempting to reconnect...',
+          );
          _scheduleReconnect();
          _statusStreamController.sink.add(
            WebSocketState.error(error.toString()),
--- a/lib/route.dart
+++ b/lib/route.dart
@@ -37,7 +37,6 @@ import 'package:island/screens/chat/room.dart';
 import 'package:island/screens/chat/room_detail.dart';
 import 'package:island/screens/chat/call.dart';
 import 'package:island/screens/chat/search_messages.dart';
-import 'package:island/screens/thought/think.dart';
 import 'package:island/screens/creators/hub.dart';
 import 'package:island/screens/creators/posts/post_manage_list.dart';
 import 'package:island/screens/creators/stickers/stickers.dart';
@@ -132,11 +131,6 @@ final routerProvider = Provider<GoRouter>((ref) {
              return CallScreen(roomId: id);
            },
          ),
-          GoRoute(
-            name: 'thought',
-            path: '/thought',
-            builder: (context, state) => const ThoughtScreen(),
-          ),
          GoRoute(
            name: 'logs',
            path: '/logs',
--- a/lib/screens/account.dart
+++ b/lib/screens/account.dart
@@ -203,7 +203,7 @@ class AccountScreen extends HookConsumerWidget {
                          ],
                        ).padding(horizontal: 16, vertical: 12),
                        onTap: () {
-                          context.goNamed('developerHub');
+                          context.pushNamed('developerHub');
                        },
                      ),
                    ).height(140),
@@ -383,7 +383,7 @@ class AccountScreen extends HookConsumerWidget {
              onTap: () async {
                final apiClient = ref.watch(apiClientProvider);
                showLoadingModal(context);
-                await apiClient.delete('/pass/accounts/me/sessions/current');
+                await apiClient.delete('/id/accounts/me/sessions/current');
                if (!context.mounted) return;
                hideLoadingModal(context);
                final userNotifier = ref.read(userInfoProvider.notifier);
--- a/lib/screens/account/credits.dart
+++ b/lib/screens/account/credits.dart
@@ -14,7 +14,7 @@ part 'credits.g.dart';
@riverpod
 Future<double> socialCredits(Ref ref) async {
  final client = ref.watch(apiClientProvider);
-  final response = await client.get('/pass/accounts/me/credits');
+  final response = await client.get('/id/accounts/me/credits');
  if (response.statusCode != 200) {
    throw Exception('Failed to load social credits');
  }
@@ -39,7 +39,7 @@ class SocialCreditHistoryNotifier extends _$SocialCreditHistoryNotifier
    final queryParams = {'offset': offset, 'take': _pageSize};

    final response = await client.get(
-      '/pass/accounts/me/credits/history',
+      '/id/accounts/me/credits/history',
      queryParameters: queryParams,
    );
    final total = int.parse(response.headers.value('X-Total') ?? '0');
--- a/lib/screens/account/credits.g.dart
+++ b/lib/screens/account/credits.g.dart
@@ -6,7 +6,7 @@ part of 'credits.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$socialCreditsHash() => r'a0284583e94bc97285c689ac2bc018536932da69';
+String _$socialCreditsHash() => r'2599844e892127ee4d315caced5c10e4dbaea142';

 /// See also [socialCredits].
@ProviderFor(socialCredits)
@@ -25,7 +25,7 @@ final socialCreditsProvider = AutoDisposeFutureProvider<double>.internal(
 // ignore: unused_element
 typedef SocialCreditsRef = AutoDisposeFutureProviderRef<double>;
 String _$socialCreditHistoryNotifierHash() =>
-    r'3e87af246cc5dc72a1f3a87b81d1c87169bdfb5b';
+    r'950db020754160f835c64cedf3fa2175e61e4d64';

 /// See also [SocialCreditHistoryNotifier].
@ProviderFor(SocialCreditHistoryNotifier)
--- a/lib/screens/account/leveling.dart
+++ b/lib/screens/account/leveling.dart
@@ -34,7 +34,7 @@ class LevelingHistoryNotifier extends _$LevelingHistoryNotifier
    final queryParams = {'offset': offset, 'take': _pageSize};

    final response = await client.get(
-      '/pass/accounts/me/leveling',
+      '/id/accounts/me/leveling',
      queryParameters: queryParams,
    );
    final total = int.parse(response.headers.value('X-Total') ?? '0');
--- a/lib/screens/account/leveling.g.dart
+++ b/lib/screens/account/leveling.g.dart
@@ -7,7 +7,7 @@ part of 'leveling.dart';
 // **************************************************************************

 String _$levelingHistoryNotifierHash() =>
-    r'de51012e1590ac46388b6f3f2050b21cb96698d1';
+    r'e795f9b7911c9e50f15c095ea237cb0e87bf1e89';

 /// See also [LevelingHistoryNotifier].
@ProviderFor(LevelingHistoryNotifier)
--- a/lib/screens/account/me/account_settings.dart
+++ b/lib/screens/account/me/account_settings.dart
@@ -28,14 +28,14 @@ part 'account_settings.g.dart';
@riverpod
 Future<List<SnAuthFactor>> authFactors(Ref ref) async {
  final client = ref.read(apiClientProvider);
-  final res = await client.get('/pass/accounts/me/factors');
+  final res = await client.get('/id/accounts/me/factors');
  return res.data.map<SnAuthFactor>((e) => SnAuthFactor.fromJson(e)).toList();
 }

@riverpod
 Future<List<SnContactMethod>> contactMethods(Ref ref) async {
  final client = ref.read(apiClientProvider);
-  final resp = await client.get('/pass/accounts/me/contacts');
+  final resp = await client.get('/id/accounts/me/contacts');
  return resp.data
      .map<SnContactMethod>((e) => SnContactMethod.fromJson(e))
      .toList();
@@ -44,7 +44,7 @@ Future<List<SnContactMethod>> contactMethods(Ref ref) async {
@riverpod
 Future<List<SnAccountConnection>> accountConnections(Ref ref) async {
  final client = ref.read(apiClientProvider);
-  final resp = await client.get('/pass/accounts/me/connections');
+  final resp = await client.get('/id/accounts/me/connections');
  return resp.data
      .map<SnAccountConnection>((e) => SnAccountConnection.fromJson(e))
      .toList();
@@ -67,7 +67,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.delete('/pass/accounts/me');
+        await client.delete('/id/accounts/me');
        if (context.mounted) {
          showSnackBar('accountDeletionSent'.tr());
        }
@@ -93,7 +93,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
        final userInfo = ref.read(userInfoProvider);
        final client = ref.read(apiClientProvider);
        await client.post(
-          '/pass/accounts/recovery/password',
+          '/id/accounts/recovery/password',
          data: {'account': userInfo.value!.name, 'captcha_token': captchaTk},
        );
        if (context.mounted) {
--- a/lib/screens/account/me/account_settings.g.dart
+++ b/lib/screens/account/me/account_settings.g.dart
@@ -6,7 +6,7 @@ part of 'account_settings.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$authFactorsHash() => r'ed87d7dbd421fef0a5620416727c3dc598c97ef5';
+String _$authFactorsHash() => r'24fe2f7b375b019d87fc3b85cbedbe857f399c0f';

 /// See also [authFactors].
@ProviderFor(authFactors)
@@ -25,7 +25,7 @@ final authFactorsProvider =
@Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 typedef AuthFactorsRef = AutoDisposeFutureProviderRef<List<SnAuthFactor>>;
-String _$contactMethodsHash() => r'1d3d03e9ffbf36126236558ead22cb7d88bb9cb2';
+String _$contactMethodsHash() => r'76a1a93f61c51c44b32b4821f5112d58406155f0';

 /// See also [contactMethods].
@ProviderFor(contactMethods)
@@ -45,7 +45,7 @@ final contactMethodsProvider =
 // ignore: unused_element
 typedef ContactMethodsRef = AutoDisposeFutureProviderRef<List<SnContactMethod>>;
 String _$accountConnectionsHash() =>
-    r'33c10b98962ede6c428d4028c0d5f2f12ff0eb22';
+    r'9f69e7f23e3e53c528d38b93d76f0c9efc9a83db';

 /// See also [accountConnections].
@ProviderFor(accountConnections)
--- a/lib/screens/account/me/profile_update.dart
+++ b/lib/screens/account/me/profile_update.dart
@@ -87,7 +87,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
        }
        final client = ref.watch(apiClientProvider);
        await client.patch(
-          '/pass/accounts/me/profile',
+          '/id/accounts/me/profile',
          data: {'${position}_id': cloudFile.id},
        );
        final userNotifier = ref.read(userInfoProvider.notifier);
@@ -114,7 +114,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
      try {
        final client = ref.watch(apiClientProvider);
        await client.patch(
-          '/pass/accounts/me',
+          '/id/accounts/me',
          data: {
            'name': usernameController.text,
            'nick': nicknameController.text,
@@ -194,7 +194,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
        };

        await client.patch(
-          '/pass/accounts/me/profile',
+          '/id/accounts/me/profile',
          data: {
            'bio': bioController.text,
            'first_name': firstNameController.text,
--- a/lib/screens/account/me/settings_auth_factors.dart
+++ b/lib/screens/account/me/settings_auth_factors.dart
@@ -31,7 +31,7 @@ class AuthFactorSheet extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.delete('/pass/accounts/me/factors/${factor.id}');
+        await client.delete('/id/accounts/me/factors/${factor.id}');
        if (context.mounted) Navigator.pop(context, true);
      } catch (err) {
        showErrorAlert(err);
@@ -49,7 +49,7 @@ class AuthFactorSheet extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.post('/pass/accounts/me/factors/${factor.id}/disable');
+        await client.post('/id/accounts/me/factors/${factor.id}/disable');
        if (context.mounted) Navigator.pop(context, true);
      } catch (err) {
        showErrorAlert(err);
@@ -106,7 +106,7 @@ class AuthFactorSheet extends HookConsumerWidget {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
        await client.post(
-          '/pass/accounts/me/factors/${factor.id}/enable',
+          '/id/accounts/me/factors/${factor.id}/enable',
          data: jsonEncode(password),
        );
        if (context.mounted) Navigator.pop(context, true);
@@ -193,7 +193,7 @@ class AuthFactorNewSheet extends HookConsumerWidget {
        showLoadingModal(context);
        final apiClient = ref.read(apiClientProvider);
        final resp = await apiClient.post(
-          '/pass/accounts/me/factors',
+          '/id/accounts/me/factors',
          data: {'type': factorType.value, 'secret': secretController.text},
        );
        final factor = SnAuthFactor.fromJson(resp.data);
--- a/lib/screens/account/me/settings_connections.dart
+++ b/lib/screens/account/me/settings_connections.dart
@@ -77,7 +77,7 @@ class AccountConnectionSheet extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.delete('/pass/accounts/me/connections/${connection.id}');
+        await client.delete('/id/accounts/me/connections/${connection.id}');
        if (context.mounted) Navigator.pop(context, true);
      } catch (err) {
        showErrorAlert(err);
@@ -175,7 +175,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
            if (context.mounted) showLoadingModal(context);

            await client.post(
-              '/pass/auth/connect/apple/mobile',
+              '/id/auth/connect/apple/mobile',
              data: {
                'identity_token': credential.identityToken!,
                'authorization_code': credential.authorizationCode,
@@ -200,7 +200,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
            final serverUrl = ref.watch(serverUrlProvider);
            final accessToken = ref.watch(tokenProvider);
            launchUrlString(
-              '$serverUrl/pass/auth/login/${selectedProvider.value}?tk=${accessToken!.token}',
+              '$serverUrl/id/auth/login/${selectedProvider.value}?tk=${accessToken!.token}',
            );
          } else {
            await Navigator.of(context, rootNavigator: true).push(
@@ -345,7 +345,7 @@ class AccountConnectionsSheet extends HookConsumerWidget {
                                try {
                                  final client = ref.read(apiClientProvider);
                                  await client.delete(
-                                    '/pass/accounts/me/connections/${connection.id}',
+                                    '/id/accounts/me/connections/${connection.id}',
                                  );
                                  ref.invalidate(accountConnectionsProvider);
                                  return true;
--- a/lib/screens/account/me/settings_contacts.dart
+++ b/lib/screens/account/me/settings_contacts.dart
@@ -25,7 +25,7 @@ class ContactMethodSheet extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.delete('/pass/accounts/me/contacts/${contact.id}');
+        await client.delete('/id/accounts/me/contacts/${contact.id}');
        if (context.mounted) Navigator.pop(context, true);
      } catch (err) {
        showErrorAlert(err);
@@ -38,7 +38,7 @@ class ContactMethodSheet extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.post('/pass/accounts/me/contacts/${contact.id}/verify');
+        await client.post('/id/accounts/me/contacts/${contact.id}/verify');
        if (context.mounted) {
          showSnackBar('contactMethodVerificationSent'.tr());
        }
@@ -53,7 +53,7 @@ class ContactMethodSheet extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.post('/pass/accounts/me/contacts/${contact.id}/primary');
+        await client.post('/id/accounts/me/contacts/${contact.id}/primary');
        if (context.mounted) Navigator.pop(context, true);
      } catch (err) {
        showErrorAlert(err);
@@ -66,7 +66,7 @@ class ContactMethodSheet extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.post('/pass/accounts/me/contacts/${contact.id}/public');
+        await client.post('/id/accounts/me/contacts/${contact.id}/public');
        if (context.mounted) Navigator.pop(context, true);
      } catch (err) {
        showErrorAlert(err);
@@ -79,7 +79,7 @@ class ContactMethodSheet extends HookConsumerWidget {
      try {
        showLoadingModal(context);
        final client = ref.read(apiClientProvider);
-        await client.delete('/pass/accounts/me/contacts/${contact.id}/public');
+        await client.delete('/id/accounts/me/contacts/${contact.id}/public');
        if (context.mounted) Navigator.pop(context, true);
      } catch (err) {
        showErrorAlert(err);
@@ -221,7 +221,7 @@ class ContactMethodNewSheet extends HookConsumerWidget {
        showLoadingModal(context);
        final apiClient = ref.read(apiClientProvider);
        await apiClient.post(
-          '/pass/accounts/me/contacts',
+          '/id/accounts/me/contacts',
          data: {'type': contactType.value, 'content': contentController.text},
        );
        if (context.mounted) {
--- a/lib/screens/account/profile.dart
+++ b/lib/screens/account/profile.dart
@@ -561,14 +561,14 @@ Future<SnAccount> account(Ref ref, String uname) async {
    }
  }
  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get("/pass/accounts/$uname");
+  final resp = await apiClient.get("/id/accounts/$uname");
  return SnAccount.fromJson(resp.data);
 }

@riverpod
 Future<List<SnAccountBadge>> accountBadges(Ref ref, String uname) async {
  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get("/pass/accounts/$uname/badges");
+  final resp = await apiClient.get("/id/accounts/$uname/badges");
  return List<SnAccountBadge>.from(
    resp.data.map((x) => SnAccountBadge.fromJson(x)),
  );
@@ -617,7 +617,7 @@ Future<SnRelationship?> accountRelationship(Ref ref, String uname) async {
  final account = await ref.watch(accountProvider(uname).future);
  final apiClient = ref.watch(apiClientProvider);
  try {
-    final resp = await apiClient.get("/pass/relationships/${account.id}");
+    final resp = await apiClient.get("/id/relationships/${account.id}");
    return SnRelationship.fromJson(resp.data);
  } catch (err) {
    if (err is DioException && err.response?.statusCode == 404) {
@@ -690,7 +690,7 @@ class AccountProfileScreen extends HookConsumerWidget {
      showLoadingModal(context);
      try {
        final client = ref.watch(apiClientProvider);
-        await client.post('/pass/relationships/${account.value!.id}/friends');
+        await client.post('/id/relationships/${account.value!.id}/friends');
        ref.invalidate(accountRelationshipProvider(name));
      } catch (err) {
        showErrorAlert(err);
@@ -704,9 +704,9 @@ class AccountProfileScreen extends HookConsumerWidget {
      try {
        final client = ref.watch(apiClientProvider);
        if (accountRelationship.value == null) {
-          await client.post('/pass/relationships/${account.value!.id}/block');
+          await client.post('/id/relationships/${account.value!.id}/block');
        } else {
-          await client.delete('/pass/relationships/${account.value!.id}/block');
+          await client.delete('/id/relationships/${account.value!.id}/block');
        }
        ref.invalidate(accountRelationshipProvider(name));
      } catch (err) {
--- a/lib/screens/account/profile.g.dart
+++ b/lib/screens/account/profile.g.dart
@@ -6,7 +6,7 @@ part of 'profile.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$accountHash() => r'5e2b7bd59151b4638a5561f495537c259f767123';
+String _$accountHash() => r'ce7264a04f69e32a5cb07bc10ca5fa47ae1fddaa';

 /// Copied from Dart SDK
 class _SystemHash {
@@ -145,7 +145,7 @@ class _AccountProviderElement
  String get uname => (origin as AccountProvider).uname;
 }

-String _$accountBadgesHash() => r'68db63f49827020beecbdbf20529520d0cd14a7d';
+String _$accountBadgesHash() => r'1de05e122c23ff2c6ac6d318977165761e2ad177';

 /// See also [accountBadges].
@ProviderFor(accountBadges)
@@ -517,7 +517,7 @@ class _AccountDirectChatProviderElement
 }

 String _$accountRelationshipHash() =>
-    r'319f743261b113a1d3c6a397d48d13c858312669';
+    r'9a3a4e8c6c6706f73df95feccb86736fcad33f30';

 /// See also [accountRelationship].
@ProviderFor(accountRelationship)
--- a/lib/screens/account/relationship.dart
+++ b/lib/screens/account/relationship.dart
@@ -21,7 +21,7 @@ part 'relationship.g.dart';
@riverpod
 Future<List<SnRelationship>> sentFriendRequest(Ref ref) async {
  final client = ref.read(apiClientProvider);
-  final resp = await client.get('/pass/relationships/requests');
+  final resp = await client.get('/id/relationships/requests');
  return resp.data
      .map((e) => SnRelationship.fromJson(e))
      .cast<SnRelationship>()
@@ -43,7 +43,7 @@ class RelationshipListNotifier extends _$RelationshipListNotifier
    final take = 20;

    final response = await client.get(
-      '/pass/relationships',
+      '/id/relationships',
      queryParameters: {'offset': offset, 'take': take},
    );

@@ -226,7 +226,7 @@ class RelationshipScreen extends HookConsumerWidget {
      if (result == null) return;

      final client = ref.read(apiClientProvider);
-      await client.post('/pass/relationships/${result.id}/friends');
+      await client.post('/id/relationships/${result.id}/friends');
      ref.invalidate(sentFriendRequestProvider);
    }

@@ -240,7 +240,7 @@ class RelationshipScreen extends HookConsumerWidget {
        submitting.value = true;
        final client = ref.read(apiClientProvider);
        await client.post(
-          '/pass/relationships/${relationship.accountId}/friends/${isAccept ? 'accept' : 'decline'}',
+          '/id/relationships/${relationship.accountId}/friends/${isAccept ? 'accept' : 'decline'}',
        );
        relationshipNotifier.forceRefresh();
        if (!context.mounted) return;
@@ -267,7 +267,7 @@ class RelationshipScreen extends HookConsumerWidget {
    ) async {
      final client = ref.read(apiClientProvider);
      await client.patch(
-        '/pass/relationships/${relationship.accountId}',
+        '/id/relationships/${relationship.accountId}',
        data: {'status': newStatus},
      );
      relationshipNotifier.forceRefresh();
@@ -350,7 +350,7 @@ class _SentFriendRequestsSheet extends HookConsumerWidget {
    Future<void> cancelRequest(SnRelationship request) async {
      try {
        final client = ref.read(apiClientProvider);
-        await client.delete('/pass/relationships/${request.relatedId}/friends');
+        await client.delete('/id/relationships/${request.relatedId}/friends');
        ref.invalidate(sentFriendRequestProvider);
      } catch (err) {
        showErrorAlert(err);
--- a/lib/screens/account/relationship.g.dart
+++ b/lib/screens/account/relationship.g.dart
@@ -6,7 +6,7 @@ part of 'relationship.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$sentFriendRequestHash() => r'0c52813eb6f86c05f6e0b1e4e840d0d9c350aa9e';
+String _$sentFriendRequestHash() => r'dc02ace6cb755a01ab862c9fcff3b26de7f946cb';

 /// See also [sentFriendRequest].
@ProviderFor(sentFriendRequest)
@@ -27,7 +27,7 @@ final sentFriendRequestProvider =
 typedef SentFriendRequestRef =
    AutoDisposeFutureProviderRef<List<SnRelationship>>;
 String _$relationshipListNotifierHash() =>
-    r'fc46920256f7c48445c00652165e879890f2c9a3';
+    r'0a134ce69489a4f2002d2223853855b6f22e4e9f';

 /// See also [RelationshipListNotifier].
@ProviderFor(RelationshipListNotifier)
--- a/lib/screens/auth/create_account.dart
+++ b/lib/screens/auth/create_account.dart
@@ -49,7 +49,7 @@ class CreateAccountScreen extends HookConsumerWidget {
        showLoadingModal(context);
        final client = ref.watch(apiClientProvider);
        await client.post(
-          '/pass/accounts',
+          '/id/accounts',
          data: {
            'name': usernameController.text,
            'nick': nicknameController.text,
--- a/lib/screens/auth/login.dart
+++ b/lib/screens/auth/login.dart
@@ -175,7 +175,7 @@ class _LoginCheckScreen extends HookConsumerWidget {
      // Get token if challenge is completed
      final client = ref.watch(apiClientProvider);
      final tokenResp = await client.post(
-        '/pass/auth/token',
+        '/id/auth/token',
        data: {
          'grant_type': 'authorization_code',
          'code': code ?? challenge!.id,
@@ -241,7 +241,7 @@ class _LoginCheckScreen extends HookConsumerWidget {
        // Pass challenge
        final client = ref.watch(apiClientProvider);
        final resp = await client.patch(
-          '/pass/auth/challenge/${challenge!.id}',
+          '/id/auth/challenge/${challenge!.id}',
          data: {'factor_id': factor!.id, 'password': pwd},
        );
        final result = SnAuthChallenge.fromJson(resp.data);
@@ -388,7 +388,7 @@ class _LoginPickerScreen extends HookConsumerWidget {

      try {
        await client.post(
-          '/pass/auth/challenge/${challenge!.id}/factors/${factorPicked.value!.id}',
+          '/id/auth/challenge/${challenge!.id}/factors/${factorPicked.value!.id}',
          data:
              hintController.text.isNotEmpty
                  ? jsonEncode(hintController.text)
@@ -531,7 +531,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
      try {
        final client = ref.watch(apiClientProvider);
        await client.post(
-          '/pass/accounts/recovery/password',
+          '/id/accounts/recovery/password',
          data: {'account': uname, 'captcha_token': captchaTk},
        );
        showInfoAlert('loginResetPasswordSent'.tr(), 'done'.tr());
@@ -549,7 +549,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
      try {
        final client = ref.watch(apiClientProvider);
        final resp = await client.post(
-          '/pass/auth/challenge',
+          '/id/auth/challenge',
          data: {
            'account': uname,
            'device_id': await getUdid(),
@@ -570,7 +570,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
        final result = SnAuthChallenge.fromJson(resp.data);
        onChallenge(result);
        final factorResp = await client.get(
-          '/pass/auth/challenge/${result.id}/factors',
+          '/id/auth/challenge/${result.id}/factors',
        );
        onFactor(
          List<SnAuthFactor>.from(
@@ -599,7 +599,7 @@ class _LoginLookupScreen extends HookConsumerWidget {

        if (context.mounted) showLoadingModal(context);
        final resp = await client.post(
-          '/pass/auth/login/apple/mobile',
+          '/id/auth/login/apple/mobile',
          data: {
            'identity_token': credential.identityToken!,
            'authorization_code': credential.authorizationCode,
@@ -611,7 +611,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
        final challenge = SnAuthChallenge.fromJson(resp.data);
        onChallenge(challenge);
        final factorResp = await client.get(
-          '/pass/auth/challenge/${challenge.id}/factors',
+          '/id/auth/challenge/${challenge.id}/factors',
        );
        onFactor(
          List<SnAuthFactor>.from(
@@ -636,11 +636,11 @@ class _LoginLookupScreen extends HookConsumerWidget {

      final client = ref.watch(apiClientProvider);
      try {
-        final resp = await client.get('/pass/auth/challenge/$challengeId');
+        final resp = await client.get('/id/auth/challenge/$challengeId');
        final challenge = SnAuthChallenge.fromJson(resp.data);
        onChallenge(challenge);
        final factorResp = await client.get(
-          '/pass/auth/challenge/${challenge.id}/factors',
+          '/id/auth/challenge/${challenge.id}/factors',
        );
        onFactor(
          List<SnAuthFactor>.from(
--- a/lib/screens/auth/oidc.native.dart
+++ b/lib/screens/auth/oidc.native.dart
@@ -80,9 +80,7 @@ class _OidcScreenState extends ConsumerState<OidcScreen> {
                            : 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36',
                  ),
                  initialUrlRequest: URLRequest(
-                    url: WebUri(
-                      '$serverUrl/pass/auth/login/${widget.provider}',
-                    ),
+                    url: WebUri('$serverUrl/id/auth/login/${widget.provider}'),
                    headers: {
                      if (token?.token.isNotEmpty ?? false)
                        'Authorization': 'AtField ${token!.token}',
--- a/lib/screens/chat/call.dart
+++ b/lib/screens/chat/call.dart
@@ -1,5 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart' hide ConnectionState;
+import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -9,8 +9,6 @@ import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/chat/call_button.dart';
 import 'package:island/widgets/chat/call_overlay.dart';
 import 'package:island/widgets/chat/call_participant_tile.dart';
-import 'package:island/widgets/alert.dart';
-import 'package:livekit_client/livekit_client.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';

@@ -26,32 +24,13 @@ class CallScreen extends HookConsumerWidget {

    useEffect(() {
      talker.info('[Call] Joining the call...');
-      callNotifier.joinRoom(roomId).catchError((_) {
-        showConfirmAlert(
-          'Seems there already has a call connected, do you want override it?',
-          'Call already connected',
-        ).then((value) {
-          if (value != true) return;
-          talker.info('[Call] Joining the call... with overrides');
-          callNotifier.disconnect();
-          callNotifier.dispose();
-          callNotifier.joinRoom(roomId);
-        });
+      Future(() {
+        callNotifier.joinRoom(roomId);
      });
      return null;
    }, []);

-    final allAudioOnly = callNotifier.participants.every(
-      (p) =>
-          !(p.hasVideo &&
-              p.remoteParticipant.trackPublications.values.any(
-                (pub) =>
-                    pub.track != null &&
-                    pub.kind == TrackType.VIDEO &&
-                    !pub.muted &&
-                    !pub.isDisposed,
-              )),
-    );
+    final allAudioOnly = callNotifier.participants.every((p) => !p.hasVideo);

    return AppScaffold(
      isNoBackground: false,
@@ -67,12 +46,7 @@ class CallScreen extends HookConsumerWidget {
            Text(
              callState.isConnected
                  ? formatDuration(callState.duration)
-                  : (switch (callNotifier.room?.connectionState) {
-                    ConnectionState.connected => 'connected',
-                    ConnectionState.connecting => 'connecting',
-                    ConnectionState.reconnecting => 'reconnecting',
-                    _ => 'disconnected',
-                  }).tr(),
+                  : 'connecting'.tr(),
              style: const TextStyle(fontSize: 14),
            ),
          ],
@@ -159,19 +133,7 @@ class CallScreen extends HookConsumerWidget {

                        // Stage view: show main speaker(s) large, others in row
                        final mainSpeakers =
-                            participants
-                                .where(
-                                  (p) => p
-                                      .remoteParticipant
-                                      .trackPublications
-                                      .values
-                                      .any(
-                                        (pub) =>
-                                            pub.track != null &&
-                                            pub.kind == TrackType.VIDEO,
-                                      ),
-                                )
-                                .toList();
+                            participants.where((p) => p.hasVideo).toList();
                        if (mainSpeakers.isEmpty && participants.isNotEmpty) {
                          mainSpeakers.add(participants.first);
                        }
--- a/lib/screens/chat/chat.dart
+++ b/lib/screens/chat/chat.dart
@@ -10,13 +10,12 @@ import 'package:island/pods/chat/call.dart';
 import 'package:island/pods/chat/chat_summary.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/screens/realm/realms.dart';
-import 'package:island/services/event_bus.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/widgets/account/account_picker.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/sheet.dart';
-import 'package:island/widgets/navigation/fab_menu.dart';
 import 'package:island/widgets/response.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:relative_time/relative_time.dart';
@@ -239,17 +238,10 @@ class ChatListBodyWidget extends HookConsumerWidget {
                        room: item,
                        isDirect: item.type == 1,
                        onTap: () {
-                          if (isWideScreen(context)) {
-                            context.replaceNamed(
-                              'chatRoom',
-                              pathParameters: {'id': item.id},
-                            );
-                          } else {
-                            context.pushNamed(
-                              'chatRoom',
-                              pathParameters: {'id': item.id},
-                            );
-                          }
+                          context.pushNamed(
+                            'chatRoom',
+                            pathParameters: {'id': item.id},
+                          );
                        },
                      );
                    },
@@ -334,30 +326,28 @@ class ChatListScreen extends HookConsumerWidget {
      tabController.addListener(() {
        selectedTab.value = tabController.index;
      });
-
-      // Listen for chat rooms refresh events
-      final subscription = eventBus.on<ChatRoomsRefreshEvent>().listen((event) {
-        ref.invalidate(chatroomsJoinedProvider);
-      });
-
-      return () {
-        subscription.cancel();
-      };
+      return null;
    }, [tabController]);

-    useEffect(() {
-      // Set FAB type to chat
-      final fabMenuNotifier = ref.read(fabMenuTypeProvider.notifier);
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        fabMenuNotifier.state = FabMenuType.chat;
-      });
-      return () {
-        // Clean up: reset FAB type to main
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          fabMenuNotifier.state = FabMenuType.main;
-        });
-      };
-    }, []);
+    Future<void> createDirectMessage() async {
+      final result = await showModalBottomSheet(
+        context: context,
+        useRootNavigator: true,
+        isScrollControlled: true,
+        builder: (context) => const AccountPickerSheet(),
+      );
+      if (result == null) return;
+      final client = ref.read(apiClientProvider);
+      try {
+        await client.post(
+          '/sphere/chat/direct',
+          data: {'related_user_id': result.id},
+        );
+        ref.invalidate(chatroomsJoinedProvider);
+      } catch (err) {
+        showErrorAlert(err);
+      }
+    }

    if (isAside) {
      return Card(
@@ -494,6 +484,43 @@ class ChatListScreen extends HookConsumerWidget {
          const Gap(8),
        ],
      ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () {
+          showModalBottomSheet(
+            context: context,
+            useRootNavigator: true,
+            builder:
+                (context) => Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    ListTile(
+                      title: const Text('createChatRoom').tr(),
+                      leading: const Icon(Symbols.add),
+                      onTap: () {
+                        Navigator.pop(context);
+                        context.pushNamed('chatNew').then((value) {
+                          if (value != null) {
+                            ref.invalidate(chatroomsJoinedProvider);
+                          }
+                        });
+                      },
+                    ),
+                    ListTile(
+                      title: const Text('createDirectMessage').tr(),
+                      leading: const Icon(Symbols.person),
+                      onTap: () {
+                        Navigator.pop(context);
+                        createDirectMessage();
+                      },
+                    ),
+                    Gap(MediaQuery.of(context).padding.bottom + 16),
+                  ],
+                ),
+          );
+        },
+        child: const Icon(Symbols.add),
+      ),
      body: ChatListBodyWidget(
        isFloating: false,
        tabController: tabController,
--- a/lib/screens/chat/room.dart
+++ b/lib/screens/chat/room.dart
@@ -34,7 +34,6 @@ import "package:island/widgets/chat/call_button.dart";
 import "package:island/widgets/chat/chat_input.dart";
 import "package:island/widgets/chat/chat_link_attachments.dart";
 import "package:island/widgets/chat/public_room_preview.dart";
-import "package:island/screens/thought/think_sheet.dart";

 class ChatRoomScreen extends HookConsumerWidget {
  final String id;
@@ -146,10 +145,6 @@ class ChatRoomScreen extends HookConsumerWidget {
    final attachments = useState<List<UniversalFile>>([]);
    final attachmentProgress = useState<Map<String, Map<int, double>>>({});

-    // Selection mode state
-    final isSelectionMode = useState<bool>(false);
-    final selectedMessages = useState<Set<String>>({});
-
    var isLoading = false;
    var isScrollingToMessage = false; // Flag to prevent scroll conflicts

@@ -289,53 +284,6 @@ class ChatRoomScreen extends HookConsumerWidget {
      return () => messageController.removeListener(onTextChange);
    }, [messageController]);

-    // Selection functions
-    void toggleSelectionMode() {
-      isSelectionMode.value = !isSelectionMode.value;
-      if (!isSelectionMode.value) {
-        selectedMessages.value = {};
-      }
-    }
-
-    void toggleMessageSelection(String messageId) {
-      final newSelection = Set<String>.from(selectedMessages.value);
-      if (newSelection.contains(messageId)) {
-        newSelection.remove(messageId);
-      } else {
-        newSelection.add(messageId);
-      }
-      selectedMessages.value = newSelection;
-    }
-
-    void openThinkingSheet() {
-      if (selectedMessages.value.isEmpty) return;
-
-      // Convert selected message IDs to message data
-      final selectedMessageData =
-          messages.valueOrNull
-              ?.where((msg) => selectedMessages.value.contains(msg.id))
-              .map(
-                (msg) => {
-                  'id': msg.id,
-                  'content': msg.content,
-                  'senderId': msg.senderId,
-                  'createdAt': msg.createdAt.toIso8601String(),
-                  'attachments': msg.attachments,
-                },
-              )
-              .toList() ??
-          [];
-
-      ThoughtSheet.show(
-        context,
-        attachedMessages: selectedMessageData,
-        attachedPosts: [], // Could be extended to include posts
-      );
-
-      // Exit selection mode after opening
-      toggleSelectionMode();
-    }
-
    final compactHeader = isWideScreen(context);

    Widget onlineIndicator() => Row(
@@ -623,106 +571,42 @@ class ChatRoomScreen extends HookConsumerWidget {
        final messageWidget = chatIdentity.when(
          skipError: true,
          data:
-              (identity) => GestureDetector(
-                onLongPress: () {
-                  if (!isSelectionMode.value) {
-                    toggleSelectionMode();
-                    toggleMessageSelection(message.id);
+              (identity) => MessageItem(
+                key: settings.disableAnimation ? key : null,
+                message: message,
+                isCurrentUser: identity?.id == message.senderId,
+                onAction: (action) {
+                  switch (action) {
+                    case MessageItemAction.delete:
+                      messagesNotifier.deleteMessage(message.id);
+                    case MessageItemAction.edit:
+                      messageEditingTo.value = message.toRemoteMessage();
+                      messageController.text =
+                          messageEditingTo.value?.content ?? '';
+                      attachments.value =
+                          messageEditingTo.value!.attachments
+                              .map((e) => UniversalFile.fromAttachment(e))
+                              .toList();
+                    case MessageItemAction.forward:
+                      messageForwardingTo.value = message.toRemoteMessage();
+                    case MessageItemAction.reply:
+                      messageReplyingTo.value = message.toRemoteMessage();
+                    case MessageItemAction.resend:
+                      messagesNotifier.retryMessage(message.id);
                  }
                },
-                onTap: () {
-                  if (isSelectionMode.value) {
-                    toggleMessageSelection(message.id);
-                  }
+                onJump: (messageId) {
+                  scrollToMessage(
+                    messageId: messageId,
+                    messageList: messageList,
+                    messagesNotifier: messagesNotifier,
+                    listController: listController,
+                    scrollController: scrollController,
+                    ref: ref,
+                  );
                },
-                child: Container(
-                  color:
-                      selectedMessages.value.contains(message.id)
-                          ? Theme.of(
-                            context,
-                          ).colorScheme.primaryContainer.withOpacity(0.3)
-                          : null,
-                  child: Stack(
-                    children: [
-                      MessageItem(
-                        key: settings.disableAnimation ? key : null,
-                        message: message,
-                        isCurrentUser: identity?.id == message.senderId,
-                        onAction:
-                            isSelectionMode.value
-                                ? null
-                                : (action) {
-                                  switch (action) {
-                                    case MessageItemAction.delete:
-                                      messagesNotifier.deleteMessage(
-                                        message.id,
-                                      );
-                                    case MessageItemAction.edit:
-                                      messageEditingTo.value =
-                                          message.toRemoteMessage();
-                                      messageController.text =
-                                          messageEditingTo.value?.content ?? '';
-                                      attachments.value =
-                                          messageEditingTo.value!.attachments
-                                              .map(
-                                                (e) =>
-                                                    UniversalFile.fromAttachment(
-                                                      e,
-                                                    ),
-                                              )
-                                              .toList();
-                                    case MessageItemAction.forward:
-                                      messageForwardingTo.value =
-                                          message.toRemoteMessage();
-                                    case MessageItemAction.reply:
-                                      messageReplyingTo.value =
-                                          message.toRemoteMessage();
-                                    case MessageItemAction.resend:
-                                      messagesNotifier.retryMessage(message.id);
-                                  }
-                                },
-                        onJump: (messageId) {
-                          scrollToMessage(
-                            messageId: messageId,
-                            messageList: messageList,
-                            messagesNotifier: messagesNotifier,
-                            listController: listController,
-                            scrollController: scrollController,
-                            ref: ref,
-                          );
-                        },
-                        progress: attachmentProgress.value[message.id],
-                        showAvatar: isLastInGroup,
-                        isSelectionMode: isSelectionMode.value,
-                        isSelected: selectedMessages.value.contains(message.id),
-                        onToggleSelection: toggleMessageSelection,
-                        onEnterSelectionMode: () {
-                          if (!isSelectionMode.value) {
-                            toggleSelectionMode();
-                          }
-                        },
-                      ),
-                      if (selectedMessages.value.contains(message.id))
-                        Positioned(
-                          top: 8,
-                          right: 8,
-                          child: Container(
-                            width: 16,
-                            height: 16,
-                            decoration: BoxDecoration(
-                              color: Theme.of(context).colorScheme.primary,
-                              shape: BoxShape.circle,
-                            ),
-                            child: Icon(
-                              Icons.check,
-                              size: 12,
-                              color: Theme.of(context).colorScheme.onPrimary,
-                            ),
-                          ),
-                        ),
-                    ],
-                  ),
-                ),
+                progress: attachmentProgress.value[message.id],
+                showAvatar: isLastInGroup,
              ),
          loading:
              () => MessageItem(
@@ -872,73 +756,71 @@ class ChatRoomScreen extends HookConsumerWidget {
                    ),
                  ),
                ),
-                if (!isSelectionMode.value)
-                  chatRoom.when(
-                    data:
-                        (room) => Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            ChatInput(
-                              messageController: messageController,
-                              chatRoom: room!,
-                              onSend: sendMessage,
-                              onClear: () {
-                                if (messageEditingTo.value != null) {
-                                  attachments.value.clear();
-                                  messageController.clear();
-                                }
-                                messageEditingTo.value = null;
-                                messageReplyingTo.value = null;
-                                messageForwardingTo.value = null;
-                              },
-                              messageEditingTo: messageEditingTo.value,
-                              messageReplyingTo: messageReplyingTo.value,
-                              messageForwardingTo: messageForwardingTo.value,
-                              onPickFile: (bool isPhoto) {
-                                if (isPhoto) {
-                                  pickPhotoMedia();
-                                } else {
-                                  pickVideoMedia();
-                                }
-                              },
-                              onPickAudio: pickAudioMedia,
-                              onPickGeneralFile: pickGeneralFile,
-                              onLinkAttachment: linkAttachment,
-                              attachments: attachments.value,
-                              onUploadAttachment: uploadAttachment,
-                              onDeleteAttachment: (index) async {
-                                final attachment = attachments.value[index];
-                                if (attachment.isOnCloud &&
-                                    !attachment.isLink) {
-                                  final client = ref.watch(apiClientProvider);
-                                  await client.delete(
-                                    '/drive/files/${attachment.data.id}',
-                                  );
-                                }
-                                final clone = List.of(attachments.value);
-                                clone.removeAt(index);
-                                attachments.value = clone;
-                              },
-                              onMoveAttachment: (idx, delta) {
-                                if (idx + delta < 0 ||
-                                    idx + delta >= attachments.value.length) {
-                                  return;
-                                }
-                                final clone = List.of(attachments.value);
-                                clone.insert(idx + delta, clone.removeAt(idx));
-                                attachments.value = clone;
-                              },
-                              onAttachmentsChanged: (newAttachments) {
-                                attachments.value = newAttachments;
-                              },
-                              attachmentProgress: attachmentProgress.value,
-                            ),
-                            Gap(MediaQuery.of(context).padding.bottom),
-                          ],
-                        ),
-                    error: (_, _) => const SizedBox.shrink(),
-                    loading: () => const SizedBox.shrink(),
-                  ),
+                chatRoom.when(
+                  data:
+                      (room) => Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          ChatInput(
+                            messageController: messageController,
+                            chatRoom: room!,
+                            onSend: sendMessage,
+                            onClear: () {
+                              if (messageEditingTo.value != null) {
+                                attachments.value.clear();
+                                messageController.clear();
+                              }
+                              messageEditingTo.value = null;
+                              messageReplyingTo.value = null;
+                              messageForwardingTo.value = null;
+                            },
+                            messageEditingTo: messageEditingTo.value,
+                            messageReplyingTo: messageReplyingTo.value,
+                            messageForwardingTo: messageForwardingTo.value,
+                            onPickFile: (bool isPhoto) {
+                              if (isPhoto) {
+                                pickPhotoMedia();
+                              } else {
+                                pickVideoMedia();
+                              }
+                            },
+                            onPickAudio: pickAudioMedia,
+                            onPickGeneralFile: pickGeneralFile,
+                            onLinkAttachment: linkAttachment,
+                            attachments: attachments.value,
+                            onUploadAttachment: uploadAttachment,
+                            onDeleteAttachment: (index) async {
+                              final attachment = attachments.value[index];
+                              if (attachment.isOnCloud && !attachment.isLink) {
+                                final client = ref.watch(apiClientProvider);
+                                await client.delete(
+                                  '/drive/files/${attachment.data.id}',
+                                );
+                              }
+                              final clone = List.of(attachments.value);
+                              clone.removeAt(index);
+                              attachments.value = clone;
+                            },
+                            onMoveAttachment: (idx, delta) {
+                              if (idx + delta < 0 ||
+                                  idx + delta >= attachments.value.length) {
+                                return;
+                              }
+                              final clone = List.of(attachments.value);
+                              clone.insert(idx + delta, clone.removeAt(idx));
+                              attachments.value = clone;
+                            },
+                            onAttachmentsChanged: (newAttachments) {
+                              attachments.value = newAttachments;
+                            },
+                            attachmentProgress: attachmentProgress.value,
+                          ),
+                          Gap(MediaQuery.of(context).padding.bottom),
+                        ],
+                      ),
+                  error: (_, _) => const SizedBox.shrink(),
+                  loading: () => const SizedBox.shrink(),
+                ),
              ],
            ),
          ),
@@ -977,43 +859,6 @@ class ChatRoomScreen extends HookConsumerWidget {
                ),
              ),
            ),
-          // Selection mode toolbar
-          if (isSelectionMode.value)
-            Positioned(
-              left: 0,
-              right: 0,
-              bottom: 0,
-              child: Container(
-                color: Theme.of(context).colorScheme.surface,
-                padding: EdgeInsets.only(
-                  left: 16,
-                  right: 16,
-                  top: 8,
-                  bottom: MediaQuery.of(context).padding.bottom + 8,
-                ),
-                child: Row(
-                  children: [
-                    IconButton(
-                      icon: const Icon(Icons.close),
-                      onPressed: toggleSelectionMode,
-                      tooltip: 'Cancel selection',
-                    ),
-                    const SizedBox(width: 8),
-                    Text(
-                      '${selectedMessages.value.length} selected',
-                      style: Theme.of(context).textTheme.titleMedium,
-                    ),
-                    const Spacer(),
-                    if (selectedMessages.value.isNotEmpty)
-                      FilledButton.icon(
-                        onPressed: openThinkingSheet,
-                        icon: Icon(Symbols.smart_toy),
-                        label: const Text('AI Think'),
-                      ),
-                  ],
-                ),
-              ),
-            ),
        ],
      ),
    );
--- a/lib/screens/creators/hub.dart
+++ b/lib/screens/creators/hub.dart
@@ -522,7 +522,7 @@ class CreatorHubScreen extends HookConsumerWidget {
    return AppScaffold(
      isNoBackground: false,
      appBar: AppBar(
-        leading: const PageBackButton(backTo: '/account'),
+        leading: const PageBackButton(),
        title: Text('creatorHub').tr(),
        actions: [
          if (!isWideScreen(context))
--- a/lib/screens/creators/stickers/pack_detail.dart
+++ b/lib/screens/creators/stickers/pack_detail.dart
@@ -198,7 +198,7 @@ class StickerPackDetailContent extends HookConsumerWidget {
                                    ),
                                  ),
                                  child: CloudImageWidget(
-                                    fileId: sticker.image.id,
+                                    fileId: sticker.imageId,
                                    fit: BoxFit.contain,
                                  ),
                                ),
@@ -318,7 +318,7 @@ class StickerForm extends HookConsumerWidget {

    final formKey = useMemoized(() => GlobalKey<FormState>(), []);

-    final image = useState<String?>(id == null ? '' : sticker.value?.image.id);
+    final image = useState<String?>(id == null ? '' : sticker.value?.imageId);
    final imageController = useTextEditingController(text: image.value);
    final slugController = useTextEditingController(
      text: id == null ? '' : sticker.value?.slug,
@@ -326,8 +326,8 @@ class StickerForm extends HookConsumerWidget {

    useEffect(() {
      if (sticker.value != null) {
-        image.value = sticker.value!.image.id;
-        imageController.text = sticker.value!.image.id;
+        image.value = sticker.value!.imageId;
+        imageController.text = sticker.value!.imageId;
        slugController.text = sticker.value!.slug;
      }
      return null;
--- a/lib/screens/developers/hub.dart
+++ b/lib/screens/developers/hub.dart
@@ -181,7 +181,7 @@ class _ConsoleAppBar extends StatelessWidget implements PreferredSizeWidget {
  @override
  Widget build(BuildContext context) {
    return AppBar(
-      leading: const PageBackButton(backTo: '/account'),
+      leading: const PageBackButton(),
      title: Text('developerHub').tr(),
      actions: [
        if (currentProject != null)
--- a/lib/screens/explore.dart
+++ b/lib/screens/explore.dart
@@ -19,6 +19,7 @@ import 'package:island/widgets/check_in.dart';
 import 'package:island/widgets/post/post_featured.dart';
 import 'package:island/widgets/post/post_item.dart';
 import 'package:island/widgets/post/compose_card.dart';
+import 'package:island/widgets/post/compose_dialog.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
@@ -90,6 +91,10 @@ class ExploreScreen extends HookConsumerWidget {
      return () => tabController.removeListener(listener);
    }, [tabController]);

+    final activitiesNotifier = ref.watch(
+      activityListNotifierProvider(currentFilter.value).notifier,
+    );
+
    final now = DateTime.now();

    final query = useState(
@@ -206,11 +211,29 @@ class ExploreScreen extends HookConsumerWidget {
      ).padding(horizontal: 8),
    );

-    final appBar = isWide ? null : _buildAppBar(tabController, context);
-
    return AppScaffold(
      isNoBackground: false,
-      appBar: appBar,
+      floatingActionButton:
+          isWide
+              ? null
+              : InkWell(
+                onLongPress: () async {
+                  final result = await PostComposeDialog.show(context);
+                  if (result != null) {
+                    activitiesNotifier.forceRefresh();
+                  }
+                },
+                child: FloatingActionButton(
+                  heroTag: Key("explore-page-fab"),
+                  onPressed: () async {
+                    final result = await PostComposeDialog.show(context);
+                    if (result != null) {
+                      activitiesNotifier.forceRefresh();
+                    }
+                  },
+                  child: const Icon(Symbols.edit),
+                ),
+              ),
      body:
          isWide
              ? _buildWideBody(
@@ -224,7 +247,7 @@ class ExploreScreen extends HookConsumerWidget {
                selectedDay,
                currentFilter.value,
              )
-              : _buildNarrowBody(context, ref, currentFilter.value),
+              : _buildNarrowBody(context, ref, filterBar, currentFilter.value),
    );
  }

@@ -311,7 +334,11 @@ class ExploreScreen extends HookConsumerWidget {
                        margin: EdgeInsets.zero,
                      ),
                    PostFeaturedList(),
-                    const PostComposeCard(),
+                    PostComposeCard(
+                      onSubmit: () {
+                        activitiesNotifier.forceRefresh();
+                      },
+                    ),
                  ],
                ),
              ),
@@ -340,125 +367,10 @@ class ExploreScreen extends HookConsumerWidget {
    ).padding(horizontal: 12);
  }

-  PreferredSizeWidget _buildAppBar(
-    TabController tabController,
-    BuildContext context,
-  ) {
-    final foregroundColor = Theme.of(context).appBarTheme.foregroundColor;
-
-    return AppBar(
-      toolbarHeight: 48 + 4,
-      flexibleSpace: Container(
-        height: 48,
-        margin: EdgeInsets.only(
-          left: 8,
-          right: 8,
-          top: 4 + MediaQuery.of(context).padding.top,
-        ),
-        child: Row(
-          children: [
-            Expanded(
-              child: TabBar(
-                controller: tabController,
-                tabAlignment: TabAlignment.start,
-                isScrollable: true,
-                dividerColor: Colors.transparent,
-                tabs: [
-                  Tab(
-                    icon: Tooltip(
-                      message: 'explore'.tr(),
-                      child: Icon(Symbols.explore, color: foregroundColor),
-                    ),
-                  ),
-                  Tab(
-                    icon: Tooltip(
-                      message: 'exploreFilterSubscriptions'.tr(),
-                      child: Icon(
-                        Symbols.subscriptions,
-                        color: foregroundColor,
-                      ),
-                    ),
-                  ),
-                  Tab(
-                    icon: Tooltip(
-                      message: 'exploreFilterFriends'.tr(),
-                      child: Icon(Symbols.people, color: foregroundColor),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            IconButton(
-              onPressed: () {
-                context.pushNamed('articles');
-              },
-              icon: Icon(Symbols.auto_stories, color: foregroundColor),
-              tooltip: 'webArticlesStand'.tr(),
-            ),
-            PopupMenuButton(
-              itemBuilder:
-                  (context) => [
-                    PopupMenuItem(
-                      child: Row(
-                        children: [
-                          const Icon(Symbols.category),
-                          const Gap(12),
-                          Text('categories').tr(),
-                        ],
-                      ),
-                      onTap: () {
-                        context.pushNamed('postCategories');
-                      },
-                    ),
-                    PopupMenuItem(
-                      child: Row(
-                        children: [
-                          const Icon(Symbols.label),
-                          const Gap(12),
-                          Text('tags').tr(),
-                        ],
-                      ),
-                      onTap: () {
-                        context.pushNamed('postTags');
-                      },
-                    ),
-                    PopupMenuItem(
-                      child: Row(
-                        children: [
-                          const Icon(Symbols.shuffle),
-                          const Gap(12),
-                          Text('postShuffle').tr(),
-                        ],
-                      ),
-                      onTap: () {
-                        context.pushNamed('postShuffle');
-                      },
-                    ),
-                    PopupMenuItem(
-                      child: Row(
-                        children: [
-                          const Icon(Symbols.search),
-                          const Gap(12),
-                          Text('search').tr(),
-                        ],
-                      ),
-                      onTap: () {
-                        context.pushNamed('postSearch');
-                      },
-                    ),
-                  ],
-              icon: Icon(Symbols.action_key, color: foregroundColor),
-              tooltip: 'search'.tr(),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
  Widget _buildNarrowBody(
    BuildContext context,
    WidgetRef ref,
+    Widget filterBar,
    String? currentFilter,
  ) {
    final user = ref.watch(userInfoProvider);
@@ -472,39 +384,45 @@ class ExploreScreen extends HookConsumerWidget {

    final bodyView = _buildActivityList(context, ref, currentFilter);

-    return Expanded(
-      child: ExtendedRefreshIndicator(
-        onRefresh: () => Future.sync(activitiesNotifier.forceRefresh),
-        child: ClipRRect(
-          borderRadius: const BorderRadius.all(Radius.circular(8)),
-          child: CustomScrollView(
-            slivers: [
-              if (user.value != null)
-                SliverToBoxAdapter(
-                  child: CheckInWidget(
-                    margin: const EdgeInsets.only(bottom: 8, top: 8),
+    return Column(
+      spacing: 8,
+      children: [
+        filterBar.padding(horizontal: 8, top: 8),
+        Expanded(
+          child: ExtendedRefreshIndicator(
+            onRefresh: () => Future.sync(activitiesNotifier.forceRefresh),
+            child: ClipRRect(
+              borderRadius: const BorderRadius.all(Radius.circular(8)),
+              child: CustomScrollView(
+                slivers: [
+                  if (user.value != null)
+                    SliverToBoxAdapter(
+                      child: CheckInWidget(
+                        margin: const EdgeInsets.only(bottom: 8),
+                      ),
+                    ),
+                  SliverToBoxAdapter(
+                    child: Padding(
+                      padding: const EdgeInsets.only(bottom: 8),
+                      child: PostFeaturedList(),
+                    ),
                  ),
-                ),
-              SliverToBoxAdapter(
-                child: Padding(
-                  padding: const EdgeInsets.only(bottom: 8),
-                  child: PostFeaturedList(),
-                ),
+                  if (notificationCount.value != null &&
+                      notificationCount.value! > 0)
+                    SliverToBoxAdapter(
+                      child: notificationIndicatorWidget(
+                        context,
+                        count: notificationCount.value ?? 0,
+                        margin: const EdgeInsets.only(bottom: 8),
+                      ),
+                    ),
+                  bodyView,
+                ],
              ),
-              if (notificationCount.value != null &&
-                  notificationCount.value! > 0)
-                SliverToBoxAdapter(
-                  child: notificationIndicatorWidget(
-                    context,
-                    count: notificationCount.value ?? 0,
-                    margin: const EdgeInsets.only(bottom: 8),
-                  ),
-                ),
-              bodyView,
-            ],
+            ).padding(horizontal: 8),
          ),
-        ).padding(horizontal: 8),
-      ),
+        ),
+      ],
    );
  }
 }
--- a/lib/screens/lottery.dart
+++ b/lib/screens/lottery.dart
@@ -1,829 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/wallet.dart';
-import 'package:island/pods/network.dart';
-import 'package:island/screens/wallet.dart';
-import 'package:island/services/time.dart';
-import 'package:island/widgets/alert.dart';
-import 'package:island/widgets/content/sheet.dart';
-import 'package:island/widgets/payment/payment_overlay.dart';
-import 'package:material_symbols_icons/symbols.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:styled_widget/styled_widget.dart';
-
-part 'lottery.g.dart';
-
-@riverpod
-Future<List<SnLotteryTicket>> lotteryTickets(
-  Ref ref, {
-  int offset = 0,
-  int take = 20,
-}) async {
-  final client = ref.watch(apiClientProvider);
-  final resp = await client.get('/pass/lotteries?offset=$offset&take=$take');
-  return (resp.data as List).map((e) => SnLotteryTicket.fromJson(e)).toList();
-}
-
-@riverpod
-Future<List<SnLotteryRecord>> lotteryRecords(
-  Ref ref, {
-  int offset = 0,
-  int take = 20,
-}) async {
-  final client = ref.watch(apiClientProvider);
-  final resp = await client.get(
-    '/pass/lotteries/records?offset=$offset&take=$take',
-  );
-  return (resp.data as List).map((e) => SnLotteryRecord.fromJson(e)).toList();
-}
-
-class LotteryTab extends StatelessWidget {
-  const LotteryTab({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return DefaultTabController(
-      length: 2,
-      child: Column(
-        children: [
-          TabBar(
-            tabs: [Tab(text: 'myTickets'.tr()), Tab(text: 'drawHistory'.tr())],
-          ),
-          Expanded(
-            child: TabBarView(
-              children: [LotteryTicketsList(), LotteryRecordsList()],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class LotteryTicketsList extends HookConsumerWidget {
-  const LotteryTicketsList({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final tickets = ref.watch(lotteryTicketsProvider());
-
-    return tickets.when(
-      data: (ticketsList) {
-        if (ticketsList.isEmpty) {
-          return Center(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Icon(
-                  Symbols.casino,
-                  size: 48,
-                  color: Theme.of(context).colorScheme.outline,
-                ),
-                const Gap(16),
-                Text(
-                  'noLotteryTickets'.tr(),
-                  style: Theme.of(context).textTheme.titleMedium,
-                ),
-                const Gap(8),
-                Text(
-                  'buyYourFirstTicket'.tr(),
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const Gap(16),
-                FilledButton.icon(
-                  onPressed: () => _showLotteryPurchaseSheet(context, ref),
-                  icon: const Icon(Symbols.add),
-                  label: Text('buyTicket'.tr()),
-                ),
-              ],
-            ),
-          );
-        }
-
-        return Column(
-          children: [
-            Expanded(
-              child: ListView.builder(
-                padding: const EdgeInsets.all(16),
-                itemCount: ticketsList.length,
-                itemBuilder: (context, index) {
-                  final ticket = ticketsList[index];
-                  return Card(
-                    margin: const EdgeInsets.only(bottom: 8),
-                    child: Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Row(
-                            children: [
-                              Icon(
-                                Symbols.confirmation_number,
-                                color: Theme.of(context).colorScheme.primary,
-                              ),
-                              const Gap(8),
-                              Expanded(
-                                child: Text(ticket.createdAt.formatSystem()),
-                              ),
-                              Container(
-                                padding: const EdgeInsets.symmetric(
-                                  horizontal: 8,
-                                  vertical: 4,
-                                ),
-                                decoration: BoxDecoration(
-                                  color: _getLotteryStatusColor(
-                                    context,
-                                    ticket.drawStatus,
-                                  ).withOpacity(0.1),
-                                  borderRadius: BorderRadius.circular(12),
-                                ),
-                                child: Text(
-                                  _getLotteryStatusText(ticket.drawStatus),
-                                  style: TextStyle(
-                                    color: _getLotteryStatusColor(
-                                      context,
-                                      ticket.drawStatus,
-                                    ),
-                                    fontSize: 12,
-                                    fontWeight: FontWeight.w600,
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-                          const Gap(8),
-                          _buildTicketNumbersDisplay(context, ticket),
-                          const Gap(8),
-                          Row(
-                            spacing: 6,
-                            children: [
-                              const Icon(Symbols.asterisk, size: 18),
-                              Text('multiplier').tr().fontSize(13),
-                              Text(
-                                '·',
-                              ).fontWeight(FontWeight.w900).fontSize(13),
-                              Text(
-                                '${ticket.multiplier}x',
-                                style: Theme.of(context).textTheme.bodyMedium,
-                              ).fontSize(13),
-                            ],
-                          ).opacity(0.75),
-                        ],
-                      ),
-                    ),
-                  );
-                },
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.all(16),
-              child: FilledButton.icon(
-                onPressed: () => _showLotteryPurchaseSheet(context, ref),
-                icon: const Icon(Symbols.add),
-                label: Text('buyTicket'.tr()),
-                style: FilledButton.styleFrom(
-                  minimumSize: const Size(double.infinity, 48),
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-      loading: () => const Center(child: CircularProgressIndicator()),
-      error: (error, stack) => Center(child: Text('Error: $error')),
-    );
-  }
-
-  Future<void> _showLotteryPurchaseSheet(
-    BuildContext context,
-    WidgetRef ref,
-  ) async {
-    final result = await showModalBottomSheet<Map<String, dynamic>>(
-      context: context,
-      useRootNavigator: true,
-      isScrollControlled: true,
-      builder: (context) => const LotteryPurchaseSheet(),
-    );
-
-    if (result != null && context.mounted) {
-      await _handleLotteryPurchase(context, ref, result);
-    }
-  }
-
-  Future<void> _handleLotteryPurchase(
-    BuildContext context,
-    WidgetRef ref,
-    Map<String, dynamic> purchaseData,
-  ) async {
-    final client = ref.read(apiClientProvider);
-    try {
-      showLoadingModal(context);
-
-      // The lottery API creates the order for us
-      final orderResponse = await client.post(
-        '/pass/lotteries',
-        data: purchaseData,
-      );
-
-      if (context.mounted) hideLoadingModal(context);
-
-      final order = SnWalletOrder.fromJson(orderResponse.data);
-
-      // Show payment overlay
-      if (context.mounted) {
-        final completedOrder = await PaymentOverlay.show(
-          context: context,
-          order: order,
-        );
-
-        if (completedOrder != null) {
-          // Payment successful, refresh data
-          ref.invalidate(lotteryTicketsProvider);
-          ref.invalidate(walletCurrentProvider);
-          if (context.mounted) {
-            showSnackBar('ticketPurchasedSuccessfully'.tr());
-          }
-        }
-      }
-    } catch (err) {
-      if (context.mounted) hideLoadingModal(context);
-      showErrorAlert(err);
-    }
-  }
-
-  String _getLotteryStatusText(int status) {
-    switch (status) {
-      case 0:
-        return 'pending'.tr();
-      case 1:
-        return 'drawn'.tr();
-      case 2:
-        return 'won'.tr();
-      case 3:
-        return 'lost'.tr();
-      default:
-        return 'unknown'.tr();
-    }
-  }
-
-  Color _getLotteryStatusColor(BuildContext context, int status) {
-    switch (status) {
-      case 0:
-        return Colors.blue;
-      case 1:
-        return Colors.orange;
-      case 2:
-        return Colors.green;
-      case 3:
-        return Colors.red;
-      default:
-        return Theme.of(context).colorScheme.primary;
-    }
-  }
-
-  Widget _buildTicketNumbersDisplay(
-    BuildContext context,
-    SnLotteryTicket ticket,
-  ) {
-    final numbers = <Widget>[];
-
-    // Check if any numbers matched
-    bool hasAnyMatch =
-        ticket.matchedRegionOneNumbers != null &&
-        ticket.matchedRegionOneNumbers!.isNotEmpty;
-
-    // Add region one numbers
-    for (final number in ticket.regionOneNumbers) {
-      final isMatched =
-          ticket.matchedRegionOneNumbers?.contains(number) ?? false;
-      if (isMatched) hasAnyMatch = true;
-      numbers.add(
-        _buildNumberWidget(
-          context,
-          number,
-          isMatched: isMatched,
-          allUnmatched: !hasAnyMatch && ticket.drawStatus >= 1,
-        ),
-      );
-    }
-
-    // Add region two number
-    final isSpecialMatched =
-        ticket.matchedRegionTwoNumber == ticket.regionTwoNumber;
-    if (isSpecialMatched) hasAnyMatch = true;
-    numbers.add(
-      _buildNumberWidget(
-        context,
-        ticket.regionTwoNumber,
-        isMatched: isSpecialMatched,
-        isSpecial: true,
-        allUnmatched: !hasAnyMatch && ticket.drawStatus >= 1,
-      ),
-    );
-
-    return Wrap(
-      spacing: 6,
-      crossAxisAlignment: WrapCrossAlignment.center,
-      children: numbers,
-    );
-  }
-
-  Widget _buildNumberWidget(
-    BuildContext context,
-    int number, {
-    bool isMatched = false,
-    bool isSpecial = false,
-    bool allUnmatched = false,
-  }) {
-    Color backgroundColor;
-    Color textColor;
-    Color borderColor;
-
-    if (isMatched) {
-      backgroundColor = Colors.green;
-      textColor = Colors.white;
-      borderColor = Colors.green;
-    } else {
-      backgroundColor =
-          isSpecial
-              ? Theme.of(context).colorScheme.secondary
-              : Theme.of(context).colorScheme.surface;
-      textColor =
-          isSpecial
-              ? Theme.of(context).colorScheme.onSecondary
-              : Theme.of(context).colorScheme.onSurface;
-      borderColor =
-          isSpecial
-              ? Theme.of(context).colorScheme.secondary
-              : Theme.of(context).colorScheme.outline.withOpacity(0.3);
-
-      // Blend with red if all numbers are unmatched
-      if (allUnmatched) {
-        backgroundColor = Color.alphaBlend(
-          Colors.red.withOpacity(0.3),
-          backgroundColor,
-        );
-        if (!isSpecial) {
-          textColor = Color.alphaBlend(Colors.red.withOpacity(0.5), textColor);
-        }
-      }
-    }
-
-    return Container(
-      width: 32,
-      height: 32,
-      decoration: BoxDecoration(
-        color: backgroundColor,
-        border: Border.all(color: borderColor),
-        borderRadius: BorderRadius.circular(8),
-      ),
-      child: Center(
-        child: Text(
-          number.toString().padLeft(2, '0'),
-          style: TextStyle(
-            color: textColor,
-            fontWeight: FontWeight.w600,
-            fontSize: 12,
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class LotteryRecordsList extends HookConsumerWidget {
-  const LotteryRecordsList({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final records = ref.watch(lotteryRecordsProvider());
-
-    return records.when(
-      data: (recordsList) {
-        if (recordsList.isEmpty) {
-          return Center(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Icon(
-                  Symbols.history,
-                  size: 48,
-                  color: Theme.of(context).colorScheme.outline,
-                ),
-                const Gap(16),
-                Text(
-                  'noDrawHistory'.tr(),
-                  style: Theme.of(context).textTheme.titleMedium,
-                ),
-              ],
-            ),
-          );
-        }
-
-        return ListView.builder(
-          padding: const EdgeInsets.all(16),
-          itemCount: recordsList.length,
-          itemBuilder: (context, index) {
-            final record = recordsList[index];
-            return Card(
-              margin: const EdgeInsets.only(bottom: 8),
-              child: Padding(
-                padding: const EdgeInsets.all(16),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Row(
-                      children: [
-                        Icon(
-                          Symbols.celebration,
-                          color: Theme.of(context).colorScheme.primary,
-                        ),
-                        const Gap(8),
-                        Text(
-                          DateFormat.yMd().format(record.drawDate),
-                          style: const TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ],
-                    ),
-                    const Gap(8),
-                    Text(
-                      '${'winningNumbers'.tr()}: ${record.winningRegionOneNumbers.join(', ')}',
-                      style: Theme.of(context).textTheme.bodyMedium,
-                    ),
-                    const Gap(4),
-                    Text(
-                      '${'specialNumber'.tr()}: ${record.winningRegionTwoNumber}',
-                      style: Theme.of(context).textTheme.bodyMedium,
-                    ),
-                    const Gap(8),
-                    Text(
-                      '${'totalTickets'.tr()}: ${record.totalTickets}',
-                      style: Theme.of(context).textTheme.bodySmall,
-                    ),
-                    const Gap(4),
-                    Text(
-                      '${'totalWinners'.tr()}: ${record.totalPrizesAwarded}',
-                      style: Theme.of(context).textTheme.bodySmall,
-                    ),
-                    const Gap(4),
-                    Text(
-                      '${'prizePool'.tr()}: ${record.totalPrizeAmount.toStringAsFixed(2)} ${'walletCurrencyShortPoints'.tr()}',
-                      style: Theme.of(context).textTheme.bodySmall,
-                    ),
-                  ],
-                ),
-              ),
-            );
-          },
-        );
-      },
-      loading: () => const Center(child: CircularProgressIndicator()),
-      error: (error, stack) => Center(child: Text('Error: $error')),
-    );
-  }
-}
-
-class LotteryPurchaseSheet extends StatefulWidget {
-  const LotteryPurchaseSheet({super.key});
-
-  @override
-  State<LotteryPurchaseSheet> createState() => _LotteryPurchaseSheetState();
-}
-
-class _LotteryPurchaseSheetState extends State<LotteryPurchaseSheet> {
-  final List<int> selectedNumbers = [];
-  int multiplier = 1;
-
-  @override
-  Widget build(BuildContext context) {
-    final totalCost = 10.0 * multiplier; // Base cost of 10 ISP per ticket
-
-    return SheetScaffold(
-      titleText: 'buyLotteryTicket'.tr(),
-      child: Column(
-        children: [
-          Expanded(
-            child: SingleChildScrollView(
-              padding: const EdgeInsets.all(16),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  // Number Selection Section
-                  Text(
-                    'selectNumbers'.tr(),
-                    style: TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.primary,
-                    ),
-                  ),
-                  const Gap(8),
-                  Text(
-                    'select5UniqueNumbers'.tr(),
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
-                  ),
-                  const Gap(4),
-                  Text(
-                    'The last selected number will be your special number.',
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: Theme.of(context).colorScheme.secondary,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                  const Gap(16),
-
-                  // Number Grid
-                  _buildNumberGrid(),
-
-                  const Gap(16),
-
-                  // Multiplier Section
-                  Text(
-                    'selectMultiplier'.tr(),
-                    style: TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.primary,
-                    ),
-                  ),
-                  const Gap(16),
-                  _buildMultiplierSelector(),
-
-                  const Gap(16),
-
-                  // Cost Summary
-                  Card(
-                    child: Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: Column(
-                        children: [
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
-                              Text('baseCost'.tr()),
-                              Text('10.00 ${'walletCurrencyShortPoints'.tr()}'),
-                            ],
-                          ),
-                          if (multiplier > 1) ...[
-                            const Gap(8),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                Text(
-                                  'multiplier'.tr(
-                                    args: [multiplier.toString()],
-                                  ),
-                                ),
-                                Text(
-                                  '+ ${(10.0 * (multiplier - 1)).toStringAsFixed(2)} ${'walletCurrencyShortPoints'.tr()}',
-                                ),
-                              ],
-                            ),
-                          ],
-                          const Divider(),
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
-                              Text(
-                                'totalCost'.tr(),
-                                style: const TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                              Text(
-                                '${totalCost.toStringAsFixed(2)} ${'walletCurrencyShortPoints'.tr()}',
-                                style: const TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-
-                  const Gap(16),
-
-                  // Prize Structure
-                  Text(
-                    'prizeStructure'.tr(),
-                    style: TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.primary,
-                    ),
-                  ),
-                  const Gap(8),
-                  _buildPrizeStructure(),
-                ],
-              ),
-            ),
-          ),
-
-          // Action Buttons
-          Padding(
-            padding: const EdgeInsets.all(16),
-            child: Row(
-              children: [
-                Expanded(
-                  child: OutlinedButton(
-                    onPressed: () => Navigator.of(context).pop(),
-                    child: Text('cancel'.tr()),
-                  ),
-                ),
-                const Gap(8),
-                Expanded(
-                  child: FilledButton(
-                    onPressed: _canPurchase ? _purchaseTicket : null,
-                    child: Text('purchase'.tr()),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildNumberGrid() {
-    return GridView.builder(
-      shrinkWrap: true,
-      physics: const NeverScrollableScrollPhysics(),
-      gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: 10,
-        crossAxisSpacing: 8,
-        mainAxisSpacing: 8,
-      ),
-      itemCount: 100,
-      itemBuilder: (context, index) {
-        final number = index;
-        final isSelected = selectedNumbers.contains(number);
-        final isSpecialNumber =
-            selectedNumbers.isNotEmpty &&
-            selectedNumbers.last == number &&
-            selectedNumbers.length == 6;
-
-        return GestureDetector(
-          onTap: () => _toggleNumber(number),
-          child: Container(
-            decoration: BoxDecoration(
-              color:
-                  isSpecialNumber
-                      ? Theme.of(context).colorScheme.secondary
-                      : isSelected
-                      ? Theme.of(context).colorScheme.primary
-                      : Theme.of(context).colorScheme.surface,
-              border: Border.all(
-                color:
-                    isSpecialNumber
-                        ? Theme.of(context).colorScheme.secondary
-                        : isSelected
-                        ? Theme.of(context).colorScheme.primary
-                        : Theme.of(
-                          context,
-                        ).colorScheme.outline.withOpacity(0.3),
-              ),
-              borderRadius: BorderRadius.circular(8),
-            ),
-            child: Center(
-              child: Text(
-                number.toString().padLeft(2, '0'),
-                style: TextStyle(
-                  color:
-                      isSpecialNumber
-                          ? Theme.of(context).colorScheme.onSecondary
-                          : isSelected
-                          ? Theme.of(context).colorScheme.onPrimary
-                          : Theme.of(context).colorScheme.onSurface,
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildMultiplierSelector() {
-    return TextFormField(
-      initialValue: multiplier.toString(),
-      keyboardType: TextInputType.number,
-      decoration: InputDecoration(
-        labelText: 'multiplierLabel'.tr(),
-        prefixText: 'x',
-        border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 16,
-          vertical: 12,
-        ),
-      ),
-      onChanged: (value) {
-        final parsed = int.tryParse(value);
-        if (parsed != null && parsed >= 1) {
-          setState(() => multiplier = parsed);
-        }
-      },
-      validator: (value) {
-        if (value == null || value.isEmpty) {
-          return 'Please enter a multiplier';
-        }
-        final parsed = int.tryParse(value);
-        if (parsed == null || parsed < 1 || parsed > 10) {
-          return 'Multiplier must be between 1 and 10';
-        }
-        return null;
-      },
-    );
-  }
-
-  Widget _buildPrizeStructure() {
-    // Base rewards for matched numbers (0-5)
-    final baseRewards = [0, 10, 100, 500, 1000, 10000];
-
-    final prizeStructure = <String, String>{};
-
-    // Generate prize structure for 0-5 matches with and without special
-    for (int matches = 5; matches >= 0; matches--) {
-      final baseReward = baseRewards[matches];
-
-      // With special number match (x10 multiplier)
-      final specialReward = baseReward * 10;
-      prizeStructure['$matches+Special'] = specialReward.toStringAsFixed(2);
-
-      // Without special number match
-      if (matches > 0) {
-        prizeStructure[matches.toString()] = baseReward.toStringAsFixed(2);
-      }
-    }
-
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          children:
-              prizeStructure.entries.map((entry) {
-                return Padding(
-                  padding: const EdgeInsets.only(bottom: 8),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        entry.key == '0+Special'
-                            ? 'specialOnly'.tr()
-                            : entry.key.tr(),
-                      ),
-                      Text(
-                        '${entry.value} ${'walletCurrencyShortPoints'.tr()}',
-                      ),
-                    ],
-                  ),
-                );
-              }).toList(),
-        ),
-      ),
-    );
-  }
-
-  void _toggleNumber(int number) {
-    setState(() {
-      if (selectedNumbers.contains(number)) {
-        selectedNumbers.remove(number);
-      } else if (selectedNumbers.length < 6) {
-        selectedNumbers.add(number);
-      }
-    });
-  }
-
-  bool get _canPurchase {
-    return selectedNumbers.length == 6;
-  }
-
-  Future<void> _purchaseTicket() async {
-    if (!_canPurchase) return;
-
-    // Sort all numbers except the last one (special number)
-    final regularNumbers = selectedNumbers.sublist(0, 5)..sort();
-    final specialNumber = selectedNumbers.last;
-
-    final purchaseData = {
-      'region_one_numbers': regularNumbers,
-      'region_two_number': specialNumber,
-      'multiplier': multiplier,
-    };
-
-    if (mounted) Navigator.of(context).pop(purchaseData);
-  }
-}
--- a/lib/screens/lottery.g.dart
+++ b/lib/screens/lottery.g.dart
@@ -1,307 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'lottery.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-String _$lotteryTicketsHash() => r'dd17cd721fc3b176ffa0ee0a85d0d850740e5e80';
-
-/// Copied from Dart SDK
-class _SystemHash {
-  _SystemHash._();
-
-  static int combine(int hash, int value) {
-    // ignore: parameter_assignments
-    hash = 0x1fffffff & (hash + value);
-    // ignore: parameter_assignments
-    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
-    return hash ^ (hash >> 6);
-  }
-
-  static int finish(int hash) {
-    // ignore: parameter_assignments
-    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
-    // ignore: parameter_assignments
-    hash = hash ^ (hash >> 11);
-    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
-  }
-}
-
-/// See also [lotteryTickets].
-@ProviderFor(lotteryTickets)
-const lotteryTicketsProvider = LotteryTicketsFamily();
-
-/// See also [lotteryTickets].
-class LotteryTicketsFamily extends Family<AsyncValue<List<SnLotteryTicket>>> {
-  /// See also [lotteryTickets].
-  const LotteryTicketsFamily();
-
-  /// See also [lotteryTickets].
-  LotteryTicketsProvider call({int offset = 0, int take = 20}) {
-    return LotteryTicketsProvider(offset: offset, take: take);
-  }
-
-  @override
-  LotteryTicketsProvider getProviderOverride(
-    covariant LotteryTicketsProvider provider,
-  ) {
-    return call(offset: provider.offset, take: provider.take);
-  }
-
-  static const Iterable<ProviderOrFamily>? _dependencies = null;
-
-  @override
-  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
-
-  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
-
-  @override
-  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
-      _allTransitiveDependencies;
-
-  @override
-  String? get name => r'lotteryTicketsProvider';
-}
-
-/// See also [lotteryTickets].
-class LotteryTicketsProvider
-    extends AutoDisposeFutureProvider<List<SnLotteryTicket>> {
-  /// See also [lotteryTickets].
-  LotteryTicketsProvider({int offset = 0, int take = 20})
-    : this._internal(
-        (ref) => lotteryTickets(
-          ref as LotteryTicketsRef,
-          offset: offset,
-          take: take,
-        ),
-        from: lotteryTicketsProvider,
-        name: r'lotteryTicketsProvider',
-        debugGetCreateSourceHash:
-            const bool.fromEnvironment('dart.vm.product')
-                ? null
-                : _$lotteryTicketsHash,
-        dependencies: LotteryTicketsFamily._dependencies,
-        allTransitiveDependencies:
-            LotteryTicketsFamily._allTransitiveDependencies,
-        offset: offset,
-        take: take,
-      );
-
-  LotteryTicketsProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.offset,
-    required this.take,
-  }) : super.internal();
-
-  final int offset;
-  final int take;
-
-  @override
-  Override overrideWith(
-    FutureOr<List<SnLotteryTicket>> Function(LotteryTicketsRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: LotteryTicketsProvider._internal(
-        (ref) => create(ref as LotteryTicketsRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        offset: offset,
-        take: take,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<List<SnLotteryTicket>> createElement() {
-    return _LotteryTicketsProviderElement(this);
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return other is LotteryTicketsProvider &&
-        other.offset == offset &&
-        other.take == take;
-  }
-
-  @override
-  int get hashCode {
-    var hash = _SystemHash.combine(0, runtimeType.hashCode);
-    hash = _SystemHash.combine(hash, offset.hashCode);
-    hash = _SystemHash.combine(hash, take.hashCode);
-
-    return _SystemHash.finish(hash);
-  }
-}
-
-@Deprecated('Will be removed in 3.0. Use Ref instead')
-// ignore: unused_element
-mixin LotteryTicketsRef on AutoDisposeFutureProviderRef<List<SnLotteryTicket>> {
-  /// The parameter `offset` of this provider.
-  int get offset;
-
-  /// The parameter `take` of this provider.
-  int get take;
-}
-
-class _LotteryTicketsProviderElement
-    extends AutoDisposeFutureProviderElement<List<SnLotteryTicket>>
-    with LotteryTicketsRef {
-  _LotteryTicketsProviderElement(super.provider);
-
-  @override
-  int get offset => (origin as LotteryTicketsProvider).offset;
-  @override
-  int get take => (origin as LotteryTicketsProvider).take;
-}
-
-String _$lotteryRecordsHash() => r'55c657460f18d9777741d09013b445ca036863f3';
-
-/// See also [lotteryRecords].
-@ProviderFor(lotteryRecords)
-const lotteryRecordsProvider = LotteryRecordsFamily();
-
-/// See also [lotteryRecords].
-class LotteryRecordsFamily extends Family<AsyncValue<List<SnLotteryRecord>>> {
-  /// See also [lotteryRecords].
-  const LotteryRecordsFamily();
-
-  /// See also [lotteryRecords].
-  LotteryRecordsProvider call({int offset = 0, int take = 20}) {
-    return LotteryRecordsProvider(offset: offset, take: take);
-  }
-
-  @override
-  LotteryRecordsProvider getProviderOverride(
-    covariant LotteryRecordsProvider provider,
-  ) {
-    return call(offset: provider.offset, take: provider.take);
-  }
-
-  static const Iterable<ProviderOrFamily>? _dependencies = null;
-
-  @override
-  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
-
-  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
-
-  @override
-  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
-      _allTransitiveDependencies;
-
-  @override
-  String? get name => r'lotteryRecordsProvider';
-}
-
-/// See also [lotteryRecords].
-class LotteryRecordsProvider
-    extends AutoDisposeFutureProvider<List<SnLotteryRecord>> {
-  /// See also [lotteryRecords].
-  LotteryRecordsProvider({int offset = 0, int take = 20})
-    : this._internal(
-        (ref) => lotteryRecords(
-          ref as LotteryRecordsRef,
-          offset: offset,
-          take: take,
-        ),
-        from: lotteryRecordsProvider,
-        name: r'lotteryRecordsProvider',
-        debugGetCreateSourceHash:
-            const bool.fromEnvironment('dart.vm.product')
-                ? null
-                : _$lotteryRecordsHash,
-        dependencies: LotteryRecordsFamily._dependencies,
-        allTransitiveDependencies:
-            LotteryRecordsFamily._allTransitiveDependencies,
-        offset: offset,
-        take: take,
-      );
-
-  LotteryRecordsProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.offset,
-    required this.take,
-  }) : super.internal();
-
-  final int offset;
-  final int take;
-
-  @override
-  Override overrideWith(
-    FutureOr<List<SnLotteryRecord>> Function(LotteryRecordsRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: LotteryRecordsProvider._internal(
-        (ref) => create(ref as LotteryRecordsRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        offset: offset,
-        take: take,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<List<SnLotteryRecord>> createElement() {
-    return _LotteryRecordsProviderElement(this);
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return other is LotteryRecordsProvider &&
-        other.offset == offset &&
-        other.take == take;
-  }
-
-  @override
-  int get hashCode {
-    var hash = _SystemHash.combine(0, runtimeType.hashCode);
-    hash = _SystemHash.combine(hash, offset.hashCode);
-    hash = _SystemHash.combine(hash, take.hashCode);
-
-    return _SystemHash.finish(hash);
-  }
-}
-
-@Deprecated('Will be removed in 3.0. Use Ref instead')
-// ignore: unused_element
-mixin LotteryRecordsRef on AutoDisposeFutureProviderRef<List<SnLotteryRecord>> {
-  /// The parameter `offset` of this provider.
-  int get offset;
-
-  /// The parameter `take` of this provider.
-  int get take;
-}
-
-class _LotteryRecordsProviderElement
-    extends AutoDisposeFutureProviderElement<List<SnLotteryRecord>>
-    with LotteryRecordsRef {
-  _LotteryRecordsProviderElement(super.provider);
-
-  @override
-  int get offset => (origin as LotteryRecordsProvider).offset;
-  @override
-  int get take => (origin as LotteryRecordsProvider).take;
-}
-
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
--- a/lib/screens/posts/post_category_detail.dart
+++ b/lib/screens/posts/post_category_detail.dart
@@ -237,7 +237,7 @@ class PostCategoryDetailScreen extends HookConsumerWidget {
                        loading: () => ResponseLoadingWidget(),
                      ),
                    ),
-                  ).padding(horizontal: 8),
+                  ),
                ),
              ),
            const SliverGap(4),
--- a/lib/screens/posts/post_detail.dart
+++ b/lib/screens/posts/post_detail.dart
@@ -22,7 +22,6 @@ import 'package:island/widgets/response.dart';
 import 'package:island/utils/share_utils.dart';
 import 'package:island/widgets/safety/abuse_report_helper.dart';
 import 'package:island/widgets/share/share_sheet.dart';
-import 'package:island/screens/thought/think_sheet.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
@@ -290,7 +289,7 @@ class PostActionButtons extends HookConsumerWidget {
            builder: (context) => PostAwardHistorySheet(postId: post.id),
          );
        },
-        icon: const Icon(Symbols.emoji_events),
+        icon: const Icon(Symbols.star),
        label:
            post.awardedScore > 0
                ? Text('${formatScore(post.awardedScore)} pts')
@@ -298,16 +297,6 @@ class PostActionButtons extends HookConsumerWidget {
      ),
    );

-    actions.add(
-      FilledButton.tonalIcon(
-        onPressed: () {
-          ThoughtSheet.show(context, attachedPosts: [post.id]);
-        },
-        icon: const Icon(Symbols.smart_toy),
-        label: Text('aiThought'.tr()),
-      ),
-    );
-
    actions.add(
      Row(
        mainAxisSize: MainAxisSize.min,
--- a/lib/screens/posts/pub_profile.dart
+++ b/lib/screens/posts/pub_profile.dart
@@ -285,9 +285,7 @@ Future<List<SnAccountBadge>> publisherBadges(Ref ref, String pubName) async {
  final pub = await ref.watch(publisherProvider(pubName).future);
  if (pub.type != 0 || pub.account == null) return [];
  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get(
-    "/pass/accounts/${pub.account!.name}/badges",
-  );
+  final resp = await apiClient.get("/id/accounts/${pub.account!.name}/badges");
  return List<SnAccountBadge>.from(
    resp.data.map((x) => SnAccountBadge.fromJson(x)),
  );
--- a/lib/screens/posts/pub_profile.g.dart
+++ b/lib/screens/posts/pub_profile.g.dart
@@ -145,7 +145,7 @@ class _PublisherProviderElement
  String get uname => (origin as PublisherProvider).uname;
 }

-String _$publisherBadgesHash() => r'26776fd6cb611953f52bdb6a7dfa004c34d5cd8e';
+String _$publisherBadgesHash() => r'527efad74225fbacf558ac5db160ecce53a60c62';

 /// See also [publisherBadges].
@ProviderFor(publisherBadges)
--- a/lib/screens/realm/realm_detail.dart
+++ b/lib/screens/realm/realm_detail.dart
@@ -47,7 +47,9 @@ Future<Color?> realmAppbarForegroundColor(Ref ref, String realmSlug) async {
 Future<SnRealmMember?> realmIdentity(Ref ref, String realmSlug) async {
  try {
    final apiClient = ref.watch(apiClientProvider);
-    final response = await apiClient.get('/pass/realms/$realmSlug/members/me');
+    final response = await apiClient.get(
+      '/sphere/realms/$realmSlug/members/me',
+    );
    return SnRealmMember.fromJson(response.data);
  } catch (err) {
    if (err is DioException && err.response?.statusCode == 404) {
@@ -115,7 +117,7 @@ class RealmDetailScreen extends HookConsumerWidget {
        onPressed: () async {
          try {
            final apiClient = ref.read(apiClientProvider);
-            await apiClient.post('/pass/realms/$slug/members/me');
+            await apiClient.post('/sphere/realms/$slug/members/me');
            ref.invalidate(realmIdentityProvider(slug));
            ref.invalidate(realmsJoinedProvider);
            showSnackBar('realmJoinSuccess'.tr());
@@ -430,7 +432,7 @@ class _RealmActionMenu extends HookConsumerWidget {
                              ).then((confirm) {
                                if (confirm) {
                                  final client = ref.watch(apiClientProvider);
-                                  client.delete('/pass/realms/$realmSlug');
+                                  client.delete('/sphere/realms/$realmSlug');
                                  ref.invalidate(realmsJoinedProvider);
                                  if (context.mounted) {
                                    context.pop(true);
@@ -463,7 +465,7 @@ class _RealmActionMenu extends HookConsumerWidget {
                                if (confirm) {
                                  final client = ref.watch(apiClientProvider);
                                  await client.delete(
-                                    '/pass/realms/$realmSlug/members/me',
+                                    '/sphere/realms/$realmSlug/members/me',
                                  );
                                  ref.invalidate(realmsJoinedProvider);
                                  if (context.mounted) {
@@ -503,7 +505,7 @@ class _RealmActionMenu extends HookConsumerWidget {
                        if (confirm) {
                          final client = ref.watch(apiClientProvider);
                          await client.delete(
-                            '/pass/realms/$realmSlug/members/me',
+                            '/sphere/realms/$realmSlug/members/me',
                          );
                          ref.invalidate(realmsJoinedProvider);
                          if (context.mounted) {
@@ -537,7 +539,7 @@ class RealmMemberListNotifier extends _$RealmMemberListNotifier
    final offset = cursor != null ? int.parse(cursor) : 0;

    final response = await apiClient.get(
-      '/pass/realms/$realmSlug/members',
+      '/sphere/realms/$realmSlug/members',
      queryParameters: {
        'offset': offset,
        'take': _pageSize,
@@ -590,7 +592,7 @@ class _RealmMemberListSheet extends HookConsumerWidget {
      try {
        final apiClient = ref.watch(apiClientProvider);
        await apiClient.post(
-          '/pass/realms/invites/$realmSlug',
+          '/sphere/realms/invites/$realmSlug',
          data: {'related_user_id': result.id, 'role': 0},
        );
        // Refresh the provider
@@ -727,7 +729,7 @@ class _RealmMemberListSheet extends HookConsumerWidget {
                              try {
                                final apiClient = ref.watch(apiClientProvider);
                                await apiClient.delete(
-                                  '/pass/realms/$realmSlug/members/${member.accountId}',
+                                  '/sphere/realms/$realmSlug/members/${member.accountId}',
                                );
                                // Refresh the provider
                                ref.invalidate(memberListProvider);
@@ -858,7 +860,7 @@ class _RealmMemberRoleSheet extends HookConsumerWidget {

                      final apiClient = ref.read(apiClientProvider);
                      await apiClient.patch(
-                        '/pass/realms/$realmSlug/members/${member.accountId}/role',
+                        '/sphere/realms/$realmSlug/members/${member.accountId}/role',
                        data: newRole,
                      );

--- a/lib/screens/realm/realm_detail.g.dart
+++ b/lib/screens/realm/realm_detail.g.dart
@@ -155,7 +155,7 @@ class _RealmAppbarForegroundColorProviderElement
      (origin as RealmAppbarForegroundColorProvider).realmSlug;
 }

-String _$realmIdentityHash() => r'd5a3ecc6eeec291cebbfc9a45d8aac7195366381';
+String _$realmIdentityHash() => r'c5e2977d243260947b919bc27146c134e34f0db1';

 /// See also [realmIdentity].
@ProviderFor(realmIdentity)
@@ -399,7 +399,7 @@ class _RealmChatRoomsProviderElement
 }

 String _$realmMemberListNotifierHash() =>
-    r'ab38c550c43cbf93d4c3e92e6658d76f40252c1f';
+    r'db1fd8a6741dfb3d5bb921d5d965f0cfdc0e7bcc';

 abstract class _$RealmMemberListNotifier
    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnRealmMember>> {
--- a/lib/screens/realm/realm_form.dart
+++ b/lib/screens/realm/realm_form.dart
@@ -122,7 +122,7 @@ class EditRealmScreen extends HookConsumerWidget {
      try {
        final client = ref.watch(apiClientProvider);
        final resp = await client.request(
-          '/pass${slug == null ? '/realms' : '/realms/$slug'}',
+          '/sphere${slug == null ? '/realms' : '/realms/$slug'}',
          data: {
            'slug': slugController.text,
            'name': nameController.text,
--- a/lib/screens/realm/realms.dart
+++ b/lib/screens/realm/realms.dart
@@ -1,6 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -10,7 +9,6 @@ import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/sheet.dart';
-import 'package:island/widgets/navigation/fab_menu.dart';
 import 'package:island/widgets/response.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -23,7 +21,7 @@ part 'realms.g.dart';
@riverpod
 Future<List<SnRealm>> realmsJoined(Ref ref) async {
  final client = ref.watch(apiClientProvider);
-  final resp = await client.get('/pass/realms');
+  final resp = await client.get('/sphere/realms');
  return resp.data.map((e) => SnRealm.fromJson(e)).cast<SnRealm>().toList();
 }

@@ -31,7 +29,7 @@ Future<List<SnRealm>> realmsJoined(Ref ref) async {
 Future<SnRealm?> realm(Ref ref, String? identifier) async {
  if (identifier == null) return null;
  final client = ref.watch(apiClientProvider);
-  final resp = await client.get('/pass/realms/$identifier');
+  final resp = await client.get('/sphere/realms/$identifier');
  return SnRealm.fromJson(resp.data);
 }

@@ -43,20 +41,6 @@ class RealmListScreen extends HookConsumerWidget {
    final realms = ref.watch(realmsJoinedProvider);
    final realmInvites = ref.watch(realmInvitesProvider);

-    useEffect(() {
-      // Set FAB type to realm
-      final fabMenuNotifier = ref.read(fabMenuTypeProvider.notifier);
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        fabMenuNotifier.state = FabMenuType.realm;
-      });
-      return () {
-        // Clean up: reset FAB type to main
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          fabMenuNotifier.state = FabMenuType.main;
-        });
-      };
-    }, []);
-
    return AppScaffold(
      isNoBackground: false,
      appBar: AppBar(
@@ -94,6 +78,17 @@ class RealmListScreen extends HookConsumerWidget {
          const Gap(8),
        ],
      ),
+      floatingActionButton: FloatingActionButton(
+        heroTag: const Key("realms-page-fab"),
+        child: const Icon(Symbols.add),
+        onPressed: () {
+          context.pushNamed('realmNew').then((value) {
+            if (value != null) {
+              ref.invalidate(realmsJoinedProvider);
+            }
+          });
+        },
+      ),
      body: ExtendedRefreshIndicator(
        child: realms.when(
          data:
@@ -133,7 +128,7 @@ class RealmListScreen extends HookConsumerWidget {
@riverpod
 Future<List<SnRealmMember>> realmInvites(Ref ref) async {
  final client = ref.watch(apiClientProvider);
-  final resp = await client.get('/pass/realms/invites');
+  final resp = await client.get('/sphere/realms/invites');
  return resp.data
      .map((e) => SnRealmMember.fromJson(e))
      .cast<SnRealmMember>()
@@ -150,7 +145,9 @@ class _RealmInviteSheet extends HookConsumerWidget {
    Future<void> acceptInvite(SnRealmMember invite) async {
      try {
        final client = ref.read(apiClientProvider);
-        await client.post('/pass/realms/invites/${invite.realm!.slug}/accept');
+        await client.post(
+          '/sphere/realms/invites/${invite.realm!.slug}/accept',
+        );
        ref.invalidate(realmInvitesProvider);
        ref.invalidate(realmsJoinedProvider);
      } catch (err) {
@@ -161,7 +158,9 @@ class _RealmInviteSheet extends HookConsumerWidget {
    Future<void> declineInvite(SnRealmMember invite) async {
      try {
        final client = ref.read(apiClientProvider);
-        await client.post('/pass/realms/invites/${invite.realm!.slug}/decline');
+        await client.post(
+          '/sphere/realms/invites/${invite.realm!.slug}/decline',
+        );
        ref.invalidate(realmInvitesProvider);
      } catch (err) {
        showErrorAlert(err);
--- a/lib/screens/realm/realms.g.dart
+++ b/lib/screens/realm/realms.g.dart
@@ -6,7 +6,7 @@ part of 'realms.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$realmsJoinedHash() => r'b15029acd38f03bbbb8708adb78f25ac357a0421';
+String _$realmsJoinedHash() => r'e8083f02ffae450bba2470c31757675b4df32cd0';

 /// See also [realmsJoined].
@ProviderFor(realmsJoined)
@@ -22,7 +22,7 @@ final realmsJoinedProvider = AutoDisposeFutureProvider<List<SnRealm>>.internal(
@Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 typedef RealmsJoinedRef = AutoDisposeFutureProviderRef<List<SnRealm>>;
-String _$realmHash() => r'71a126ab2810566646e1629290c1ce9ffa0839e3';
+String _$realmHash() => r'4650b17608a9ee14170ef20295eb14d295e909c9';

 /// Copied from Dart SDK
 class _SystemHash {
@@ -156,7 +156,7 @@ class _RealmProviderElement extends AutoDisposeFutureProviderElement<SnRealm?>
  String? get identifier => (origin as RealmProvider).identifier;
 }

-String _$realmInvitesHash() => r'92cce0978c7ca8813e27ae42fc6f3a93a09a8962';
+String _$realmInvitesHash() => r'ed73443c6423b92ed72982be2a93b7dcc7ce3945';

 /// See also [realmInvites].
@ProviderFor(realmInvites)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
LittleSheep	0622498f4e	✨ Fake call audio level	2025-10-19 19:34:22 +08:00
LittleSheep	844efcda1a	👔 Disable the video by default	2025-10-19 19:23:17 +08:00
LittleSheep	98e39cce6a	🐛 Fix the duplicate local participant	2025-10-19 19:23:01 +08:00
LittleSheep	0c459bf7e3	♻️ Proper singaling	2025-10-19 19:16:40 +08:00
LittleSheep	a2576abee0	♻️ Proper local participant	2025-10-19 19:06:14 +08:00
LittleSheep	f4b28c3fa2	✨ WebRTC signaling heartbeat	2025-10-19 18:58:54 +08:00
LittleSheep	43d767bc03	🐛 Trying to fix something	2025-10-19 18:31:05 +08:00
LittleSheep	0910be88ef	🐛 Bug fixes of webrtc	2025-10-19 18:22:03 +08:00
LittleSheep	e96b1fd9d4	✨ Impl todos for the webrtc	2025-10-19 17:59:25 +08:00
LittleSheep	3f83bbc1d8	♻️ Trying out the new built-in webrtc	2025-10-19 17:30:06 +08:00