✨ Transfer

♻️ Split up the forms and list screens
💄 Use dropdown forms fields instead of selection

CODE_OF_CONDUCT.md

@@ -14,13 +14,13 @@ The backend of the Solar Network is written in Go and is a microservices app. Th
 
 ## Commit Messages
 
-We're using the gitmoji to clarify the reason and changes of the commit. To learn more about gitmoji, visit https://gitmoji.dev
+We're using the gitmoji to clarify the reason and changes of the commit. To learn more about gitmoji, visit <https://gitmoji.dev>
 
 All the commit message should follow `:[gitmoji]: <commit message>` syntax
 
 ## Translations & Localization
 
-We're not accepting translation and localization improvements, or fixes on the GitHub or Solsynth Git Repository. If you want to contribute to those, please head to our Crowdin project: https://crowdin.com/project/solian
+We're not accepting translation and localization improvements, or fixes on the GitHub or Solsynth Git Repository. If you want to contribute to those, please head to our Crowdin project: <https://crowdin.com/project/solian>
 
 ## New Features
 
@@ -28,9 +28,14 @@ To contribute new features, please create an issue or mention the feature you wa
 
 ## Bug Reports / Ask for help
 
-Read the error message, check for the update (including pre-releases), and wiki before creating an issue. At the same time, be respectful and don't argue with our developers and contributors in the development chat or GitHub issue. Otherwise your issue may got deleted and your Solar Network Account may got a strike. 
+Read the error message, check for the update (including pre-releases), and wiki before creating an issue. At the same time, be respectful and don't argue with our developers and contributors in the development chat or GitHub issue. Otherwise your issue may got deleted and your Solar Network Account may got a strike.
+
+## Styles of Code
+
+Before you create a Pull Request, make sure your code has pass the `flutter analyze` check, if there is any notes, fix as much as possible, if there is no way to fix, do ignore.
+
+When the code contains comments, use English. We do not any other language of comments existing in the codebase. It might confuse future contributors, cause the code hard to understand and maintaiance.
 
 -----------
 
 We appreciate every single commit you contributed. Let's work together and create a better Solar Network!
-

android/app/src/main/AndroidManifest.xml

@@ -51,6 +51,12 @@
                 <data android:scheme="http" android:host="solian.app" />
                 <data android:scheme="https" />
             </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="solian" />
+            </intent-filter>
 
             <!-- Share Intent Filters -->
             <intent-filter>

assets/i18n/zh-TW.json

@@ -116,7 +116,7 @@
     },
     "postHasAttachments": {
         "one": "{} 個附件",
-        "other": "{}個附件"
+        "other": "{} 個附件"
     },
     "edited": "已編輯",
     "addVideo": "添加視頻",
@@ -303,8 +303,7 @@
     "notifications": "通知",
     "posts": "帖子",
     "settingsBackgroundImage": "背景圖片",
-  "settingsBackgroundImageEnable": "顯示背景圖片",
+    "settingsBackgroundImageClear": "清除背景圖片",
-  "settingsBackgroundImageClear": "清除背景圖片",
     "settingsBackgroundGenerateColor": "從背景圖像生成主題色",
     "messageNone": "沒有內容可顯示",
     "unreadMessages": {
@@ -315,8 +314,6 @@
     "settingsRealmCompactView": "緊湊領域視圖",
     "settingsMixedFeed": "混合動態",
     "settingsAutoTranslate": "自動翻譯",
-    "settingsDataSavingMode": "低數據模式",
-    "dataSavingHint": "低數據模式",
     "settingsHideBottomNav": "隱藏底部導航",
     "settingsSoundEffects": "音效",
     "settingsAprilFoolFeatures": "愚人節功能",
@@ -671,7 +668,6 @@
     "publisherFeatureDevelopDescription": "為你的開發者解鎖包括應用套件，API 及更多開發功能。",
     "publisherFeatureDevelopHint": "目前該功能還在開發中，你需要邀請才可解鎖。",
     "learnMore": "瞭解更多",
-    "discoverWebArticles": "來自站外的文章",
     "webArticlesStand": "文章亭",
     "about": "關於",
     "somethingWentWrong": "發生了一些錯誤",
@@ -694,8 +690,6 @@
     "sharePostPhoto": "通過圖片分享帖子",
     "wouldYouLikeToNavigateToChat": "你想要前往聊天頁面嗎？",
     "abuseReports": "舉報",
-    "discoverRealms": "發現領域",
-    "discoverPublishers": "發現發佈者",
     "membershipCancel": "取消會員訂閱",
     "membershipCancelConfirm": "你確定要取消會員訂閱嗎？",
     "membershipCancelHint": "你確定要取消會員訂閱嗎？你將不會再次被扣費。你的會員資格將在當前計費週期結束前保持有效。並且你將無法重新訂閱，直到當前訂閱結束。",
@@ -815,6 +809,159 @@
         "one": "+{} 個文件被摺疊",
         "other": "+{} 個文件被摺疊"
     },
+    "pollQuestions": "問題",
+    "pollAnswerSubmitted": "投票答案已提交。",
+    "modifyAnswers": "修改答案",
+    "back": "返回",
+    "submit": "提交",
+    "pollOptionDefaultLabel": "選項1",
+    "pollUpdated": "投票已更新。",
+    "pollCreated": "投票已創建。",
+    "pollCreate": "創建投票",
+    "pollEdit": "編輯投票",
+    "pollPreviewJsonDebug": "調試預覽",
+    "pollTitleRequired": "標題不可為空",
+    "pollEndDateOptional": "結束日期和時間 (可選)",
+    "notSet": "未設定",
+    "pick": "選擇",
+    "clear": "清除",
+    "questions": "問題",
+    "pollAddQuestion": "添加問題",
+    "pollQuestionTypeSingleChoice": "單選框",
+    "pollQuestionTypeMultipleChoice": "多選框",
+    "pollQuestionTypeFreeText": "自由文本",
+    "pollQuestionTypeYesNo": "是 / 不是",
+    "pollQuestionTypeRating": "評分",
+    "pollNoQuestionsYet": "尚未有問題",
+    "pollNoQuestionsHint": "使用「添加問題」開始建立您的投票。",
+    "pollDebugPreview": "調試預覽",
+    "pollUntitledQuestion": "無標題問題",
+    "moveUp": "往上移動",
+    "moveDown": "往下移動",
+    "required": "必需的",
+    "pollQuestionTitle": "問題標題",
+    "pollQuestionTitleRequired": "問題標題是必需的",
+    "pollQuestionDescriptionOptional": "問題描述（選填）",
+    "options": "選項",
+    "pollAddOption": "添加選項",
+    "pollOptionLabel": "選項標籤",
+    "pollLongTextAnswerPreview": "長文本答案 (預覽)",
+    "pollShortTextAnswerPreview": "短文本答案 (預覽)",
+    "award": "讚賞",
+    "awardPost": "讚賞帖子",
+    "awardMessage": "消息",
+    "awardMessageHint": "輸入您的讚賞消息...",
+    "awardAttitude": "態度",
+    "awardAttitudePositive": "積極",
+    "awardAttitudeNegative": "消极",
+    "awardAmount": "金額",
+    "awardAmountHint": "輸入金額……",
+    "awardAmountRequired": "「金額」為必填字段",
+    "awardAmountInvalid": "請輸入有效金額",
+    "awardMessageTooLong": "消息太長（最多4096個字符）",
+    "awardSuccess": "獎勵已成功發送！",
+    "awardSubmit": "讚賞",
+    "awardPostPreview": "帖子預覽",
+    "awardNoContent": "暫無內容",
+    "awardByPublisher": "由 {} 發表",
+    "awardBenefits": "讚賞福利",
+    "awardBenefitsDescription": "為該帖子授予獎勵可以提升其價值和曝光度。價值更高的帖子更有可能在社區中被推薦和突出顯示。",
+    "checkInResultLevel5": "生日快樂 🥳",
+    "region": "區域",
+    "accountRegionHint": "這個區域將用於內容傳遞和本地化。",
+    "settingsCustomFontsHelper": "使用逗號分隔。",
+    "settingsBackgroundImageEnable": "顯示背景圖片",
+    "settingsDataSavingMode": "低數據模式",
+    "dataSavingHint": "低數據模式",
+    "postTypePost": "帖子",
+    "searchDrafts": "搜尋草稿……",
+    "noSearchResults": "無搜尋結果",
+    "contactMethodMakePublic": "設為公開",
+    "contactMethodMakePrivate": "設定為僅自己可見",
+    "contactMethodPublic": "公開",
+    "contactMethodPrivate": "私密",
+    "discoverRealms": "發現領域",
+    "discoverPublishers": "發現發佈者",
+    "discoverShuffledPost": "隨機帖子",
+    "projects": "項目",
+    "noProjects": "未找到項目。",
+    "deleteProject": "刪除項目",
+    "deleteProjectHint": "確定要刪除此項目嗎？此操作無法撤銷。",
+    "createProject": "新建專案",
+    "editProject": "編輯項目",
+    "projectDetails": "專案描述",
+    "createBot": "創建機器人",
+    "bots": "機器人",
+    "noBots": "還沒有機器人。",
+    "deleteBotHint": "您確定要刪除這個機器人嗎？此操作無法撤銷。",
+    "deleteBot": "刪除機器人",
+    "discoverWebArticles": "來自站外的文章",
+    "messageJumpNotLoaded": "引用的訊息未加載，無法跳轉到該訊息。",
+    "postUnlinkRealm": "未連結到領域",
+    "postSlug": "別名",
+    "postSlugHint": "這個別名可以用於在網頁通過 URL 瀏覽到你的帖子，它應該在同一發布者中是唯一。",
+    "attachmentOnDevice": "離線",
+    "attachmentOnCloud": "在線",
+    "attachments": "附件",
+    "publisherCollabInvitation": "協作邀請",
+    "publisherCollabInvitationCount": {
+        "zero": "無邀請",
+        "one": "{} 個可用邀請",
+        "other": "{} 個可用邀請"
+    },
+    "failedToLoadUserInfo": "無法加載用戶資訊",
+    "failedToLoadUserInfoNetwork": "看起來是網絡問題，您可以點擊下面的按鈕再試一次。",
+    "failedToLoadUserInfoUnauthorized": "看起來您的會話已經登出或不再可用，如果您想的話，您仍然可以嘗試再次獲取用戶資訊。",
+    "okay": "好的",
+    "postDetail": "帖子詳情",
+    "postCount": {
+        "zero": "沒有帖子",
+        "one": "{} 帖子",
+        "other": "{} 帖子"
+    },
+    "mimeType": "類型",
+    "fileSize": "文件大小",
+    "fileHash": "文件哈希",
+    "exifData": "EXIF 數據",
+    "postShuffle": "隨機帖子",
+    "leveling": "等級",
+    "levelingHistory": "經驗記錄",
+    "stellarProgram": "恆星計畫",
+    "socialCredits": "社會信用點",
+    "credits": "信用",
+    "creditsStatus": "積分狀態",
+    "socialCreditsDescription": "社會信用是 Solar Network 評價用戶的一種方式。它基於用戶的行為和互動來計算。以 100 分為基準，分數越高表示用戶在社區中的信譽越好。分數會隨著時間的推移而變化，反映用戶的最新行為。信用等級高的用戶可以享受到更多的福利，反之的用戶部分功能可能受到限制。",
+    "socialCreditsLevelPoor": "糟糕",
+    "socialCreditsLevelNormal": "正常",
+    "socialCreditsLevelGood": "良好",
+    "socialCreditsLevelExcellent": "優秀",
+    "orderByPopularity": "按熱度排序",
+    "orderByReleaseDate": "按發佈日期排序",
+    "editBot": "編輯機器人",
+    "botAutomatedBy": "由 {} 自動化",
+    "botDetails": "機器人描述",
+    "overview": "概述",
+    "keys": "密鑰",
+    "botNotFound": "機器人未找到。",
+    "newBotKey": "新建密鑰",
+    "newBotKeyHint": "輸入新密鑰的名稱，密鑰只會顯示一次。",
+    "revokeBotKey": "撤銷密鑰",
+    "revokeBotKeyHint": "你確定要撤銷這個密鑰？這個操作無法撤回，所有使用該密鑰的應用程式會停止工作。",
+    "noBotKeys": "機器人未找到。",
+    "revoke": "撤銷",
+    "keyName": "密鑰名稱",
+    "newKeyGenerated": "新密鑰已生成",
+    "copyKeyHint": "請安全地保存該密鑰，你不會再次看到它。",
+    "rotateKey": "旋轉密鑰",
+    "rotateBotKey": "旋轉密鑰",
+    "rotateBotKeyHint": "你確認要旋轉這個密鑰？久的密鑰會立即失效，該操作無法撤銷。",
+    "webFeedArticleCount": {
+        "zero": "無文章",
+        "one": "{} 文章",
+        "other": "{} 文章"
+    },
+    "webFeedSubscribed": "你已經訂閱了這個來源",
+    "webFeedUnsubscribed": "你已經取消訂閱這個來源",
     "appDetails": "應用程式詳情",
     "secrets": "密鑰",
     "appNotFound": "找不到應用程式。",
@@ -826,5 +973,107 @@
     "newSecretGenerated": "已產生新密鑰",
     "copySecretHint": "請複製此密鑰並將其存放在安全的地方。您將無法再次看到它。",
     "expiresIn": "過期時間（秒）",
-    "isOidc": "OIDC 相容"
+    "isOidc": "OIDC 相容",
-}
+    "pinPost": "置頂帖子",
+    "unpinPost": "取消置頂",
+    "pinnedPost": "已置顶",
+    "publisherPage": "發布者頁面",
+    "realmPage": "領域頁面",
+    "replyPage": "回覆頁面",
+    "pinPostPublisherHint": "將這篇文章置顶到您的發佈者頁面",
+    "pinPostRealmHint": "將這篇文章置顶到領域頁面",
+    "pinPostRealmDisabledHint": "這個帖子不屬於任何領域",
+    "pinPostReplyHint": "將這篇文章置顶到回覆頁面",
+    "pinPostReplyDisabledHint": "這篇帖子不是回覆",
+    "pin": "置顶",
+    "unpinPostHint": "你確定要取消置顶這篇帖子嗎？",
+    "all": "所有",
+    "statusPresent": "至今",
+    "accountAutomated": "機器人",
+    "chatBreakClearButton": "清除",
+    "chatBreak5m": "5 分鐘",
+    "chatBreak10m": "10 分鐘",
+    "chatBreak15m": "15 分鐘",
+    "chatBreak30m": "30 分鐘",
+    "chatBreakCustomMinutes": "自訂（分鐘）",
+    "errorGeneric": "錯誤：{}",
+    "searchMessages": "搜尋消息",
+    "messagesCount": "{} 消息",
+    "dotSeparator": ".",
+    "roleValidationHint": "成員角色必須設置在0到100之間",
+    "searchMessagesHint": "搜尋消息…",
+    "searchLinks": "連結",
+    "searchAttachments": "附件",
+    "noMessagesFound": "未找到消息",
+    "openInBrowser": "在瀏覽器打開",
+    "highlightPost": "精選帖子",
+    "filters": "過濾器",
+    "apply": "應用",
+    "pubName": "題目名稱",
+    "realm": "領域",
+    "shuffle": "隨機",
+    "pinned": "已置顶",
+    "noResultsFound": "未找到結果",
+    "toggleFilters": "切換篩檢器",
+    "notableDayNext": "距離 {} 還有",
+    "expandPoll": "展開投票",
+    "collapsePoll": "摺叠投票",
+    "embedView": "嵌入視圖",
+    "embedUri": "嵌入URL",
+    "aspectRatio": "縱橫比",
+    "renderer": "渲染器",
+    "addEmbed": "添加嵌入",
+    "editEmbed": "編輯嵌入",
+    "deleteEmbed": "刪除嵌入",
+    "deleteEmbedConfirm": "您確定要刪除這個嵌入嗎？",
+    "currentEmbed": "當前嵌入",
+    "noEmbed": "尚未嵌入",
+    "save": "保存",
+    "webView": "網頁視圖",
+    "settingsDefaultPool": "預設檔案池",
+    "settingsDefaultPoolHelper": "選擇文件上傳的默認儲存池",
+    "uploadFile": "上傳檔案",
+    "authDeviceChallenges": "設備活動",
+    "authDeviceHint": "向左滑動以編輯標籤，向右滑動以登出設備。",
+    "settingsMessageDisplayStyle": "訊息顯示樣式",
+    "auto": "自動",
+    "manual": "手動",
+    "iframeCode": "Iframe 代碼",
+    "iframeCodeHint": "<iframe src=\"...\" width=\"...\" height=\"...\">",
+    "parseIframe": "解析 Iframe",
+    "messageActions": "消息選項",
+    "viewEmbedLoadHint": "點擊以載入",
+    "levelingStage1": "新手",
+    "levelingStage2": "學徒",
+    "levelingStage3": "學徒工",
+    "levelingStage4": "熟練",
+    "levelingStage5": "專家",
+    "levelingStage6": "大師",
+    "levelingStage7": "宗師",
+    "levelingStage8": "傳說",
+    "levelingStage9": "神話",
+    "levelingStage10": "不朽",
+    "levelingStage11": "神聖",
+    "levelingStage12": "超凡",
+    "uploadAttachment": "上傳附件",
+    "attachmentPreview": "附件預覽",
+    "selectPool": "選擇檔案池",
+    "choosePool": "選擇一個檔案池",
+    "errorLoadingPools": "加載池時出錯",
+    "quotaCostInfo": "這次上傳將消耗 {} 配額點",
+    "uploadConstraints": "上傳限制",
+    "fileSizeExceeded": "檔案大小超過了 {} 的最大限制",
+    "fileTypeNotAccepted": "該文件類型不被此池接受",
+    "files": "附件",
+    "confirmDeleteFile": "你確定要刪除這個文件嗎？",
+    "deleteFile": "刪除文件",
+    "failedToDeleteFile": "刪除文件失敗",
+    "drive": "雲盤",
+    "allPools": "全部的池",
+    "includeRecycled": "包含已回收文件",
+    "confirmDeleteRecycledFiles": "您確定要刪除所有回收的檔案嗎？",
+    "deleteRecycledFiles": "刪除已回收檔案",
+    "recycledFilesDeleted": "已回收檔案刪除成功",
+    "failedToDeleteRecycledFiles": "已回收檔案刪除失敗",
+    "upload": "上傳"
+}

build.yaml

@@ -5,3 +5,7 @@ targets:
         options:
           explicit_to_json: true
           field_rename: snake
+      drift_dev:
+        options:
+          databases:
+            app_database: lib/database/drift_db.dart

ios/Podfile.lock

@@ -1,5 +1,7 @@
 PODS:
   - Alamofire (5.10.2)
+  - app_links (6.4.1):
+    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
   - croppy (0.0.1):
@@ -50,18 +52,18 @@ PODS:
   - Firebase/Messaging (12.2.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 12.2.0)
-  - firebase_analytics (12.0.1):
+  - firebase_analytics (12.0.2):
     - firebase_core
     - FirebaseAnalytics (= 12.2.0)
     - Flutter
-  - firebase_core (4.1.0):
+  - firebase_core (4.1.1):
     - Firebase/CoreOnly (= 12.2.0)
     - Flutter
-  - firebase_crashlytics (5.0.1):
+  - firebase_crashlytics (5.0.2):
     - Firebase/Crashlytics (= 12.2.0)
     - firebase_core
     - Flutter
-  - firebase_messaging (16.0.1):
+  - firebase_messaging (16.0.2):
     - Firebase/Messaging (= 12.2.0)
     - firebase_core
     - Flutter
@@ -149,9 +151,9 @@ PODS:
   - flutter_udid (0.0.1):
     - Flutter
     - SAMKeychain
-  - flutter_webrtc (1.1.0):
+  - flutter_webrtc (1.2.0):
     - Flutter
-    - WebRTC-SDK (= 137.7151.03)
+    - WebRTC-SDK (= 137.7151.04)
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
@@ -219,7 +221,7 @@ PODS:
   - livekit_client (2.5.0):
     - Flutter
     - flutter_webrtc
-    - WebRTC-SDK (= 137.7151.03)
+    - WebRTC-SDK (= 137.7151.04)
   - local_auth_darwin (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -293,16 +295,19 @@ PODS:
   - super_native_extensions (0.0.1):
     - Flutter
   - SwiftyGif (5.4.5)
+  - syncfusion_flutter_pdfviewer (0.0.1):
+    - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
   - volume_controller (0.0.1):
     - Flutter
   - wakelock_plus (0.0.1):
     - Flutter
-  - WebRTC-SDK (137.7151.03)
+  - WebRTC-SDK (137.7151.04)
 
 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`)
@@ -344,6 +349,7 @@ DEPENDENCIES:
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
   - super_native_extensions (from `.symlinks/plugins/super_native_extensions/ios`)
+  - syncfusion_flutter_pdfviewer (from `.symlinks/plugins/syncfusion_flutter_pdfviewer/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
@@ -379,6 +385,8 @@ SPEC REPOS:
     - WebRTC-SDK
 
 EXTERNAL SOURCES:
+  app_links:
+    :path: ".symlinks/plugins/app_links/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   croppy:
@@ -459,6 +467,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
   super_native_extensions:
     :path: ".symlinks/plugins/super_native_extensions/ios"
+  syncfusion_flutter_pdfviewer:
+    :path: ".symlinks/plugins/syncfusion_flutter_pdfviewer/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   volume_controller:
@@ -468,6 +478,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
+  app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   croppy: 979e8ddc254f4642bffe7d52dc7193354b27ba30
   device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
@@ -476,10 +487,10 @@ SPEC CHECKSUMS:
   file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
   file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
   Firebase: 26f6f8d460603af3df970ad505b16b15f5e2e9a1
-  firebase_analytics: 111ff65791a430356bd6c7e4d7339537fc6a15ae
+  firebase_analytics: 8c78ce6224e0623152379d6cc7ef3d9098477b7e
-  firebase_core: 3ff52146406557dddd01d570e807e203ec7e1302
+  firebase_core: dfc4bd142bee4bc53a5d482397ca322c2dd3165d
-  firebase_crashlytics: 3637078b718a52dc9fb4d64e37c969e86b87ff6f
+  firebase_crashlytics: e55dcf895eed0dd87c447dd5aff8db7f1bb8bbdb
-  firebase_messaging: 3dcc998dd98e1e54af75d0cccae8606eba43553c
+  firebase_messaging: 38c66c1184695b0c87abe51d40fc590718abed1a
   FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8
   FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd
   FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5
@@ -499,7 +510,7 @@ SPEC CHECKSUMS:
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
   flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
   flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9
-  flutter_webrtc: b0b2e04411747142962164a1cfa43a1af9a0afac
+  flutter_webrtc: c3e21fc0dcd9d8eb246ae4d5256fcbeb2f5ecd22
   gal: baecd024ebfd13c441269ca7404792a7152fde89
   GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe
   GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af
@@ -508,8 +519,8 @@ SPEC CHECKSUMS:
   image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
   irondash_engine_context: 8e58ca8e0212ee9d1c7dc6a42121849986c88486
   Kingfisher: ff0d31a1f07bdff6a1ebb3ba08b8e6e567b6500c
-  livekit_client: f810c81bbbc229a84f60b09e66603ac4e93f7599
+  livekit_client: a6f5fa86ac28ccd7ded53626a5379961db311ab4
-  local_auth_darwin: d2e8c53ef0c4f43c646462e3415432c4dab3ae19
+  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
   media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
   media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
@@ -533,10 +544,11 @@ SPEC CHECKSUMS:
   sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
   super_native_extensions: b763c02dc3a8fd078389f410bf15149179020cb4
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
+  syncfusion_flutter_pdfviewer: 90dc48305d2e33d4aa20681d1e98ddeda891bc14
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
   volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
   wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
-  WebRTC-SDK: 69d4e56b0b4b27d788e87bab9b9a1326ed05b1e3
+  WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e
 
 PODFILE CHECKSUM: c818292390b02fa379036ea099713a332bd7193f
 

ios/Runner.xcodeproj/project.pbxproj

@@ -566,7 +566,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
 		4815E0A19398E51078F4160D /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -883,6 +883,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1096,6 +1097,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1137,6 +1139,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1177,6 +1180,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1434,6 +1438,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1462,6 +1467,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/Runner/AppDelegate.swift

@@ -12,7 +12,7 @@ import UIKit
         UNUserNotificationCenter.current().delegate = notifyDelegate
         
         let replyableMessageCategory = UNNotificationCategory(
-            identifier: "REPLYABLE_MESSAGE",
+            identifier: "CHAT_MESSAGE",
             actions: [
                 UNTextInputNotificationAction(
                     identifier: "reply_action",

ios/Runner/Info.plist

@@ -36,6 +36,14 @@
 				<string>ShareMedia-$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>solian</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>

ios/SolianNotificationService/NotificationService.swift

@@ -47,7 +47,6 @@ class NotificationService: UNNotificationServiceExtension {
     private func processNotification(request: UNNotificationRequest, content: UNMutableNotificationContent) throws {
         switch content.userInfo["type"] as? String {
         case "messages.new":
-            content.categoryIdentifier = "REPLYABLE_MESSAGE"
             try handleMessagingNotification(request: request, content: content)
         default:
             try handleDefaultNotification(content: content)
@@ -89,7 +88,12 @@ class NotificationService: UNNotificationServiceExtension {
             let intent = self.createMessageIntent(with: sender, meta: metaCopy, body: content.body)
             self.donateInteraction(for: intent)
             let updatedContent = try? request.content.updating(from: intent)
-            self.contentHandler?(updatedContent ?? content)
+            content.categoryIdentifier = "CHAT_MESSAGE"
+            if let updatedContent = updatedContent {
+                self.contentHandler?(updatedContent)
+            } else {
+                self.contentHandler?(content)
+            }
         })
     }
     

lib/database/drift_db.dart

@@ -12,7 +12,7 @@ class AppDatabase extends _$AppDatabase {
   AppDatabase(super.e);
 
   @override
-  int get schemaVersion => 6;
+  int get schemaVersion => 7;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -21,8 +21,8 @@ class AppDatabase extends _$AppDatabase {
     },
     onUpgrade: (Migrator m, int from, int to) async {
       if (from < 2) {
-        // Add isRead column with default value false
+        // Add isDeleted column with default value false
-        await m.addColumn(chatMessages, chatMessages.isRead);
+        await m.addColumn(chatMessages, chatMessages.isDeleted);
       }
       if (from < 4) {
         // Drop old draft tables if they exist
@@ -32,6 +32,29 @@ class AppDatabase extends _$AppDatabase {
         // Migrate from old schema to new schema with separate searchable fields
         await _migrateToVersion6(m);
       }
+      if (from < 7) {
+        // Add new columns from SnChatMessage, ignore if they already exist
+        final columnsToAdd = [
+          chatMessages.updatedAt,
+          chatMessages.deletedAt,
+          chatMessages.type,
+          chatMessages.meta,
+          chatMessages.membersMentioned,
+          chatMessages.editedAt,
+          chatMessages.attachments,
+          chatMessages.reactions,
+          chatMessages.repliedMessageId,
+          chatMessages.forwardedMessageId,
+        ];
+
+        for (final column in columnsToAdd) {
+          try {
+            await m.addColumn(chatMessages, column);
+          } catch (e) {
+            // Column already exists, skip
+          }
+        }
+      }
     },
   );
 
@@ -116,12 +139,6 @@ class AppDatabase extends _$AppDatabase {
     )).write(ChatMessagesCompanion(status: Value(status)));
   }
 
-  Future<int> markMessageAsRead(String id) {
-    return (update(chatMessages)..where(
-      (m) => m.id.equals(id),
-    )).write(ChatMessagesCompanion(isRead: const Value(true)));
-  }
-
   Future<int> deleteMessage(String id) {
     return (delete(chatMessages)..where((m) => m.id.equals(id))).go();
   }
@@ -134,15 +151,27 @@ class AppDatabase extends _$AppDatabase {
 
   Future<List<LocalChatMessage>> searchMessages(
     String roomId,
-    String query,
+    String query, {
-  ) async {
+    bool? withAttachments,
+  }) async {
     var selectStatement = select(chatMessages)
       ..where((m) => m.roomId.equals(roomId));
 
     if (query.isNotEmpty) {
+      final searchTerm = '%$query%';
       selectStatement =
-          selectStatement
+          selectStatement..where(
-            ..where((m) => m.content.like('%${query.toLowerCase()}%'));
+            (m) =>
+                m.content.like(searchTerm) |
+                m.meta.like(searchTerm) |
+                m.attachments.like(searchTerm) |
+                m.type.like(searchTerm),
+          );
+    }
+
+    if (withAttachments == true) {
+      selectStatement =
+          selectStatement..where((m) => m.attachments.equals('[]').not());
     }
 
     final messages =
@@ -154,16 +183,26 @@ class AppDatabase extends _$AppDatabase {
 
   // Convert between Drift and model objects
   ChatMessagesCompanion messageToCompanion(LocalChatMessage message) {
+    final remote = message.toRemoteMessage();
     return ChatMessagesCompanion(
       id: Value(message.id),
       roomId: Value(message.roomId),
       senderId: Value(message.senderId),
-      content: Value(message.toRemoteMessage().content),
+      content: Value(remote.content),
       nonce: Value(message.nonce),
       data: Value(jsonEncode(message.data)),
       createdAt: Value(message.createdAt),
       status: Value(message.status),
-      isRead: Value(message.isRead),
+      updatedAt: Value(remote.updatedAt),
+      deletedAt: Value(remote.deletedAt),
+      type: Value(remote.type),
+      meta: Value(remote.meta),
+      membersMentioned: Value(remote.membersMentioned),
+      editedAt: Value(remote.editedAt),
+      attachments: Value(remote.attachments.map((e) => e.toJson()).toList()),
+      reactions: Value(remote.reactions.map((e) => e.toJson()).toList()),
+      repliedMessageId: Value(remote.repliedMessageId),
+      forwardedMessageId: Value(remote.forwardedMessageId),
     );
   }
 
@@ -177,7 +216,18 @@ class AppDatabase extends _$AppDatabase {
       createdAt: dbMessage.createdAt,
       status: dbMessage.status,
       nonce: dbMessage.nonce,
-      isRead: dbMessage.isRead,
+      content: dbMessage.content,
+      isDeleted: dbMessage.isDeleted,
+      updatedAt: dbMessage.updatedAt,
+      deletedAt: dbMessage.deletedAt,
+      type: dbMessage.type,
+      meta: dbMessage.meta,
+      membersMentioned: dbMessage.membersMentioned,
+      editedAt: dbMessage.editedAt,
+      attachments: dbMessage.attachments,
+      reactions: dbMessage.reactions,
+      repliedMessageId: dbMessage.repliedMessageId,
+      forwardedMessageId: dbMessage.forwardedMessageId,
     );
   }
 

lib/database/message.dart

@@ -1,7 +1,41 @@
+import 'dart:convert';
+
 import 'package:drift/drift.dart';
 import 'package:island/models/chat.dart';
 import 'package:island/models/file.dart';
 
+class MapConverter extends TypeConverter<Map<String, dynamic>, String> {
+  const MapConverter();
+
+  @override
+  Map<String, dynamic> fromSql(String fromDb) => json.decode(fromDb);
+
+  @override
+  String toSql(Map<String, dynamic> value) => json.encode(value);
+}
+
+class ListStringConverter extends TypeConverter<List<String>, String> {
+  const ListStringConverter();
+
+  @override
+  List<String> fromSql(String fromDb) => List<String>.from(json.decode(fromDb));
+
+  @override
+  String toSql(List<String> value) => json.encode(value);
+}
+
+class ListMapConverter
+    extends TypeConverter<List<Map<String, dynamic>>, String> {
+  const ListMapConverter();
+
+  @override
+  List<Map<String, dynamic>> fromSql(String fromDb) =>
+      List<Map<String, dynamic>>.from(json.decode(fromDb));
+
+  @override
+  String toSql(List<Map<String, dynamic>> value) => json.encode(value);
+}
+
 class ChatMessages extends Table {
   TextColumn get id => text()();
   TextColumn get roomId => text()();
@@ -11,7 +45,24 @@ class ChatMessages extends Table {
   TextColumn get data => text()();
   DateTimeColumn get createdAt => dateTime()();
   IntColumn get status => intEnum<MessageStatus>()();
-  BoolColumn get isRead => boolean().withDefault(const Constant(false))();
+  BoolColumn get isDeleted =>
+      boolean().nullable().withDefault(const Constant(false))();
+  DateTimeColumn get updatedAt => dateTime().nullable()();
+  DateTimeColumn get deletedAt => dateTime().nullable()();
+  TextColumn get type => text().withDefault(const Constant('text'))();
+  TextColumn get meta =>
+      text().map(const MapConverter()).withDefault(const Constant('{}'))();
+  TextColumn get membersMentioned =>
+      text()
+          .map(const ListStringConverter())
+          .withDefault(const Constant('[]'))();
+  DateTimeColumn get editedAt => dateTime().nullable()();
+  TextColumn get attachments =>
+      text().map(const ListMapConverter()).withDefault(const Constant('[]'))();
+  TextColumn get reactions =>
+      text().map(const ListMapConverter()).withDefault(const Constant('[]'))();
+  TextColumn get repliedMessageId => text().nullable()();
+  TextColumn get forwardedMessageId => text().nullable()();
 
   @override
   Set<Column> get primaryKey => {id};
@@ -25,8 +76,19 @@ class LocalChatMessage {
   final DateTime createdAt;
   MessageStatus status;
   final String? nonce;
+  final String? content;
+  final bool? isDeleted;
+  final DateTime? updatedAt;
+  final DateTime? deletedAt;
+  final String type;
+  final Map<String, dynamic> meta;
+  final List<String> membersMentioned;
+  final DateTime? editedAt;
+  final List<Map<String, dynamic>> attachments;
+  final List<Map<String, dynamic>> reactions;
+  final String? repliedMessageId;
+  final String? forwardedMessageId;
   List<UniversalFile>? localAttachments;
-  bool isRead;
 
   LocalChatMessage({
     required this.id,
@@ -36,8 +98,19 @@ class LocalChatMessage {
     required this.createdAt,
     required this.nonce,
     required this.status,
+    this.content,
+    this.isDeleted,
+    this.updatedAt,
+    this.deletedAt,
+    required this.type,
+    required this.meta,
+    required this.membersMentioned,
+    this.editedAt,
+    required this.attachments,
+    required this.reactions,
+    this.repliedMessageId,
+    this.forwardedMessageId,
     this.localAttachments,
-    this.isRead = false,
   });
 
   SnChatMessage toRemoteMessage() {
@@ -48,7 +121,6 @@ class LocalChatMessage {
     SnChatMessage message,
     MessageStatus status, {
     String? nonce,
-    bool isRead = false,
   }) {
     return LocalChatMessage(
       id: message.id,
@@ -58,7 +130,18 @@ class LocalChatMessage {
       createdAt: message.createdAt,
       status: status,
       nonce: nonce ?? message.nonce,
-      isRead: isRead,
+      content: message.content,
+      isDeleted: false,
+      updatedAt: message.updatedAt,
+      deletedAt: null,
+      type: message.type,
+      meta: message.meta,
+      membersMentioned: message.membersMentioned,
+      editedAt: message.editedAt,
+      attachments: message.attachments.map((e) => e.toJson()).toList(),
+      reactions: message.reactions.map((e) => e.toJson()).toList(),
+      repliedMessageId: message.repliedMessageId,
+      forwardedMessageId: message.forwardedMessageId,
     );
   }
 }

lib/main.dart

@@ -1,6 +1,4 @@
-import 'dart:developer';
 import 'dart:io';
-
 import 'package:croppy/croppy.dart';
 import 'package:easy_localization/easy_localization.dart' hide TextDirection;
 import 'package:firebase_core/firebase_core.dart';
@@ -8,16 +6,15 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker_android/image_picker_android.dart';
+import 'package:island/talker.dart';
 import 'package:island/firebase_options.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/theme.dart';
-import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/route.dart';
@@ -29,18 +26,21 @@ import 'package:relative_time/relative_time.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:talker_flutter/talker_flutter.dart';
+import 'package:talker_riverpod_logger/talker_riverpod_logger.dart';
 import 'package:url_launcher/url_launcher_string.dart';
+import 'package:window_manager/window_manager.dart';
 
 @pragma('vm:entry-point')
 Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
-  log('Handling a background message: ${message.messageId}');
+  talker.info('Handling a background message: ${message.messageId}');
 }
 
 void main() async {
   final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
   if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
-    log(
+    talker.info(
       "[SplashScreen] Keeping the flash screen to loading other resources...",
     );
     FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
@@ -73,48 +73,59 @@ void main() async {
       }
     }
 
-    log("[SplashScreen] Firebase is ready!");
+    talker.info("[SplashScreen] Firebase is ready!");
   } catch (err) {
     showErrorAlert(err);
   }
 
   try {
-    log("[SplashScreen] Loading timezone database...");
+    talker.info("[SplashScreen] Loading timezone database...");
     await initializeTzdb();
-    log("[SplashScreen] Time zone database was loaded!");
+    talker.info("[SplashScreen] Time zone database was loaded!");
   } catch (err) {
-    log("[SplashScreen] Failed to load timezone database... $err");
+    talker.error("[SplashScreen] Failed to load timezone database... $err");
   }
 
   final prefs = await SharedPreferences.getInstance();
 
   if (!kIsWeb && (Platform.isMacOS || Platform.isLinux || Platform.isWindows)) {
-    doWhenWindowReady(() {
+    await windowManager.ensureInitialized();
-      const defaultSize = Size(360, 640);
 
-      // Get saved window size from preferences
+    const defaultSize = Size(360, 640);
-      final savedSizeString = prefs.getString(kAppWindowSize);
-      Size initialSize = defaultSize;
 
-      if (savedSizeString != null) {
+    // Get saved window size from preferences
-        try {
+    final savedSizeString = prefs.getString(kAppWindowSize);
-          final parts = savedSizeString.split(',');
+    Size initialSize = defaultSize;
-          if (parts.length == 2) {
+
-            final width = double.parse(parts[0]);
+    if (savedSizeString != null) {
-            final height = double.parse(parts[1]);
+      try {
-            initialSize = Size(width, height);
+        final parts = savedSizeString.split(',');
-          }
+        if (parts.length == 2) {
-        } catch (e) {
+          final width = double.parse(parts[0]);
-          log("[SplashScreen] Failed to parse saved window size: $e");
+          final height = double.parse(parts[1]);
-          initialSize = defaultSize;
+          initialSize = Size(width, height);
         }
+      } catch (e) {
+        talker.error("[SplashScreen] Failed to parse saved window size: $e");
+        initialSize = defaultSize;
       }
+    }
 
-      appWindow.minSize = defaultSize;
+    WindowOptions windowOptions = WindowOptions(
-      appWindow.size = initialSize;
+      size: initialSize,
-      appWindow.alignment = Alignment.center;
+      center: true,
-      appWindow.show();
+      backgroundColor: Colors.transparent,
-      log(
+      skipTaskbar: false,
+      titleBarStyle: TitleBarStyle.hidden,
+      windowButtonVisibility: true,
+    );
+    windowManager.waitUntilReadyToShow(windowOptions, () async {
+      await windowManager.setMinimumSize(defaultSize);
+      await windowManager.show();
+      await windowManager.focus();
+      final opacity = prefs.getDouble(kAppWindowOpacity) ?? 1.0;
+      await windowManager.setOpacity(opacity);
+      talker.info(
         "[SplashScreen] Desktop window is ready with size: ${initialSize.width}x${initialSize.height}",
       );
     });
@@ -126,16 +137,27 @@ void main() async {
     if (imagePickerImplementation is ImagePickerAndroid) {
       imagePickerImplementation.useAndroidPhotoPicker = true;
     }
-    log("[SplashScreen] Android image picker is ready!");
+    talker.info("[SplashScreen] Android image picker is ready!");
   }
 
   if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
     FlutterNativeSplash.remove();
-    log("[SplashScreen] Now hiding the splash screen...");
+    talker.info("[SplashScreen] Now hiding the splash screen...");
   }
 
   runApp(
     ProviderScope(
+      observers: [
+        TalkerRiverpodObserver(
+          talker: talker,
+          settings: TalkerRiverpodLoggerSettings(
+            printProviderAdded: false,
+            printProviderDisposed: false,
+            printProviderUpdated: false,
+            printStateFullData: false,
+          ),
+        ),
+      ],
       overrides: [sharedPreferencesProvider.overrideWithValue(prefs)],
       child: Directionality(
         textDirection: TextDirection.ltr,
@@ -144,6 +166,10 @@ void main() async {
             Locale('en', 'US'),
             Locale('zh', 'CN'),
             Locale('zh', 'TW'),
+            Locale('zh', 'OG'),
+            Locale('ja', 'JP'),
+            Locale('ko', 'KR'),
+            Locale('es', 'ES'),
           ],
           path: 'assets/i18n',
           fallbackLocale: Locale('en', 'US'),
@@ -165,6 +191,21 @@ class IslandApp extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final theme = ref.watch(themeProvider);
+    final settings = ref.watch(appSettingsNotifierProvider);
+
+    // Convert string theme mode to ThemeMode enum
+    ThemeMode getThemeMode() {
+      final themeMode = settings.themeMode ?? 'system';
+      switch (themeMode) {
+        case 'light':
+          return ThemeMode.light;
+        case 'dark':
+          return ThemeMode.dark;
+        case 'system':
+        default:
+          return ThemeMode.system;
+      }
+    }
 
     void handleMessage(RemoteMessage notification) {
       if (notification.data['meta']?['action_uri'] != null) {
@@ -181,7 +222,7 @@ class IslandApp extends HookConsumerWidget {
     }
 
     useEffect(() {
-      if (!kIsWeb && Platform.isLinux) {
+      if (!kIsWeb && (Platform.isLinux || Platform.isWindows)) {
         return null;
       }
 
@@ -201,7 +242,9 @@ class IslandApp extends HookConsumerWidget {
       final onMessageSubscription = FirebaseMessaging.onMessage.listen((
         message,
       ) {
-        log('Foreground message received: ${message.messageId}');
+        talker.info(
+          '[Notification] foreground message received: ${message.messageId}',
+        );
         handleMessage(message);
       });
 
@@ -215,7 +258,7 @@ class IslandApp extends HookConsumerWidget {
       // Load userinfo
       final userNotifier = ref.read(userInfoProvider.notifier);
       ref.listen(websocketStateProvider, (_, state) {
-        log('[WebSocket] $state');
+        talker.info('[WebSocket] $state');
       });
       Future(() {
         userNotifier.fetchUser().then((_) {
@@ -235,9 +278,10 @@ class IslandApp extends HookConsumerWidget {
     final router = ref.watch(routerProvider);
 
     return MaterialApp.router(
+      color: Colors.transparent,
       theme: theme?.light,
       darkTheme: theme?.dark,
-      themeMode: ThemeMode.system,
+      themeMode: getThemeMode(),
       routerConfig: router,
       supportedLocales: context.supportedLocales,
       scrollBehavior: AppScrollBehavior(),
@@ -252,9 +296,15 @@ class IslandApp extends HookConsumerWidget {
           key: globalOverlay,
           initialEntries: [
             OverlayEntry(
-              builder:
+              builder: (_) {
-                  (_) =>
+                return TalkerWrapper(
-                      WindowScaffold(child: child ?? const SizedBox.shrink()),
+                  talker: talker,
+                  options: const TalkerWrapperOptions(enableErrorAlerts: true),
+                  child: WindowScaffold(
+                    child: child ?? const SizedBox.shrink(),
+                  ),
+                );
+              },
             ),
           ],
         );

lib/models/account.dart

@@ -98,6 +98,7 @@ sealed class SnAccountStatus with _$SnAccountStatus {
     required bool isNotDisturb,
     required bool isCustomized,
     @Default("") String label,
+    required Map<String, dynamic>? meta,
     required DateTime? clearedAt,
     required String accountId,
     required DateTime createdAt,

lib/models/account.freezed.dart

@@ -1053,7 +1053,7 @@ $SnVerificationMarkCopyWith<$Res>? get verification {
 /// @nodoc
 mixin _$SnAccountStatus {
 
- String get id; int get attitude; bool get isOnline; bool get isInvisible; bool get isNotDisturb; bool get isCustomized; String get label; DateTime? get clearedAt; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; int get attitude; bool get isOnline; bool get isInvisible; bool get isNotDisturb; bool get isCustomized; String get label; Map<String, dynamic>? get meta; DateTime? get clearedAt; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAccountStatus
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -1066,16 +1066,16 @@ $SnAccountStatusCopyWith<SnAccountStatus> get copyWith => _$SnAccountStatusCopyW
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAccountStatus&&(identical(other.id, id) || other.id == id)&&(identical(other.attitude, attitude) || other.attitude == attitude)&&(identical(other.isOnline, isOnline) || other.isOnline == isOnline)&&(identical(other.isInvisible, isInvisible) || other.isInvisible == isInvisible)&&(identical(other.isNotDisturb, isNotDisturb) || other.isNotDisturb == isNotDisturb)&&(identical(other.isCustomized, isCustomized) || other.isCustomized == isCustomized)&&(identical(other.label, label) || other.label == label)&&(identical(other.clearedAt, clearedAt) || other.clearedAt == clearedAt)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(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 SnAccountStatus&&(identical(other.id, id) || other.id == id)&&(identical(other.attitude, attitude) || other.attitude == attitude)&&(identical(other.isOnline, isOnline) || other.isOnline == isOnline)&&(identical(other.isInvisible, isInvisible) || other.isInvisible == isInvisible)&&(identical(other.isNotDisturb, isNotDisturb) || other.isNotDisturb == isNotDisturb)&&(identical(other.isCustomized, isCustomized) || other.isCustomized == isCustomized)&&(identical(other.label, label) || other.label == label)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.clearedAt, clearedAt) || other.clearedAt == clearedAt)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(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,attitude,isOnline,isInvisible,isNotDisturb,isCustomized,label,clearedAt,accountId,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,attitude,isOnline,isInvisible,isNotDisturb,isCustomized,label,const DeepCollectionEquality().hash(meta),clearedAt,accountId,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnAccountStatus(id: $id, attitude: $attitude, isOnline: $isOnline, isInvisible: $isInvisible, isNotDisturb: $isNotDisturb, isCustomized: $isCustomized, label: $label, clearedAt: $clearedAt, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnAccountStatus(id: $id, attitude: $attitude, isOnline: $isOnline, isInvisible: $isInvisible, isNotDisturb: $isNotDisturb, isCustomized: $isCustomized, label: $label, meta: $meta, clearedAt: $clearedAt, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -1086,7 +1086,7 @@ abstract mixin class $SnAccountStatusCopyWith<$Res>  {
   factory $SnAccountStatusCopyWith(SnAccountStatus value, $Res Function(SnAccountStatus) _then) = _$SnAccountStatusCopyWithImpl;
 @useResult
 $Res call({
- String id, int attitude, bool isOnline, bool isInvisible, bool isNotDisturb, bool isCustomized, String label, DateTime? clearedAt, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, int attitude, bool isOnline, bool isInvisible, bool isNotDisturb, bool isCustomized, String label, Map<String, dynamic>? meta, DateTime? clearedAt, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -1103,7 +1103,7 @@ class _$SnAccountStatusCopyWithImpl<$Res>
 
 /// Create a copy of SnAccountStatus
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? attitude = null,Object? isOnline = null,Object? isInvisible = null,Object? isNotDisturb = null,Object? isCustomized = null,Object? label = null,Object? clearedAt = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? attitude = null,Object? isOnline = null,Object? isInvisible = null,Object? isNotDisturb = null,Object? isCustomized = null,Object? label = null,Object? meta = freezed,Object? clearedAt = freezed,Object? accountId = 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,attitude: null == attitude ? _self.attitude : attitude // ignore: cast_nullable_to_non_nullable
@@ -1112,7 +1112,8 @@ as bool,isInvisible: null == isInvisible ? _self.isInvisible : isInvisible // ig
 as bool,isNotDisturb: null == isNotDisturb ? _self.isNotDisturb : isNotDisturb // ignore: cast_nullable_to_non_nullable
 as bool,isCustomized: null == isCustomized ? _self.isCustomized : isCustomized // ignore: cast_nullable_to_non_nullable
 as bool,label: null == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
-as String,clearedAt: freezed == clearedAt ? _self.clearedAt : clearedAt // ignore: cast_nullable_to_non_nullable
+as String,meta: freezed == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,clearedAt: freezed == clearedAt ? _self.clearedAt : clearedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,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
@@ -1199,10 +1200,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  int attitude,  bool isOnline,  bool isInvisible,  bool isNotDisturb,  bool isCustomized,  String label,  DateTime? clearedAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  int attitude,  bool isOnline,  bool isInvisible,  bool isNotDisturb,  bool isCustomized,  String label,  Map<String, dynamic>? meta,  DateTime? clearedAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAccountStatus() when $default != null:
-return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.isNotDisturb,_that.isCustomized,_that.label,_that.clearedAt,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.isNotDisturb,_that.isCustomized,_that.label,_that.meta,_that.clearedAt,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return orElse();
 
 }
@@ -1220,10 +1221,10 @@ return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.i
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  int attitude,  bool isOnline,  bool isInvisible,  bool isNotDisturb,  bool isCustomized,  String label,  DateTime? clearedAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  int attitude,  bool isOnline,  bool isInvisible,  bool isNotDisturb,  bool isCustomized,  String label,  Map<String, dynamic>? meta,  DateTime? clearedAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAccountStatus():
-return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.isNotDisturb,_that.isCustomized,_that.label,_that.clearedAt,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.isNotDisturb,_that.isCustomized,_that.label,_that.meta,_that.clearedAt,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -1237,10 +1238,10 @@ return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.i
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  int attitude,  bool isOnline,  bool isInvisible,  bool isNotDisturb,  bool isCustomized,  String label,  DateTime? clearedAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  int attitude,  bool isOnline,  bool isInvisible,  bool isNotDisturb,  bool isCustomized,  String label,  Map<String, dynamic>? meta,  DateTime? clearedAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAccountStatus() when $default != null:
-return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.isNotDisturb,_that.isCustomized,_that.label,_that.clearedAt,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.isNotDisturb,_that.isCustomized,_that.label,_that.meta,_that.clearedAt,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return null;
 
 }
@@ -1252,7 +1253,7 @@ return $default(_that.id,_that.attitude,_that.isOnline,_that.isInvisible,_that.i
 @JsonSerializable()
 
 class _SnAccountStatus implements SnAccountStatus {
-  const _SnAccountStatus({required this.id, required this.attitude, required this.isOnline, required this.isInvisible, required this.isNotDisturb, required this.isCustomized, this.label = "", required this.clearedAt, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  const _SnAccountStatus({required this.id, required this.attitude, required this.isOnline, required this.isInvisible, required this.isNotDisturb, required this.isCustomized, this.label = "", required final  Map<String, dynamic>? meta, required this.clearedAt, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt}): _meta = meta;
   factory _SnAccountStatus.fromJson(Map<String, dynamic> json) => _$SnAccountStatusFromJson(json);
 
 @override final  String id;
@@ -1262,6 +1263,15 @@ class _SnAccountStatus implements SnAccountStatus {
 @override final  bool isNotDisturb;
 @override final  bool isCustomized;
 @override@JsonKey() final  String label;
+ final  Map<String, dynamic>? _meta;
+@override Map<String, dynamic>? get meta {
+  final value = _meta;
+  if (value == null) return null;
+  if (_meta is EqualUnmodifiableMapView) return _meta;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
 @override final  DateTime? clearedAt;
 @override final  String accountId;
 @override final  DateTime createdAt;
@@ -1281,16 +1291,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAccountStatus&&(identical(other.id, id) || other.id == id)&&(identical(other.attitude, attitude) || other.attitude == attitude)&&(identical(other.isOnline, isOnline) || other.isOnline == isOnline)&&(identical(other.isInvisible, isInvisible) || other.isInvisible == isInvisible)&&(identical(other.isNotDisturb, isNotDisturb) || other.isNotDisturb == isNotDisturb)&&(identical(other.isCustomized, isCustomized) || other.isCustomized == isCustomized)&&(identical(other.label, label) || other.label == label)&&(identical(other.clearedAt, clearedAt) || other.clearedAt == clearedAt)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(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 _SnAccountStatus&&(identical(other.id, id) || other.id == id)&&(identical(other.attitude, attitude) || other.attitude == attitude)&&(identical(other.isOnline, isOnline) || other.isOnline == isOnline)&&(identical(other.isInvisible, isInvisible) || other.isInvisible == isInvisible)&&(identical(other.isNotDisturb, isNotDisturb) || other.isNotDisturb == isNotDisturb)&&(identical(other.isCustomized, isCustomized) || other.isCustomized == isCustomized)&&(identical(other.label, label) || other.label == label)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.clearedAt, clearedAt) || other.clearedAt == clearedAt)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(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,attitude,isOnline,isInvisible,isNotDisturb,isCustomized,label,clearedAt,accountId,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,attitude,isOnline,isInvisible,isNotDisturb,isCustomized,label,const DeepCollectionEquality().hash(_meta),clearedAt,accountId,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnAccountStatus(id: $id, attitude: $attitude, isOnline: $isOnline, isInvisible: $isInvisible, isNotDisturb: $isNotDisturb, isCustomized: $isCustomized, label: $label, clearedAt: $clearedAt, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnAccountStatus(id: $id, attitude: $attitude, isOnline: $isOnline, isInvisible: $isInvisible, isNotDisturb: $isNotDisturb, isCustomized: $isCustomized, label: $label, meta: $meta, clearedAt: $clearedAt, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -1301,7 +1311,7 @@ abstract mixin class _$SnAccountStatusCopyWith<$Res> implements $SnAccountStatus
   factory _$SnAccountStatusCopyWith(_SnAccountStatus value, $Res Function(_SnAccountStatus) _then) = __$SnAccountStatusCopyWithImpl;
 @override @useResult
 $Res call({
- String id, int attitude, bool isOnline, bool isInvisible, bool isNotDisturb, bool isCustomized, String label, DateTime? clearedAt, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, int attitude, bool isOnline, bool isInvisible, bool isNotDisturb, bool isCustomized, String label, Map<String, dynamic>? meta, DateTime? clearedAt, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -1318,7 +1328,7 @@ class __$SnAccountStatusCopyWithImpl<$Res>
 
 /// Create a copy of SnAccountStatus
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? attitude = null,Object? isOnline = null,Object? isInvisible = null,Object? isNotDisturb = null,Object? isCustomized = null,Object? label = null,Object? clearedAt = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? attitude = null,Object? isOnline = null,Object? isInvisible = null,Object? isNotDisturb = null,Object? isCustomized = null,Object? label = null,Object? meta = freezed,Object? clearedAt = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnAccountStatus(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,attitude: null == attitude ? _self.attitude : attitude // ignore: cast_nullable_to_non_nullable
@@ -1327,7 +1337,8 @@ as bool,isInvisible: null == isInvisible ? _self.isInvisible : isInvisible // ig
 as bool,isNotDisturb: null == isNotDisturb ? _self.isNotDisturb : isNotDisturb // ignore: cast_nullable_to_non_nullable
 as bool,isCustomized: null == isCustomized ? _self.isCustomized : isCustomized // ignore: cast_nullable_to_non_nullable
 as bool,label: null == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
-as String,clearedAt: freezed == clearedAt ? _self.clearedAt : clearedAt // ignore: cast_nullable_to_non_nullable
+as String,meta: freezed == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,clearedAt: freezed == clearedAt ? _self.clearedAt : clearedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,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

lib/models/account.g.dart

@@ -158,6 +158,7 @@ _SnAccountStatus _$SnAccountStatusFromJson(Map<String, dynamic> json) =>
       isNotDisturb: json['is_not_disturb'] as bool,
       isCustomized: json['is_customized'] as bool,
       label: json['label'] as String? ?? "",
+      meta: json['meta'] as Map<String, dynamic>?,
       clearedAt:
           json['cleared_at'] == null
               ? null
@@ -180,6 +181,7 @@ Map<String, dynamic> _$SnAccountStatusToJson(_SnAccountStatus instance) =>
       'is_not_disturb': instance.isNotDisturb,
       'is_customized': instance.isCustomized,
       'label': instance.label,
+      'meta': instance.meta,
       'cleared_at': instance.clearedAt?.toIso8601String(),
       'account_id': instance.accountId,
       'created_at': instance.createdAt.toIso8601String(),

lib/models/auth.dart

@@ -14,11 +14,11 @@ sealed class AppToken with _$AppToken {
 @freezed
 sealed class GeoIpLocation with _$GeoIpLocation {
   const factory GeoIpLocation({
-    required double latitude,
+    required double? latitude,
-    required double longitude,
+    required double? longitude,
-    required String countryCode,
+    required String? countryCode,
-    required String country,
+    required String? country,
-    required String city,
+    required String? city,
   }) = _GeoIpLocation;
 
   factory GeoIpLocation.fromJson(Map<String, dynamic> json) =>
@@ -29,7 +29,7 @@ sealed class GeoIpLocation with _$GeoIpLocation {
 sealed class SnAuthChallenge with _$SnAuthChallenge {
   const factory SnAuthChallenge({
     required String id,
-    required DateTime expiredAt,
+    required DateTime? expiredAt,
     required int stepRemain,
     required int stepTotal,
     required int failedAttempts,
@@ -57,7 +57,7 @@ sealed class SnAuthSession with _$SnAuthSession {
     required String id,
     required String? label,
     required DateTime lastGrantedAt,
-    required DateTime expiredAt,
+    required DateTime? expiredAt,
     required String accountId,
     required String challengeId,
     required SnAuthChallenge challenge,

lib/models/auth.freezed.dart

@@ -272,7 +272,7 @@ as String,
 /// @nodoc
 mixin _$GeoIpLocation {
 
- double get latitude; double get longitude; String get countryCode; String get country; String get city;
+ double? get latitude; double? get longitude; String? get countryCode; String? get country; String? get city;
 /// Create a copy of GeoIpLocation
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -305,7 +305,7 @@ abstract mixin class $GeoIpLocationCopyWith<$Res>  {
   factory $GeoIpLocationCopyWith(GeoIpLocation value, $Res Function(GeoIpLocation) _then) = _$GeoIpLocationCopyWithImpl;
 @useResult
 $Res call({
- double latitude, double longitude, String countryCode, String country, String city
+ double? latitude, double? longitude, String? countryCode, String? country, String? city
 });
 
 
@@ -322,14 +322,14 @@ class _$GeoIpLocationCopyWithImpl<$Res>
 
 /// Create a copy of GeoIpLocation
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? latitude = null,Object? longitude = null,Object? countryCode = null,Object? country = null,Object? city = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? latitude = freezed,Object? longitude = freezed,Object? countryCode = freezed,Object? country = freezed,Object? city = freezed,}) {
   return _then(_self.copyWith(
-latitude: null == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
+latitude: freezed == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
-as double,longitude: null == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
+as double?,longitude: freezed == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
-as double,countryCode: null == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
+as double?,countryCode: freezed == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
-as String,country: null == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
+as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
-as String,city: null == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
+as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
-as String,
+as String?,
   ));
 }
 
@@ -411,7 +411,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( double latitude,  double longitude,  String countryCode,  String country,  String city)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( double? latitude,  double? longitude,  String? countryCode,  String? country,  String? city)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _GeoIpLocation() when $default != null:
 return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_that.city);case _:
@@ -432,7 +432,7 @@ return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( double latitude,  double longitude,  String countryCode,  String country,  String city)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( double? latitude,  double? longitude,  String? countryCode,  String? country,  String? city)  $default,) {final _that = this;
 switch (_that) {
 case _GeoIpLocation():
 return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_that.city);}
@@ -449,7 +449,7 @@ return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( double latitude,  double longitude,  String countryCode,  String country,  String city)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( double? latitude,  double? longitude,  String? countryCode,  String? country,  String? city)?  $default,) {final _that = this;
 switch (_that) {
 case _GeoIpLocation() when $default != null:
 return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_that.city);case _:
@@ -467,11 +467,11 @@ class _GeoIpLocation implements GeoIpLocation {
   const _GeoIpLocation({required this.latitude, required this.longitude, required this.countryCode, required this.country, required this.city});
   factory _GeoIpLocation.fromJson(Map<String, dynamic> json) => _$GeoIpLocationFromJson(json);
 
-@override final  double latitude;
+@override final  double? latitude;
-@override final  double longitude;
+@override final  double? longitude;
-@override final  String countryCode;
+@override final  String? countryCode;
-@override final  String country;
+@override final  String? country;
-@override final  String city;
+@override final  String? city;
 
 /// Create a copy of GeoIpLocation
 /// with the given fields replaced by the non-null parameter values.
@@ -506,7 +506,7 @@ abstract mixin class _$GeoIpLocationCopyWith<$Res> implements $GeoIpLocationCopy
   factory _$GeoIpLocationCopyWith(_GeoIpLocation value, $Res Function(_GeoIpLocation) _then) = __$GeoIpLocationCopyWithImpl;
 @override @useResult
 $Res call({
- double latitude, double longitude, String countryCode, String country, String city
+ double? latitude, double? longitude, String? countryCode, String? country, String? city
 });
 
 
@@ -523,14 +523,14 @@ class __$GeoIpLocationCopyWithImpl<$Res>
 
 /// Create a copy of GeoIpLocation
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? latitude = null,Object? longitude = null,Object? countryCode = null,Object? country = null,Object? city = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? latitude = freezed,Object? longitude = freezed,Object? countryCode = freezed,Object? country = freezed,Object? city = freezed,}) {
   return _then(_GeoIpLocation(
-latitude: null == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
+latitude: freezed == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
-as double,longitude: null == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
+as double?,longitude: freezed == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
-as double,countryCode: null == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
+as double?,countryCode: freezed == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
-as String,country: null == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
+as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
-as String,city: null == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
+as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
-as String,
+as String?,
   ));
 }
 
@@ -541,7 +541,7 @@ as String,
 /// @nodoc
 mixin _$SnAuthChallenge {
 
- String get id; DateTime get expiredAt; int get stepRemain; int get stepTotal; int get failedAttempts; int get type; List<String> get blacklistFactors; List<dynamic> get audiences; List<dynamic> get scopes; String get ipAddress; String get userAgent; String? get nonce; GeoIpLocation? get location; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; DateTime? get expiredAt; int get stepRemain; int get stepTotal; int get failedAttempts; int get type; List<String> get blacklistFactors; List<dynamic> get audiences; List<dynamic> get scopes; String get ipAddress; String get userAgent; String? get nonce; GeoIpLocation? get location; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -574,7 +574,7 @@ abstract mixin class $SnAuthChallengeCopyWith<$Res>  {
   factory $SnAuthChallengeCopyWith(SnAuthChallenge value, $Res Function(SnAuthChallenge) _then) = _$SnAuthChallengeCopyWithImpl;
 @useResult
 $Res call({
- String id, DateTime expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, GeoIpLocation? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, DateTime? expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, GeoIpLocation? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -591,11 +591,11 @@ class _$SnAuthChallengeCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? expiredAt = freezed,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = 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,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as String,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
+as DateTime?,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
 as int,stepTotal: null == stepTotal ? _self.stepTotal : stepTotal // ignore: cast_nullable_to_non_nullable
 as int,failedAttempts: null == failedAttempts ? _self.failedAttempts : failedAttempts // ignore: cast_nullable_to_non_nullable
 as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -704,7 +704,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  DateTime? expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge() when $default != null:
 return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -725,7 +725,7 @@ return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  DateTime? expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge():
 return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
@@ -742,7 +742,7 @@ return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  DateTime? expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge() when $default != null:
 return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -761,7 +761,7 @@ class _SnAuthChallenge implements SnAuthChallenge {
   factory _SnAuthChallenge.fromJson(Map<String, dynamic> json) => _$SnAuthChallengeFromJson(json);
 
 @override final  String id;
-@override final  DateTime expiredAt;
+@override final  DateTime? expiredAt;
 @override final  int stepRemain;
 @override final  int stepTotal;
 @override final  int failedAttempts;
@@ -829,7 +829,7 @@ abstract mixin class _$SnAuthChallengeCopyWith<$Res> implements $SnAuthChallenge
   factory _$SnAuthChallengeCopyWith(_SnAuthChallenge value, $Res Function(_SnAuthChallenge) _then) = __$SnAuthChallengeCopyWithImpl;
 @override @useResult
 $Res call({
- String id, DateTime expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, GeoIpLocation? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, DateTime? expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, GeoIpLocation? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -846,11 +846,11 @@ class __$SnAuthChallengeCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? expiredAt = freezed,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnAuthChallenge(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as String,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
+as DateTime?,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
 as int,stepTotal: null == stepTotal ? _self.stepTotal : stepTotal // ignore: cast_nullable_to_non_nullable
 as int,failedAttempts: null == failedAttempts ? _self.failedAttempts : failedAttempts // ignore: cast_nullable_to_non_nullable
 as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -888,7 +888,7 @@ $GeoIpLocationCopyWith<$Res>? get location {
 /// @nodoc
 mixin _$SnAuthSession {
 
- String get id; String? get label; DateTime get lastGrantedAt; DateTime get expiredAt; String get accountId; String get challengeId; SnAuthChallenge get challenge; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String? get label; DateTime get lastGrantedAt; DateTime? get expiredAt; String get accountId; String get challengeId; SnAuthChallenge get challenge; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -921,7 +921,7 @@ abstract mixin class $SnAuthSessionCopyWith<$Res>  {
   factory $SnAuthSessionCopyWith(SnAuthSession value, $Res Function(SnAuthSession) _then) = _$SnAuthSessionCopyWithImpl;
 @useResult
 $Res call({
- String id, String? label, DateTime lastGrantedAt, DateTime expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String? label, DateTime lastGrantedAt, DateTime? expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -938,13 +938,13 @@ class _$SnAuthSessionCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = null,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = freezed,Object? accountId = null,Object? challengeId = null,Object? challenge = 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,label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
 as String?,lastGrantedAt: null == lastGrantedAt ? _self.lastGrantedAt : lastGrantedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,challengeId: null == challengeId ? _self.challengeId : challengeId // ignore: cast_nullable_to_non_nullable
 as String,challenge: null == challenge ? _self.challenge : challenge // ignore: cast_nullable_to_non_nullable
 as SnAuthChallenge,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
@@ -1041,7 +1041,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAuthSession() when $default != null:
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -1062,7 +1062,7 @@ return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.a
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthSession():
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);}
@@ -1079,7 +1079,7 @@ return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.a
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthSession() when $default != null:
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -1100,7 +1100,7 @@ class _SnAuthSession implements SnAuthSession {
 @override final  String id;
 @override final  String? label;
 @override final  DateTime lastGrantedAt;
-@override final  DateTime expiredAt;
+@override final  DateTime? expiredAt;
 @override final  String accountId;
 @override final  String challengeId;
 @override final  SnAuthChallenge challenge;
@@ -1141,7 +1141,7 @@ abstract mixin class _$SnAuthSessionCopyWith<$Res> implements $SnAuthSessionCopy
   factory _$SnAuthSessionCopyWith(_SnAuthSession value, $Res Function(_SnAuthSession) _then) = __$SnAuthSessionCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String? label, DateTime lastGrantedAt, DateTime expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String? label, DateTime lastGrantedAt, DateTime? expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -1158,13 +1158,13 @@ class __$SnAuthSessionCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = null,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = freezed,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnAuthSession(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
 as String?,lastGrantedAt: null == lastGrantedAt ? _self.lastGrantedAt : lastGrantedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,challengeId: null == challengeId ? _self.challengeId : challengeId // ignore: cast_nullable_to_non_nullable
 as String,challenge: null == challenge ? _self.challenge : challenge // ignore: cast_nullable_to_non_nullable
 as SnAuthChallenge,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable

lib/models/auth.g.dart

@@ -15,11 +15,11 @@ Map<String, dynamic> _$AppTokenToJson(_AppToken instance) => <String, dynamic>{
 
 _GeoIpLocation _$GeoIpLocationFromJson(Map<String, dynamic> json) =>
     _GeoIpLocation(
-      latitude: (json['latitude'] as num).toDouble(),
+      latitude: (json['latitude'] as num?)?.toDouble(),
-      longitude: (json['longitude'] as num).toDouble(),
+      longitude: (json['longitude'] as num?)?.toDouble(),
-      countryCode: json['country_code'] as String,
+      countryCode: json['country_code'] as String?,
-      country: json['country'] as String,
+      country: json['country'] as String?,
-      city: json['city'] as String,
+      city: json['city'] as String?,
     );
 
 Map<String, dynamic> _$GeoIpLocationToJson(_GeoIpLocation instance) =>
@@ -34,7 +34,10 @@ Map<String, dynamic> _$GeoIpLocationToJson(_GeoIpLocation instance) =>
 _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
     _SnAuthChallenge(
       id: json['id'] as String,
-      expiredAt: DateTime.parse(json['expired_at'] as String),
+      expiredAt:
+          json['expired_at'] == null
+              ? null
+              : DateTime.parse(json['expired_at'] as String),
       stepRemain: (json['step_remain'] as num).toInt(),
       stepTotal: (json['step_total'] as num).toInt(),
       failedAttempts: (json['failed_attempts'] as num).toInt(),
@@ -66,7 +69,7 @@ _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$SnAuthChallengeToJson(_SnAuthChallenge instance) =>
     <String, dynamic>{
       'id': instance.id,
-      'expired_at': instance.expiredAt.toIso8601String(),
+      'expired_at': instance.expiredAt?.toIso8601String(),
       'step_remain': instance.stepRemain,
       'step_total': instance.stepTotal,
       'failed_attempts': instance.failedAttempts,
@@ -89,7 +92,10 @@ _SnAuthSession _$SnAuthSessionFromJson(Map<String, dynamic> json) =>
       id: json['id'] as String,
       label: json['label'] as String?,
       lastGrantedAt: DateTime.parse(json['last_granted_at'] as String),
-      expiredAt: DateTime.parse(json['expired_at'] as String),
+      expiredAt:
+          json['expired_at'] == null
+              ? null
+              : DateTime.parse(json['expired_at'] as String),
       accountId: json['account_id'] as String,
       challengeId: json['challenge_id'] as String,
       challenge: SnAuthChallenge.fromJson(
@@ -108,7 +114,7 @@ Map<String, dynamic> _$SnAuthSessionToJson(_SnAuthSession instance) =>
       'id': instance.id,
       'label': instance.label,
       'last_granted_at': instance.lastGrantedAt.toIso8601String(),
-      'expired_at': instance.expiredAt.toIso8601String(),
+      'expired_at': instance.expiredAt?.toIso8601String(),
       'account_id': instance.accountId,
       'challenge_id': instance.challengeId,
       'challenge': instance.challenge.toJson(),

lib/models/chat.dart

@@ -40,7 +40,7 @@ sealed class SnChatMessage with _$SnChatMessage {
     String? content,
     String? nonce,
     @Default({}) Map<String, dynamic> meta,
-    @Default([]) List<String> membersMetioned,
+    @Default([]) List<String> membersMentioned,
     DateTime? editedAt,
     @Default([]) List<SnCloudFile> attachments,
     @Default([]) List<SnChatReaction> reactions,
@@ -117,23 +117,10 @@ class MessageChangeAction {
   static const String delete = "delete";
 }
 
-@freezed
-sealed class MessageChange with _$MessageChange {
-  const factory MessageChange({
-    required String messageId,
-    required String action,
-    SnChatMessage? message,
-    required DateTime timestamp,
-  }) = _MessageChange;
-
-  factory MessageChange.fromJson(Map<String, dynamic> json) =>
-      _$MessageChangeFromJson(json);
-}
-
 @freezed
 sealed class MessageSyncResponse with _$MessageSyncResponse {
   const factory MessageSyncResponse({
-    @Default([]) List<MessageChange> changes,
+    @Default([]) List<SnChatMessage> messages,
     required DateTime currentTimestamp,
   }) = _MessageSyncResponse;
 

lib/models/chat.freezed.dart

@@ -391,7 +391,7 @@ $SnRealmCopyWith<$Res>? get realm {
 /// @nodoc
 mixin _$SnChatMessage {
 
- DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; String get id; String get type; String? get content; String? get nonce; Map<String, dynamic> get meta; List<String> get membersMetioned; DateTime? get editedAt; List<SnCloudFile> get attachments; List<SnChatReaction> get reactions; String? get repliedMessageId; String? get forwardedMessageId; String get senderId; SnChatMember get sender; String get chatRoomId;
+ DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; String get id; String get type; String? get content; String? get nonce; Map<String, dynamic> get meta; List<String> get membersMentioned; DateTime? get editedAt; List<SnCloudFile> get attachments; List<SnChatReaction> get reactions; String? get repliedMessageId; String? get forwardedMessageId; String get senderId; SnChatMember get sender; String get chatRoomId;
 /// Create a copy of SnChatMessage
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -404,16 +404,16 @@ $SnChatMessageCopyWith<SnChatMessage> get copyWith => _$SnChatMessageCopyWithImp
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatMessage&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.content, content) || other.content == content)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&const DeepCollectionEquality().equals(other.meta, meta)&&const DeepCollectionEquality().equals(other.membersMetioned, membersMetioned)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&(identical(other.repliedMessageId, repliedMessageId) || other.repliedMessageId == repliedMessageId)&&(identical(other.forwardedMessageId, forwardedMessageId) || other.forwardedMessageId == forwardedMessageId)&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.sender, sender) || other.sender == sender)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatMessage&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.content, content) || other.content == content)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&const DeepCollectionEquality().equals(other.meta, meta)&&const DeepCollectionEquality().equals(other.membersMentioned, membersMentioned)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&(identical(other.repliedMessageId, repliedMessageId) || other.repliedMessageId == repliedMessageId)&&(identical(other.forwardedMessageId, forwardedMessageId) || other.forwardedMessageId == forwardedMessageId)&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.sender, sender) || other.sender == sender)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,type,content,nonce,const DeepCollectionEquality().hash(meta),const DeepCollectionEquality().hash(membersMetioned),editedAt,const DeepCollectionEquality().hash(attachments),const DeepCollectionEquality().hash(reactions),repliedMessageId,forwardedMessageId,senderId,sender,chatRoomId);
+int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,type,content,nonce,const DeepCollectionEquality().hash(meta),const DeepCollectionEquality().hash(membersMentioned),editedAt,const DeepCollectionEquality().hash(attachments),const DeepCollectionEquality().hash(reactions),repliedMessageId,forwardedMessageId,senderId,sender,chatRoomId);
 
 @override
 String toString() {
-  return 'SnChatMessage(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, type: $type, content: $content, nonce: $nonce, meta: $meta, membersMetioned: $membersMetioned, editedAt: $editedAt, attachments: $attachments, reactions: $reactions, repliedMessageId: $repliedMessageId, forwardedMessageId: $forwardedMessageId, senderId: $senderId, sender: $sender, chatRoomId: $chatRoomId)';
+  return 'SnChatMessage(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, type: $type, content: $content, nonce: $nonce, meta: $meta, membersMentioned: $membersMentioned, editedAt: $editedAt, attachments: $attachments, reactions: $reactions, repliedMessageId: $repliedMessageId, forwardedMessageId: $forwardedMessageId, senderId: $senderId, sender: $sender, chatRoomId: $chatRoomId)';
 }
 
 
@@ -424,7 +424,7 @@ abstract mixin class $SnChatMessageCopyWith<$Res>  {
   factory $SnChatMessageCopyWith(SnChatMessage value, $Res Function(SnChatMessage) _then) = _$SnChatMessageCopyWithImpl;
 @useResult
 $Res call({
- DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String type, String? content, String? nonce, Map<String, dynamic> meta, List<String> membersMetioned, DateTime? editedAt, List<SnCloudFile> attachments, List<SnChatReaction> reactions, String? repliedMessageId, String? forwardedMessageId, String senderId, SnChatMember sender, String chatRoomId
+ DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String type, String? content, String? nonce, Map<String, dynamic> meta, List<String> membersMentioned, DateTime? editedAt, List<SnCloudFile> attachments, List<SnChatReaction> reactions, String? repliedMessageId, String? forwardedMessageId, String senderId, SnChatMember sender, String chatRoomId
 });
 
 
@@ -441,7 +441,7 @@ class _$SnChatMessageCopyWithImpl<$Res>
 
 /// Create a copy of SnChatMessage
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? type = null,Object? content = freezed,Object? nonce = freezed,Object? meta = null,Object? membersMetioned = null,Object? editedAt = freezed,Object? attachments = null,Object? reactions = null,Object? repliedMessageId = freezed,Object? forwardedMessageId = freezed,Object? senderId = null,Object? sender = null,Object? chatRoomId = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? type = null,Object? content = freezed,Object? nonce = freezed,Object? meta = null,Object? membersMentioned = null,Object? editedAt = freezed,Object? attachments = null,Object? reactions = null,Object? repliedMessageId = freezed,Object? forwardedMessageId = freezed,Object? senderId = null,Object? sender = null,Object? chatRoomId = null,}) {
   return _then(_self.copyWith(
 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
@@ -451,7 +451,7 @@ as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non
 as String,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String?,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
 as String?,meta: null == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>,membersMetioned: null == membersMetioned ? _self.membersMetioned : membersMetioned // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>,membersMentioned: null == membersMentioned ? _self.membersMentioned : membersMentioned // ignore: cast_nullable_to_non_nullable
 as List<String>,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,attachments: null == attachments ? _self.attachments : attachments // ignore: cast_nullable_to_non_nullable
 as List<SnCloudFile>,reactions: null == reactions ? _self.reactions : reactions // ignore: cast_nullable_to_non_nullable
@@ -551,10 +551,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMetioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMentioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnChatMessage() when $default != null:
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMetioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);case _:
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMentioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);case _:
   return orElse();
 
 }
@@ -572,10 +572,10 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.t
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMetioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMentioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)  $default,) {final _that = this;
 switch (_that) {
 case _SnChatMessage():
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMetioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);}
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMentioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -589,10 +589,10 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.t
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMetioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMentioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)?  $default,) {final _that = this;
 switch (_that) {
 case _SnChatMessage() when $default != null:
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMetioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);case _:
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMentioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);case _:
   return null;
 
 }
@@ -604,7 +604,7 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.t
 @JsonSerializable()
 
 class _SnChatMessage implements SnChatMessage {
-  const _SnChatMessage({required this.createdAt, required this.updatedAt, this.deletedAt, required this.id, this.type = 'text', this.content, this.nonce, final  Map<String, dynamic> meta = const {}, final  List<String> membersMetioned = const [], this.editedAt, final  List<SnCloudFile> attachments = const [], final  List<SnChatReaction> reactions = const [], this.repliedMessageId, this.forwardedMessageId, required this.senderId, required this.sender, required this.chatRoomId}): _meta = meta,_membersMetioned = membersMetioned,_attachments = attachments,_reactions = reactions;
+  const _SnChatMessage({required this.createdAt, required this.updatedAt, this.deletedAt, required this.id, this.type = 'text', this.content, this.nonce, final  Map<String, dynamic> meta = const {}, final  List<String> membersMentioned = const [], this.editedAt, final  List<SnCloudFile> attachments = const [], final  List<SnChatReaction> reactions = const [], this.repliedMessageId, this.forwardedMessageId, required this.senderId, required this.sender, required this.chatRoomId}): _meta = meta,_membersMentioned = membersMentioned,_attachments = attachments,_reactions = reactions;
   factory _SnChatMessage.fromJson(Map<String, dynamic> json) => _$SnChatMessageFromJson(json);
 
 @override final  DateTime createdAt;
@@ -621,11 +621,11 @@ class _SnChatMessage implements SnChatMessage {
   return EqualUnmodifiableMapView(_meta);
 }
 
- final  List<String> _membersMetioned;
+ final  List<String> _membersMentioned;
-@override@JsonKey() List<String> get membersMetioned {
+@override@JsonKey() List<String> get membersMentioned {
-  if (_membersMetioned is EqualUnmodifiableListView) return _membersMetioned;
+  if (_membersMentioned is EqualUnmodifiableListView) return _membersMentioned;
   // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_membersMetioned);
+  return EqualUnmodifiableListView(_membersMentioned);
 }
 
 @override final  DateTime? editedAt;
@@ -662,16 +662,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatMessage&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.content, content) || other.content == content)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&const DeepCollectionEquality().equals(other._meta, _meta)&&const DeepCollectionEquality().equals(other._membersMetioned, _membersMetioned)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&(identical(other.repliedMessageId, repliedMessageId) || other.repliedMessageId == repliedMessageId)&&(identical(other.forwardedMessageId, forwardedMessageId) || other.forwardedMessageId == forwardedMessageId)&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.sender, sender) || other.sender == sender)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatMessage&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.content, content) || other.content == content)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&const DeepCollectionEquality().equals(other._meta, _meta)&&const DeepCollectionEquality().equals(other._membersMentioned, _membersMentioned)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&(identical(other.repliedMessageId, repliedMessageId) || other.repliedMessageId == repliedMessageId)&&(identical(other.forwardedMessageId, forwardedMessageId) || other.forwardedMessageId == forwardedMessageId)&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.sender, sender) || other.sender == sender)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,type,content,nonce,const DeepCollectionEquality().hash(_meta),const DeepCollectionEquality().hash(_membersMetioned),editedAt,const DeepCollectionEquality().hash(_attachments),const DeepCollectionEquality().hash(_reactions),repliedMessageId,forwardedMessageId,senderId,sender,chatRoomId);
+int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,type,content,nonce,const DeepCollectionEquality().hash(_meta),const DeepCollectionEquality().hash(_membersMentioned),editedAt,const DeepCollectionEquality().hash(_attachments),const DeepCollectionEquality().hash(_reactions),repliedMessageId,forwardedMessageId,senderId,sender,chatRoomId);
 
 @override
 String toString() {
-  return 'SnChatMessage(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, type: $type, content: $content, nonce: $nonce, meta: $meta, membersMetioned: $membersMetioned, editedAt: $editedAt, attachments: $attachments, reactions: $reactions, repliedMessageId: $repliedMessageId, forwardedMessageId: $forwardedMessageId, senderId: $senderId, sender: $sender, chatRoomId: $chatRoomId)';
+  return 'SnChatMessage(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, type: $type, content: $content, nonce: $nonce, meta: $meta, membersMentioned: $membersMentioned, editedAt: $editedAt, attachments: $attachments, reactions: $reactions, repliedMessageId: $repliedMessageId, forwardedMessageId: $forwardedMessageId, senderId: $senderId, sender: $sender, chatRoomId: $chatRoomId)';
 }
 
 
@@ -682,7 +682,7 @@ abstract mixin class _$SnChatMessageCopyWith<$Res> implements $SnChatMessageCopy
   factory _$SnChatMessageCopyWith(_SnChatMessage value, $Res Function(_SnChatMessage) _then) = __$SnChatMessageCopyWithImpl;
 @override @useResult
 $Res call({
- DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String type, String? content, String? nonce, Map<String, dynamic> meta, List<String> membersMetioned, DateTime? editedAt, List<SnCloudFile> attachments, List<SnChatReaction> reactions, String? repliedMessageId, String? forwardedMessageId, String senderId, SnChatMember sender, String chatRoomId
+ DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String type, String? content, String? nonce, Map<String, dynamic> meta, List<String> membersMentioned, DateTime? editedAt, List<SnCloudFile> attachments, List<SnChatReaction> reactions, String? repliedMessageId, String? forwardedMessageId, String senderId, SnChatMember sender, String chatRoomId
 });
 
 
@@ -699,7 +699,7 @@ class __$SnChatMessageCopyWithImpl<$Res>
 
 /// Create a copy of SnChatMessage
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? type = null,Object? content = freezed,Object? nonce = freezed,Object? meta = null,Object? membersMetioned = null,Object? editedAt = freezed,Object? attachments = null,Object? reactions = null,Object? repliedMessageId = freezed,Object? forwardedMessageId = freezed,Object? senderId = null,Object? sender = null,Object? chatRoomId = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? type = null,Object? content = freezed,Object? nonce = freezed,Object? meta = null,Object? membersMentioned = null,Object? editedAt = freezed,Object? attachments = null,Object? reactions = null,Object? repliedMessageId = freezed,Object? forwardedMessageId = freezed,Object? senderId = null,Object? sender = null,Object? chatRoomId = null,}) {
   return _then(_SnChatMessage(
 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
@@ -709,7 +709,7 @@ as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non
 as String,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String?,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
 as String?,meta: null == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>,membersMetioned: null == membersMetioned ? _self._membersMetioned : membersMetioned // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>,membersMentioned: null == membersMentioned ? _self._membersMentioned : membersMentioned // ignore: cast_nullable_to_non_nullable
 as List<String>,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,attachments: null == attachments ? _self._attachments : attachments // ignore: cast_nullable_to_non_nullable
 as List<SnCloudFile>,reactions: null == reactions ? _self._reactions : reactions // ignore: cast_nullable_to_non_nullable
@@ -1691,300 +1691,10 @@ $SnChatMessageCopyWith<$Res>? get lastMessage {
 }
 
 
-/// @nodoc
-mixin _$MessageChange {
-
- String get messageId; String get action; SnChatMessage? get message; DateTime get timestamp;
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$MessageChangeCopyWith<MessageChange> get copyWith => _$MessageChangeCopyWithImpl<MessageChange>(this as MessageChange, _$identity);
-
-  /// Serializes this MessageChange to a JSON map.
-  Map<String, dynamic> toJson();
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is MessageChange&&(identical(other.messageId, messageId) || other.messageId == messageId)&&(identical(other.action, action) || other.action == action)&&(identical(other.message, message) || other.message == message)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,messageId,action,message,timestamp);
-
-@override
-String toString() {
-  return 'MessageChange(messageId: $messageId, action: $action, message: $message, timestamp: $timestamp)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $MessageChangeCopyWith<$Res>  {
-  factory $MessageChangeCopyWith(MessageChange value, $Res Function(MessageChange) _then) = _$MessageChangeCopyWithImpl;
-@useResult
-$Res call({
- String messageId, String action, SnChatMessage? message, DateTime timestamp
-});
-
-
-$SnChatMessageCopyWith<$Res>? get message;
-
-}
-/// @nodoc
-class _$MessageChangeCopyWithImpl<$Res>
-    implements $MessageChangeCopyWith<$Res> {
-  _$MessageChangeCopyWithImpl(this._self, this._then);
-
-  final MessageChange _self;
-  final $Res Function(MessageChange) _then;
-
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? messageId = null,Object? action = null,Object? message = freezed,Object? timestamp = null,}) {
-  return _then(_self.copyWith(
-messageId: null == messageId ? _self.messageId : messageId // ignore: cast_nullable_to_non_nullable
-as String,action: null == action ? _self.action : action // ignore: cast_nullable_to_non_nullable
-as String,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
-as SnChatMessage?,timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
-as DateTime,
-  ));
-}
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnChatMessageCopyWith<$Res>? get message {
-    if (_self.message == null) {
-    return null;
-  }
-
-  return $SnChatMessageCopyWith<$Res>(_self.message!, (value) {
-    return _then(_self.copyWith(message: value));
-  });
-}
-}
-
-
-/// Adds pattern-matching-related methods to [MessageChange].
-extension MessageChangePatterns on MessageChange {
-/// 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( _MessageChange value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _MessageChange() 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( _MessageChange value)  $default,){
-final _that = this;
-switch (_that) {
-case _MessageChange():
-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( _MessageChange value)?  $default,){
-final _that = this;
-switch (_that) {
-case _MessageChange() 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 messageId,  String action,  SnChatMessage? message,  DateTime timestamp)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _MessageChange() when $default != null:
-return $default(_that.messageId,_that.action,_that.message,_that.timestamp);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 messageId,  String action,  SnChatMessage? message,  DateTime timestamp)  $default,) {final _that = this;
-switch (_that) {
-case _MessageChange():
-return $default(_that.messageId,_that.action,_that.message,_that.timestamp);}
-}
-/// 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 messageId,  String action,  SnChatMessage? message,  DateTime timestamp)?  $default,) {final _that = this;
-switch (_that) {
-case _MessageChange() when $default != null:
-return $default(_that.messageId,_that.action,_that.message,_that.timestamp);case _:
-  return null;
-
-}
-}
-
-}
-
-/// @nodoc
-@JsonSerializable()
-
-class _MessageChange implements MessageChange {
-  const _MessageChange({required this.messageId, required this.action, this.message, required this.timestamp});
-  factory _MessageChange.fromJson(Map<String, dynamic> json) => _$MessageChangeFromJson(json);
-
-@override final  String messageId;
-@override final  String action;
-@override final  SnChatMessage? message;
-@override final  DateTime timestamp;
-
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$MessageChangeCopyWith<_MessageChange> get copyWith => __$MessageChangeCopyWithImpl<_MessageChange>(this, _$identity);
-
-@override
-Map<String, dynamic> toJson() {
-  return _$MessageChangeToJson(this, );
-}
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _MessageChange&&(identical(other.messageId, messageId) || other.messageId == messageId)&&(identical(other.action, action) || other.action == action)&&(identical(other.message, message) || other.message == message)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,messageId,action,message,timestamp);
-
-@override
-String toString() {
-  return 'MessageChange(messageId: $messageId, action: $action, message: $message, timestamp: $timestamp)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$MessageChangeCopyWith<$Res> implements $MessageChangeCopyWith<$Res> {
-  factory _$MessageChangeCopyWith(_MessageChange value, $Res Function(_MessageChange) _then) = __$MessageChangeCopyWithImpl;
-@override @useResult
-$Res call({
- String messageId, String action, SnChatMessage? message, DateTime timestamp
-});
-
-
-@override $SnChatMessageCopyWith<$Res>? get message;
-
-}
-/// @nodoc
-class __$MessageChangeCopyWithImpl<$Res>
-    implements _$MessageChangeCopyWith<$Res> {
-  __$MessageChangeCopyWithImpl(this._self, this._then);
-
-  final _MessageChange _self;
-  final $Res Function(_MessageChange) _then;
-
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? messageId = null,Object? action = null,Object? message = freezed,Object? timestamp = null,}) {
-  return _then(_MessageChange(
-messageId: null == messageId ? _self.messageId : messageId // ignore: cast_nullable_to_non_nullable
-as String,action: null == action ? _self.action : action // ignore: cast_nullable_to_non_nullable
-as String,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
-as SnChatMessage?,timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
-as DateTime,
-  ));
-}
-
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnChatMessageCopyWith<$Res>? get message {
-    if (_self.message == null) {
-    return null;
-  }
-
-  return $SnChatMessageCopyWith<$Res>(_self.message!, (value) {
-    return _then(_self.copyWith(message: value));
-  });
-}
-}
-
-
 /// @nodoc
 mixin _$MessageSyncResponse {
 
- List<MessageChange> get changes; DateTime get currentTimestamp;
+ List<SnChatMessage> get messages; DateTime get currentTimestamp;
 /// Create a copy of MessageSyncResponse
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -1997,16 +1707,16 @@ $MessageSyncResponseCopyWith<MessageSyncResponse> get copyWith => _$MessageSyncR
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is MessageSyncResponse&&const DeepCollectionEquality().equals(other.changes, changes)&&(identical(other.currentTimestamp, currentTimestamp) || other.currentTimestamp == currentTimestamp));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is MessageSyncResponse&&const DeepCollectionEquality().equals(other.messages, messages)&&(identical(other.currentTimestamp, currentTimestamp) || other.currentTimestamp == currentTimestamp));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(changes),currentTimestamp);
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(messages),currentTimestamp);
 
 @override
 String toString() {
-  return 'MessageSyncResponse(changes: $changes, currentTimestamp: $currentTimestamp)';
+  return 'MessageSyncResponse(messages: $messages, currentTimestamp: $currentTimestamp)';
 }
 
 
@@ -2017,7 +1727,7 @@ abstract mixin class $MessageSyncResponseCopyWith<$Res>  {
   factory $MessageSyncResponseCopyWith(MessageSyncResponse value, $Res Function(MessageSyncResponse) _then) = _$MessageSyncResponseCopyWithImpl;
 @useResult
 $Res call({
- List<MessageChange> changes, DateTime currentTimestamp
+ List<SnChatMessage> messages, DateTime currentTimestamp
 });
 
 
@@ -2034,10 +1744,10 @@ class _$MessageSyncResponseCopyWithImpl<$Res>
 
 /// Create a copy of MessageSyncResponse
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? changes = null,Object? currentTimestamp = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? messages = null,Object? currentTimestamp = null,}) {
   return _then(_self.copyWith(
-changes: null == changes ? _self.changes : changes // ignore: cast_nullable_to_non_nullable
+messages: null == messages ? _self.messages : messages // ignore: cast_nullable_to_non_nullable
-as List<MessageChange>,currentTimestamp: null == currentTimestamp ? _self.currentTimestamp : currentTimestamp // ignore: cast_nullable_to_non_nullable
+as List<SnChatMessage>,currentTimestamp: null == currentTimestamp ? _self.currentTimestamp : currentTimestamp // ignore: cast_nullable_to_non_nullable
 as DateTime,
   ));
 }
@@ -2120,10 +1830,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<MessageChange> changes,  DateTime currentTimestamp)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<SnChatMessage> messages,  DateTime currentTimestamp)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _MessageSyncResponse() when $default != null:
-return $default(_that.changes,_that.currentTimestamp);case _:
+return $default(_that.messages,_that.currentTimestamp);case _:
   return orElse();
 
 }
@@ -2141,10 +1851,10 @@ return $default(_that.changes,_that.currentTimestamp);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<MessageChange> changes,  DateTime currentTimestamp)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<SnChatMessage> messages,  DateTime currentTimestamp)  $default,) {final _that = this;
 switch (_that) {
 case _MessageSyncResponse():
-return $default(_that.changes,_that.currentTimestamp);}
+return $default(_that.messages,_that.currentTimestamp);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -2158,10 +1868,10 @@ return $default(_that.changes,_that.currentTimestamp);}
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<MessageChange> changes,  DateTime currentTimestamp)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<SnChatMessage> messages,  DateTime currentTimestamp)?  $default,) {final _that = this;
 switch (_that) {
 case _MessageSyncResponse() when $default != null:
-return $default(_that.changes,_that.currentTimestamp);case _:
+return $default(_that.messages,_that.currentTimestamp);case _:
   return null;
 
 }
@@ -2173,14 +1883,14 @@ return $default(_that.changes,_that.currentTimestamp);case _:
 @JsonSerializable()
 
 class _MessageSyncResponse implements MessageSyncResponse {
-  const _MessageSyncResponse({final  List<MessageChange> changes = const [], required this.currentTimestamp}): _changes = changes;
+  const _MessageSyncResponse({final  List<SnChatMessage> messages = const [], required this.currentTimestamp}): _messages = messages;
   factory _MessageSyncResponse.fromJson(Map<String, dynamic> json) => _$MessageSyncResponseFromJson(json);
 
- final  List<MessageChange> _changes;
+ final  List<SnChatMessage> _messages;
-@override@JsonKey() List<MessageChange> get changes {
+@override@JsonKey() List<SnChatMessage> get messages {
-  if (_changes is EqualUnmodifiableListView) return _changes;
+  if (_messages is EqualUnmodifiableListView) return _messages;
   // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_changes);
+  return EqualUnmodifiableListView(_messages);
 }
 
 @override final  DateTime currentTimestamp;
@@ -2198,16 +1908,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _MessageSyncResponse&&const DeepCollectionEquality().equals(other._changes, _changes)&&(identical(other.currentTimestamp, currentTimestamp) || other.currentTimestamp == currentTimestamp));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _MessageSyncResponse&&const DeepCollectionEquality().equals(other._messages, _messages)&&(identical(other.currentTimestamp, currentTimestamp) || other.currentTimestamp == currentTimestamp));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_changes),currentTimestamp);
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_messages),currentTimestamp);
 
 @override
 String toString() {
-  return 'MessageSyncResponse(changes: $changes, currentTimestamp: $currentTimestamp)';
+  return 'MessageSyncResponse(messages: $messages, currentTimestamp: $currentTimestamp)';
 }
 
 
@@ -2218,7 +1928,7 @@ abstract mixin class _$MessageSyncResponseCopyWith<$Res> implements $MessageSync
   factory _$MessageSyncResponseCopyWith(_MessageSyncResponse value, $Res Function(_MessageSyncResponse) _then) = __$MessageSyncResponseCopyWithImpl;
 @override @useResult
 $Res call({
- List<MessageChange> changes, DateTime currentTimestamp
+ List<SnChatMessage> messages, DateTime currentTimestamp
 });
 
 
@@ -2235,10 +1945,10 @@ class __$MessageSyncResponseCopyWithImpl<$Res>
 
 /// Create a copy of MessageSyncResponse
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? changes = null,Object? currentTimestamp = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? messages = null,Object? currentTimestamp = null,}) {
   return _then(_MessageSyncResponse(
-changes: null == changes ? _self._changes : changes // ignore: cast_nullable_to_non_nullable
+messages: null == messages ? _self._messages : messages // ignore: cast_nullable_to_non_nullable
-as List<MessageChange>,currentTimestamp: null == currentTimestamp ? _self.currentTimestamp : currentTimestamp // ignore: cast_nullable_to_non_nullable
+as List<SnChatMessage>,currentTimestamp: null == currentTimestamp ? _self.currentTimestamp : currentTimestamp // ignore: cast_nullable_to_non_nullable
 as DateTime,
   ));
 }

lib/models/chat.g.dart

@@ -69,8 +69,8 @@ _SnChatMessage _$SnChatMessageFromJson(Map<String, dynamic> json) =>
       content: json['content'] as String?,
       nonce: json['nonce'] as String?,
       meta: json['meta'] as Map<String, dynamic>? ?? const {},
-      membersMetioned:
+      membersMentioned:
-          (json['members_metioned'] as List<dynamic>?)
+          (json['members_mentioned'] as List<dynamic>?)
               ?.map((e) => e as String)
               .toList() ??
           const [],
@@ -105,7 +105,7 @@ Map<String, dynamic> _$SnChatMessageToJson(_SnChatMessage instance) =>
       'content': instance.content,
       'nonce': instance.nonce,
       'meta': instance.meta,
-      'members_metioned': instance.membersMetioned,
+      'members_mentioned': instance.membersMentioned,
       'edited_at': instance.editedAt?.toIso8601String(),
       'attachments': instance.attachments.map((e) => e.toJson()).toList(),
       'reactions': instance.reactions.map((e) => e.toJson()).toList(),
@@ -227,30 +227,11 @@ Map<String, dynamic> _$SnChatSummaryToJson(_SnChatSummary instance) =>
       'last_message': instance.lastMessage?.toJson(),
     };
 
-_MessageChange _$MessageChangeFromJson(Map<String, dynamic> json) =>
-    _MessageChange(
-      messageId: json['message_id'] as String,
-      action: json['action'] as String,
-      message:
-          json['message'] == null
-              ? null
-              : SnChatMessage.fromJson(json['message'] as Map<String, dynamic>),
-      timestamp: DateTime.parse(json['timestamp'] as String),
-    );
-
-Map<String, dynamic> _$MessageChangeToJson(_MessageChange instance) =>
-    <String, dynamic>{
-      'message_id': instance.messageId,
-      'action': instance.action,
-      'message': instance.message?.toJson(),
-      'timestamp': instance.timestamp.toIso8601String(),
-    };
-
 _MessageSyncResponse _$MessageSyncResponseFromJson(Map<String, dynamic> json) =>
     _MessageSyncResponse(
-      changes:
+      messages:
-          (json['changes'] as List<dynamic>?)
+          (json['messages'] as List<dynamic>?)
-              ?.map((e) => MessageChange.fromJson(e as Map<String, dynamic>))
+              ?.map((e) => SnChatMessage.fromJson(e as Map<String, dynamic>))
               .toList() ??
           const [],
       currentTimestamp: DateTime.parse(json['current_timestamp'] as String),
@@ -259,7 +240,7 @@ _MessageSyncResponse _$MessageSyncResponseFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$MessageSyncResponseToJson(
   _MessageSyncResponse instance,
 ) => <String, dynamic>{
-  'changes': instance.changes.map((e) => e.toJson()).toList(),
+  'messages': instance.messages.map((e) => e.toJson()).toList(),
   'current_timestamp': instance.currentTimestamp.toIso8601String(),
 };
 

lib/models/file.dart

@@ -1,4 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/file_pool.dart';
 
 part 'file.freezed.dart';
 part 'file.g.dart';
@@ -13,6 +14,7 @@ sealed class UniversalFile with _$UniversalFile {
     required dynamic data,
     required UniversalFileType type,
     @Default(false) bool isLink,
+    String? displayName,
   }) = _UniversalFile;
 
   factory UniversalFile.fromJson(Map<String, dynamic> json) =>
@@ -30,6 +32,7 @@ sealed class UniversalFile with _$UniversalFile {
         'video' => UniversalFileType.video,
         _ => UniversalFileType.file,
       },
+      displayName: attachment.name,
     );
   }
 }
@@ -42,6 +45,7 @@ sealed class SnCloudFile with _$SnCloudFile {
     required String? description,
     required Map<String, dynamic>? fileMeta,
     required Map<String, dynamic>? userMeta,
+    required SnFilePool? pool,
     @Default([]) List<int> sensitiveMarks,
     required String? mimeType,
     required String? hash,

lib/models/file.freezed.dart

@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$UniversalFile {
 
- dynamic get data; UniversalFileType get type; bool get isLink;
+ dynamic get data; UniversalFileType get type; bool get isLink; String? get displayName;
 /// Create a copy of UniversalFile
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $UniversalFileCopyWith<UniversalFile> get copyWith => _$UniversalFileCopyWithImp
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is UniversalFile&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.type, type) || other.type == type)&&(identical(other.isLink, isLink) || other.isLink == isLink));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is UniversalFile&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.type, type) || other.type == type)&&(identical(other.isLink, isLink) || other.isLink == isLink)&&(identical(other.displayName, displayName) || other.displayName == displayName));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(data),type,isLink);
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(data),type,isLink,displayName);
 
 @override
 String toString() {
-  return 'UniversalFile(data: $data, type: $type, isLink: $isLink)';
+  return 'UniversalFile(data: $data, type: $type, isLink: $isLink, displayName: $displayName)';
 }
 
 
@@ -48,7 +48,7 @@ abstract mixin class $UniversalFileCopyWith<$Res>  {
   factory $UniversalFileCopyWith(UniversalFile value, $Res Function(UniversalFile) _then) = _$UniversalFileCopyWithImpl;
 @useResult
 $Res call({
- dynamic data, UniversalFileType type, bool isLink
+ dynamic data, UniversalFileType type, bool isLink, String? displayName
 });
 
 
@@ -65,12 +65,13 @@ class _$UniversalFileCopyWithImpl<$Res>
 
 /// Create a copy of UniversalFile
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? data = freezed,Object? type = null,Object? isLink = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? data = freezed,Object? type = null,Object? isLink = null,Object? displayName = freezed,}) {
   return _then(_self.copyWith(
 data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
 as dynamic,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as UniversalFileType,isLink: null == isLink ? _self.isLink : isLink // ignore: cast_nullable_to_non_nullable
-as bool,
+as bool,displayName: freezed == displayName ? _self.displayName : displayName // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 
@@ -152,10 +153,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( dynamic data,  UniversalFileType type,  bool isLink)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( dynamic data,  UniversalFileType type,  bool isLink,  String? displayName)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _UniversalFile() when $default != null:
-return $default(_that.data,_that.type,_that.isLink);case _:
+return $default(_that.data,_that.type,_that.isLink,_that.displayName);case _:
   return orElse();
 
 }
@@ -173,10 +174,10 @@ return $default(_that.data,_that.type,_that.isLink);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( dynamic data,  UniversalFileType type,  bool isLink)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( dynamic data,  UniversalFileType type,  bool isLink,  String? displayName)  $default,) {final _that = this;
 switch (_that) {
 case _UniversalFile():
-return $default(_that.data,_that.type,_that.isLink);}
+return $default(_that.data,_that.type,_that.isLink,_that.displayName);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -190,10 +191,10 @@ return $default(_that.data,_that.type,_that.isLink);}
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( dynamic data,  UniversalFileType type,  bool isLink)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( dynamic data,  UniversalFileType type,  bool isLink,  String? displayName)?  $default,) {final _that = this;
 switch (_that) {
 case _UniversalFile() when $default != null:
-return $default(_that.data,_that.type,_that.isLink);case _:
+return $default(_that.data,_that.type,_that.isLink,_that.displayName);case _:
   return null;
 
 }
@@ -205,12 +206,13 @@ return $default(_that.data,_that.type,_that.isLink);case _:
 @JsonSerializable()
 
 class _UniversalFile extends UniversalFile {
-  const _UniversalFile({required this.data, required this.type, this.isLink = false}): super._();
+  const _UniversalFile({required this.data, required this.type, this.isLink = false, this.displayName}): super._();
   factory _UniversalFile.fromJson(Map<String, dynamic> json) => _$UniversalFileFromJson(json);
 
 @override final  dynamic data;
 @override final  UniversalFileType type;
 @override@JsonKey() final  bool isLink;
+@override final  String? displayName;
 
 /// Create a copy of UniversalFile
 /// with the given fields replaced by the non-null parameter values.
@@ -225,16 +227,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _UniversalFile&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.type, type) || other.type == type)&&(identical(other.isLink, isLink) || other.isLink == isLink));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _UniversalFile&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.type, type) || other.type == type)&&(identical(other.isLink, isLink) || other.isLink == isLink)&&(identical(other.displayName, displayName) || other.displayName == displayName));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(data),type,isLink);
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(data),type,isLink,displayName);
 
 @override
 String toString() {
-  return 'UniversalFile(data: $data, type: $type, isLink: $isLink)';
+  return 'UniversalFile(data: $data, type: $type, isLink: $isLink, displayName: $displayName)';
 }
 
 
@@ -245,7 +247,7 @@ abstract mixin class _$UniversalFileCopyWith<$Res> implements $UniversalFileCopy
   factory _$UniversalFileCopyWith(_UniversalFile value, $Res Function(_UniversalFile) _then) = __$UniversalFileCopyWithImpl;
 @override @useResult
 $Res call({
- dynamic data, UniversalFileType type, bool isLink
+ dynamic data, UniversalFileType type, bool isLink, String? displayName
 });
 
 
@@ -262,12 +264,13 @@ class __$UniversalFileCopyWithImpl<$Res>
 
 /// Create a copy of UniversalFile
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? data = freezed,Object? type = null,Object? isLink = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? data = freezed,Object? type = null,Object? isLink = null,Object? displayName = freezed,}) {
   return _then(_UniversalFile(
 data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
 as dynamic,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as UniversalFileType,isLink: null == isLink ? _self.isLink : isLink // ignore: cast_nullable_to_non_nullable
-as bool,
+as bool,displayName: freezed == displayName ? _self.displayName : displayName // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 
@@ -278,7 +281,7 @@ as bool,
 /// @nodoc
 mixin _$SnCloudFile {
 
- String get id; String get name; String? get description; Map<String, dynamic>? get fileMeta; Map<String, dynamic>? get userMeta; List<int> get sensitiveMarks; String? get mimeType; String? get hash; int get size; DateTime? get uploadedAt; String? get uploadedTo; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String get name; String? get description; Map<String, dynamic>? get fileMeta; Map<String, dynamic>? get userMeta; SnFilePool? get pool; List<int> get sensitiveMarks; String? get mimeType; String? get hash; int get size; DateTime? get uploadedAt; String? get uploadedTo; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnCloudFile
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -291,16 +294,16 @@ $SnCloudFileCopyWith<SnCloudFile> get copyWith => _$SnCloudFileCopyWithImpl<SnCl
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnCloudFile&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other.fileMeta, fileMeta)&&const DeepCollectionEquality().equals(other.userMeta, userMeta)&&const DeepCollectionEquality().equals(other.sensitiveMarks, sensitiveMarks)&&(identical(other.mimeType, mimeType) || other.mimeType == mimeType)&&(identical(other.hash, hash) || other.hash == hash)&&(identical(other.size, size) || other.size == size)&&(identical(other.uploadedAt, uploadedAt) || other.uploadedAt == uploadedAt)&&(identical(other.uploadedTo, uploadedTo) || other.uploadedTo == uploadedTo)&&(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 SnCloudFile&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other.fileMeta, fileMeta)&&const DeepCollectionEquality().equals(other.userMeta, userMeta)&&(identical(other.pool, pool) || other.pool == pool)&&const DeepCollectionEquality().equals(other.sensitiveMarks, sensitiveMarks)&&(identical(other.mimeType, mimeType) || other.mimeType == mimeType)&&(identical(other.hash, hash) || other.hash == hash)&&(identical(other.size, size) || other.size == size)&&(identical(other.uploadedAt, uploadedAt) || other.uploadedAt == uploadedAt)&&(identical(other.uploadedTo, uploadedTo) || other.uploadedTo == uploadedTo)&&(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,name,description,const DeepCollectionEquality().hash(fileMeta),const DeepCollectionEquality().hash(userMeta),const DeepCollectionEquality().hash(sensitiveMarks),mimeType,hash,size,uploadedAt,uploadedTo,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,name,description,const DeepCollectionEquality().hash(fileMeta),const DeepCollectionEquality().hash(userMeta),pool,const DeepCollectionEquality().hash(sensitiveMarks),mimeType,hash,size,uploadedAt,uploadedTo,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnCloudFile(id: $id, name: $name, description: $description, fileMeta: $fileMeta, userMeta: $userMeta, sensitiveMarks: $sensitiveMarks, mimeType: $mimeType, hash: $hash, size: $size, uploadedAt: $uploadedAt, uploadedTo: $uploadedTo, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnCloudFile(id: $id, name: $name, description: $description, fileMeta: $fileMeta, userMeta: $userMeta, pool: $pool, sensitiveMarks: $sensitiveMarks, mimeType: $mimeType, hash: $hash, size: $size, uploadedAt: $uploadedAt, uploadedTo: $uploadedTo, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -311,11 +314,11 @@ abstract mixin class $SnCloudFileCopyWith<$Res>  {
   factory $SnCloudFileCopyWith(SnCloudFile value, $Res Function(SnCloudFile) _then) = _$SnCloudFileCopyWithImpl;
 @useResult
 $Res call({
- String id, String name, String? description, Map<String, dynamic>? fileMeta, Map<String, dynamic>? userMeta, List<int> sensitiveMarks, String? mimeType, String? hash, int size, DateTime? uploadedAt, String? uploadedTo, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String name, String? description, Map<String, dynamic>? fileMeta, Map<String, dynamic>? userMeta, SnFilePool? pool, List<int> sensitiveMarks, String? mimeType, String? hash, int size, DateTime? uploadedAt, String? uploadedTo, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
-
+$SnFilePoolCopyWith<$Res>? get pool;
 
 }
 /// @nodoc
@@ -328,14 +331,15 @@ class _$SnCloudFileCopyWithImpl<$Res>
 
 /// Create a copy of SnCloudFile
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? fileMeta = freezed,Object? userMeta = freezed,Object? sensitiveMarks = null,Object? mimeType = freezed,Object? hash = freezed,Object? size = null,Object? uploadedAt = freezed,Object? uploadedTo = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? fileMeta = freezed,Object? userMeta = freezed,Object? pool = freezed,Object? sensitiveMarks = null,Object? mimeType = freezed,Object? hash = freezed,Object? size = null,Object? uploadedAt = freezed,Object? uploadedTo = 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,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,fileMeta: freezed == fileMeta ? _self.fileMeta : fileMeta // ignore: cast_nullable_to_non_nullable
 as Map<String, dynamic>?,userMeta: freezed == userMeta ? _self.userMeta : userMeta // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>?,sensitiveMarks: null == sensitiveMarks ? _self.sensitiveMarks : sensitiveMarks // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,pool: freezed == pool ? _self.pool : pool // ignore: cast_nullable_to_non_nullable
+as SnFilePool?,sensitiveMarks: null == sensitiveMarks ? _self.sensitiveMarks : sensitiveMarks // ignore: cast_nullable_to_non_nullable
 as List<int>,mimeType: freezed == mimeType ? _self.mimeType : mimeType // ignore: cast_nullable_to_non_nullable
 as String?,hash: freezed == hash ? _self.hash : hash // ignore: cast_nullable_to_non_nullable
 as String?,size: null == size ? _self.size : size // ignore: cast_nullable_to_non_nullable
@@ -347,7 +351,19 @@ as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ign
 as DateTime?,
   ));
 }
+/// Create a copy of SnCloudFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnFilePoolCopyWith<$Res>? get pool {
+    if (_self.pool == null) {
+    return null;
+  }
 
+  return $SnFilePoolCopyWith<$Res>(_self.pool!, (value) {
+    return _then(_self.copyWith(pool: value));
+  });
+}
 }
 
 
@@ -426,10 +442,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String name,  String? description,  Map<String, dynamic>? fileMeta,  Map<String, dynamic>? userMeta,  List<int> sensitiveMarks,  String? mimeType,  String? hash,  int size,  DateTime? uploadedAt,  String? uploadedTo,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String name,  String? description,  Map<String, dynamic>? fileMeta,  Map<String, dynamic>? userMeta,  SnFilePool? pool,  List<int> sensitiveMarks,  String? mimeType,  String? hash,  int size,  DateTime? uploadedAt,  String? uploadedTo,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnCloudFile() when $default != null:
-return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userMeta,_that.sensitiveMarks,_that.mimeType,_that.hash,_that.size,_that.uploadedAt,_that.uploadedTo,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userMeta,_that.pool,_that.sensitiveMarks,_that.mimeType,_that.hash,_that.size,_that.uploadedAt,_that.uploadedTo,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return orElse();
 
 }
@@ -447,10 +463,10 @@ return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userM
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String name,  String? description,  Map<String, dynamic>? fileMeta,  Map<String, dynamic>? userMeta,  List<int> sensitiveMarks,  String? mimeType,  String? hash,  int size,  DateTime? uploadedAt,  String? uploadedTo,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String name,  String? description,  Map<String, dynamic>? fileMeta,  Map<String, dynamic>? userMeta,  SnFilePool? pool,  List<int> sensitiveMarks,  String? mimeType,  String? hash,  int size,  DateTime? uploadedAt,  String? uploadedTo,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnCloudFile():
-return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userMeta,_that.sensitiveMarks,_that.mimeType,_that.hash,_that.size,_that.uploadedAt,_that.uploadedTo,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userMeta,_that.pool,_that.sensitiveMarks,_that.mimeType,_that.hash,_that.size,_that.uploadedAt,_that.uploadedTo,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -464,10 +480,10 @@ return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userM
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String name,  String? description,  Map<String, dynamic>? fileMeta,  Map<String, dynamic>? userMeta,  List<int> sensitiveMarks,  String? mimeType,  String? hash,  int size,  DateTime? uploadedAt,  String? uploadedTo,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String name,  String? description,  Map<String, dynamic>? fileMeta,  Map<String, dynamic>? userMeta,  SnFilePool? pool,  List<int> sensitiveMarks,  String? mimeType,  String? hash,  int size,  DateTime? uploadedAt,  String? uploadedTo,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnCloudFile() when $default != null:
-return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userMeta,_that.sensitiveMarks,_that.mimeType,_that.hash,_that.size,_that.uploadedAt,_that.uploadedTo,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userMeta,_that.pool,_that.sensitiveMarks,_that.mimeType,_that.hash,_that.size,_that.uploadedAt,_that.uploadedTo,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return null;
 
 }
@@ -479,7 +495,7 @@ return $default(_that.id,_that.name,_that.description,_that.fileMeta,_that.userM
 @JsonSerializable()
 
 class _SnCloudFile implements SnCloudFile {
-  const _SnCloudFile({required this.id, required this.name, required this.description, required final  Map<String, dynamic>? fileMeta, required final  Map<String, dynamic>? userMeta, final  List<int> sensitiveMarks = const [], required this.mimeType, required this.hash, required this.size, required this.uploadedAt, required this.uploadedTo, required this.createdAt, required this.updatedAt, required this.deletedAt}): _fileMeta = fileMeta,_userMeta = userMeta,_sensitiveMarks = sensitiveMarks;
+  const _SnCloudFile({required this.id, required this.name, required this.description, required final  Map<String, dynamic>? fileMeta, required final  Map<String, dynamic>? userMeta, required this.pool, final  List<int> sensitiveMarks = const [], required this.mimeType, required this.hash, required this.size, required this.uploadedAt, required this.uploadedTo, required this.createdAt, required this.updatedAt, required this.deletedAt}): _fileMeta = fileMeta,_userMeta = userMeta,_sensitiveMarks = sensitiveMarks;
   factory _SnCloudFile.fromJson(Map<String, dynamic> json) => _$SnCloudFileFromJson(json);
 
 @override final  String id;
@@ -503,6 +519,7 @@ class _SnCloudFile implements SnCloudFile {
   return EqualUnmodifiableMapView(value);
 }
 
+@override final  SnFilePool? pool;
  final  List<int> _sensitiveMarks;
 @override@JsonKey() List<int> get sensitiveMarks {
   if (_sensitiveMarks is EqualUnmodifiableListView) return _sensitiveMarks;
@@ -532,16 +549,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnCloudFile&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other._fileMeta, _fileMeta)&&const DeepCollectionEquality().equals(other._userMeta, _userMeta)&&const DeepCollectionEquality().equals(other._sensitiveMarks, _sensitiveMarks)&&(identical(other.mimeType, mimeType) || other.mimeType == mimeType)&&(identical(other.hash, hash) || other.hash == hash)&&(identical(other.size, size) || other.size == size)&&(identical(other.uploadedAt, uploadedAt) || other.uploadedAt == uploadedAt)&&(identical(other.uploadedTo, uploadedTo) || other.uploadedTo == uploadedTo)&&(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 _SnCloudFile&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other._fileMeta, _fileMeta)&&const DeepCollectionEquality().equals(other._userMeta, _userMeta)&&(identical(other.pool, pool) || other.pool == pool)&&const DeepCollectionEquality().equals(other._sensitiveMarks, _sensitiveMarks)&&(identical(other.mimeType, mimeType) || other.mimeType == mimeType)&&(identical(other.hash, hash) || other.hash == hash)&&(identical(other.size, size) || other.size == size)&&(identical(other.uploadedAt, uploadedAt) || other.uploadedAt == uploadedAt)&&(identical(other.uploadedTo, uploadedTo) || other.uploadedTo == uploadedTo)&&(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,name,description,const DeepCollectionEquality().hash(_fileMeta),const DeepCollectionEquality().hash(_userMeta),const DeepCollectionEquality().hash(_sensitiveMarks),mimeType,hash,size,uploadedAt,uploadedTo,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,name,description,const DeepCollectionEquality().hash(_fileMeta),const DeepCollectionEquality().hash(_userMeta),pool,const DeepCollectionEquality().hash(_sensitiveMarks),mimeType,hash,size,uploadedAt,uploadedTo,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnCloudFile(id: $id, name: $name, description: $description, fileMeta: $fileMeta, userMeta: $userMeta, sensitiveMarks: $sensitiveMarks, mimeType: $mimeType, hash: $hash, size: $size, uploadedAt: $uploadedAt, uploadedTo: $uploadedTo, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnCloudFile(id: $id, name: $name, description: $description, fileMeta: $fileMeta, userMeta: $userMeta, pool: $pool, sensitiveMarks: $sensitiveMarks, mimeType: $mimeType, hash: $hash, size: $size, uploadedAt: $uploadedAt, uploadedTo: $uploadedTo, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -552,11 +569,11 @@ abstract mixin class _$SnCloudFileCopyWith<$Res> implements $SnCloudFileCopyWith
   factory _$SnCloudFileCopyWith(_SnCloudFile value, $Res Function(_SnCloudFile) _then) = __$SnCloudFileCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String name, String? description, Map<String, dynamic>? fileMeta, Map<String, dynamic>? userMeta, List<int> sensitiveMarks, String? mimeType, String? hash, int size, DateTime? uploadedAt, String? uploadedTo, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String name, String? description, Map<String, dynamic>? fileMeta, Map<String, dynamic>? userMeta, SnFilePool? pool, List<int> sensitiveMarks, String? mimeType, String? hash, int size, DateTime? uploadedAt, String? uploadedTo, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
-
+@override $SnFilePoolCopyWith<$Res>? get pool;
 
 }
 /// @nodoc
@@ -569,14 +586,15 @@ class __$SnCloudFileCopyWithImpl<$Res>
 
 /// Create a copy of SnCloudFile
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? fileMeta = freezed,Object? userMeta = freezed,Object? sensitiveMarks = null,Object? mimeType = freezed,Object? hash = freezed,Object? size = null,Object? uploadedAt = freezed,Object? uploadedTo = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? fileMeta = freezed,Object? userMeta = freezed,Object? pool = freezed,Object? sensitiveMarks = null,Object? mimeType = freezed,Object? hash = freezed,Object? size = null,Object? uploadedAt = freezed,Object? uploadedTo = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnCloudFile(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,fileMeta: freezed == fileMeta ? _self._fileMeta : fileMeta // ignore: cast_nullable_to_non_nullable
 as Map<String, dynamic>?,userMeta: freezed == userMeta ? _self._userMeta : userMeta // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>?,sensitiveMarks: null == sensitiveMarks ? _self._sensitiveMarks : sensitiveMarks // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,pool: freezed == pool ? _self.pool : pool // ignore: cast_nullable_to_non_nullable
+as SnFilePool?,sensitiveMarks: null == sensitiveMarks ? _self._sensitiveMarks : sensitiveMarks // ignore: cast_nullable_to_non_nullable
 as List<int>,mimeType: freezed == mimeType ? _self.mimeType : mimeType // ignore: cast_nullable_to_non_nullable
 as String?,hash: freezed == hash ? _self.hash : hash // ignore: cast_nullable_to_non_nullable
 as String?,size: null == size ? _self.size : size // ignore: cast_nullable_to_non_nullable
@@ -589,7 +607,19 @@ as DateTime?,
   ));
 }
 
+/// Create a copy of SnCloudFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnFilePoolCopyWith<$Res>? get pool {
+    if (_self.pool == null) {
+    return null;
+  }
 
+  return $SnFilePoolCopyWith<$Res>(_self.pool!, (value) {
+    return _then(_self.copyWith(pool: value));
+  });
+}
 }
 
 // dart format on

lib/models/file.g.dart

@@ -11,6 +11,7 @@ _UniversalFile _$UniversalFileFromJson(Map<String, dynamic> json) =>
       data: json['data'],
       type: $enumDecode(_$UniversalFileTypeEnumMap, json['type']),
       isLink: json['is_link'] as bool? ?? false,
+      displayName: json['display_name'] as String?,
     );
 
 Map<String, dynamic> _$UniversalFileToJson(_UniversalFile instance) =>
@@ -18,6 +19,7 @@ Map<String, dynamic> _$UniversalFileToJson(_UniversalFile instance) =>
       'data': instance.data,
       'type': _$UniversalFileTypeEnumMap[instance.type]!,
       'is_link': instance.isLink,
+      'display_name': instance.displayName,
     };
 
 const _$UniversalFileTypeEnumMap = {
@@ -33,6 +35,10 @@ _SnCloudFile _$SnCloudFileFromJson(Map<String, dynamic> json) => _SnCloudFile(
   description: json['description'] as String?,
   fileMeta: json['file_meta'] as Map<String, dynamic>?,
   userMeta: json['user_meta'] as Map<String, dynamic>?,
+  pool:
+      json['pool'] == null
+          ? null
+          : SnFilePool.fromJson(json['pool'] as Map<String, dynamic>),
   sensitiveMarks:
       (json['sensitive_marks'] as List<dynamic>?)
           ?.map((e) => (e as num).toInt())
@@ -61,6 +67,7 @@ Map<String, dynamic> _$SnCloudFileToJson(_SnCloudFile instance) =>
       'description': instance.description,
       'file_meta': instance.fileMeta,
       'user_meta': instance.userMeta,
+      'pool': instance.pool?.toJson(),
       'sensitive_marks': instance.sensitiveMarks,
       'mime_type': instance.mimeType,
       'hash': instance.hash,

lib/models/file_pool.dart

@@ -0,0 +1,25 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'file_pool.freezed.dart';
+part 'file_pool.g.dart';
+
+@freezed
+sealed class SnFilePool with _$SnFilePool {
+  const factory SnFilePool({
+    required String id,
+    required String name,
+    String? description,
+    Map<String, dynamic>? storageConfig,
+    Map<String, dynamic>? billingConfig,
+    Map<String, dynamic>? policyConfig,
+    bool? isHidden,
+    String? accountId,
+    String? resourceIdentifier,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    DateTime? deletedAt,
+  }) = _SnFilePool;
+
+  factory SnFilePool.fromJson(Map<String, dynamic> json) =>
+      _$SnFilePoolFromJson(json);
+}

lib/models/file_pool.freezed.dart

@@ -0,0 +1,328 @@
+// 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 'file_pool.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnFilePool {
+
+ String get id; String get name; String? get description; Map<String, dynamic>? get storageConfig; Map<String, dynamic>? get billingConfig; Map<String, dynamic>? get policyConfig; bool? get isHidden; String? get accountId; String? get resourceIdentifier; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnFilePoolCopyWith<SnFilePool> get copyWith => _$SnFilePoolCopyWithImpl<SnFilePool>(this as SnFilePool, _$identity);
+
+  /// Serializes this SnFilePool to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnFilePool&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other.storageConfig, storageConfig)&&const DeepCollectionEquality().equals(other.billingConfig, billingConfig)&&const DeepCollectionEquality().equals(other.policyConfig, policyConfig)&&(identical(other.isHidden, isHidden) || other.isHidden == isHidden)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&(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,name,description,const DeepCollectionEquality().hash(storageConfig),const DeepCollectionEquality().hash(billingConfig),const DeepCollectionEquality().hash(policyConfig),isHidden,accountId,resourceIdentifier,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnFilePool(id: $id, name: $name, description: $description, storageConfig: $storageConfig, billingConfig: $billingConfig, policyConfig: $policyConfig, isHidden: $isHidden, accountId: $accountId, resourceIdentifier: $resourceIdentifier, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnFilePoolCopyWith<$Res>  {
+  factory $SnFilePoolCopyWith(SnFilePool value, $Res Function(SnFilePool) _then) = _$SnFilePoolCopyWithImpl;
+@useResult
+$Res call({
+ String id, String name, String? description, Map<String, dynamic>? storageConfig, Map<String, dynamic>? billingConfig, Map<String, dynamic>? policyConfig, bool? isHidden, String? accountId, String? resourceIdentifier, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnFilePoolCopyWithImpl<$Res>
+    implements $SnFilePoolCopyWith<$Res> {
+  _$SnFilePoolCopyWithImpl(this._self, this._then);
+
+  final SnFilePool _self;
+  final $Res Function(SnFilePool) _then;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? storageConfig = freezed,Object? billingConfig = freezed,Object? policyConfig = freezed,Object? isHidden = freezed,Object? accountId = freezed,Object? resourceIdentifier = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,storageConfig: freezed == storageConfig ? _self.storageConfig : storageConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,billingConfig: freezed == billingConfig ? _self.billingConfig : billingConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,policyConfig: freezed == policyConfig ? _self.policyConfig : policyConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,isHidden: freezed == isHidden ? _self.isHidden : isHidden // ignore: cast_nullable_to_non_nullable
+as bool?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String?,resourceIdentifier: freezed == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
+as String?,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?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnFilePool].
+extension SnFilePoolPatterns on SnFilePool {
+/// 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( _SnFilePool value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnFilePool() 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( _SnFilePool value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnFilePool():
+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( _SnFilePool value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnFilePool() 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 name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_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 name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnFilePool():
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_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 name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnFilePool implements SnFilePool {
+  const _SnFilePool({required this.id, required this.name, this.description, final  Map<String, dynamic>? storageConfig, final  Map<String, dynamic>? billingConfig, final  Map<String, dynamic>? policyConfig, this.isHidden, this.accountId, this.resourceIdentifier, this.createdAt, this.updatedAt, this.deletedAt}): _storageConfig = storageConfig,_billingConfig = billingConfig,_policyConfig = policyConfig;
+  factory _SnFilePool.fromJson(Map<String, dynamic> json) => _$SnFilePoolFromJson(json);
+
+@override final  String id;
+@override final  String name;
+@override final  String? description;
+ final  Map<String, dynamic>? _storageConfig;
+@override Map<String, dynamic>? get storageConfig {
+  final value = _storageConfig;
+  if (value == null) return null;
+  if (_storageConfig is EqualUnmodifiableMapView) return _storageConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+ final  Map<String, dynamic>? _billingConfig;
+@override Map<String, dynamic>? get billingConfig {
+  final value = _billingConfig;
+  if (value == null) return null;
+  if (_billingConfig is EqualUnmodifiableMapView) return _billingConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+ final  Map<String, dynamic>? _policyConfig;
+@override Map<String, dynamic>? get policyConfig {
+  final value = _policyConfig;
+  if (value == null) return null;
+  if (_policyConfig is EqualUnmodifiableMapView) return _policyConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+@override final  bool? isHidden;
+@override final  String? accountId;
+@override final  String? resourceIdentifier;
+@override final  DateTime? createdAt;
+@override final  DateTime? updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnFilePoolCopyWith<_SnFilePool> get copyWith => __$SnFilePoolCopyWithImpl<_SnFilePool>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnFilePoolToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnFilePool&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other._storageConfig, _storageConfig)&&const DeepCollectionEquality().equals(other._billingConfig, _billingConfig)&&const DeepCollectionEquality().equals(other._policyConfig, _policyConfig)&&(identical(other.isHidden, isHidden) || other.isHidden == isHidden)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&(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,name,description,const DeepCollectionEquality().hash(_storageConfig),const DeepCollectionEquality().hash(_billingConfig),const DeepCollectionEquality().hash(_policyConfig),isHidden,accountId,resourceIdentifier,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnFilePool(id: $id, name: $name, description: $description, storageConfig: $storageConfig, billingConfig: $billingConfig, policyConfig: $policyConfig, isHidden: $isHidden, accountId: $accountId, resourceIdentifier: $resourceIdentifier, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnFilePoolCopyWith<$Res> implements $SnFilePoolCopyWith<$Res> {
+  factory _$SnFilePoolCopyWith(_SnFilePool value, $Res Function(_SnFilePool) _then) = __$SnFilePoolCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String name, String? description, Map<String, dynamic>? storageConfig, Map<String, dynamic>? billingConfig, Map<String, dynamic>? policyConfig, bool? isHidden, String? accountId, String? resourceIdentifier, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnFilePoolCopyWithImpl<$Res>
+    implements _$SnFilePoolCopyWith<$Res> {
+  __$SnFilePoolCopyWithImpl(this._self, this._then);
+
+  final _SnFilePool _self;
+  final $Res Function(_SnFilePool) _then;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? storageConfig = freezed,Object? billingConfig = freezed,Object? policyConfig = freezed,Object? isHidden = freezed,Object? accountId = freezed,Object? resourceIdentifier = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,}) {
+  return _then(_SnFilePool(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,storageConfig: freezed == storageConfig ? _self._storageConfig : storageConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,billingConfig: freezed == billingConfig ? _self._billingConfig : billingConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,policyConfig: freezed == policyConfig ? _self._policyConfig : policyConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,isHidden: freezed == isHidden ? _self.isHidden : isHidden // ignore: cast_nullable_to_non_nullable
+as bool?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String?,resourceIdentifier: freezed == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
+as String?,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?,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/file_pool.g.dart

@@ -0,0 +1,47 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'file_pool.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnFilePool _$SnFilePoolFromJson(Map<String, dynamic> json) => _SnFilePool(
+  id: json['id'] as String,
+  name: json['name'] as String,
+  description: json['description'] as String?,
+  storageConfig: json['storage_config'] as Map<String, dynamic>?,
+  billingConfig: json['billing_config'] as Map<String, dynamic>?,
+  policyConfig: json['policy_config'] as Map<String, dynamic>?,
+  isHidden: json['is_hidden'] as bool?,
+  accountId: json['account_id'] as String?,
+  resourceIdentifier: json['resource_identifier'] as String?,
+  createdAt:
+      json['created_at'] == null
+          ? null
+          : DateTime.parse(json['created_at'] as String),
+  updatedAt:
+      json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
+  deletedAt:
+      json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+);
+
+Map<String, dynamic> _$SnFilePoolToJson(_SnFilePool instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'description': instance.description,
+      'storage_config': instance.storageConfig,
+      'billing_config': instance.billingConfig,
+      'policy_config': instance.policyConfig,
+      'is_hidden': instance.isHidden,
+      'account_id': instance.accountId,
+      'resource_identifier': instance.resourceIdentifier,
+      'created_at': instance.createdAt?.toIso8601String(),
+      'updated_at': instance.updatedAt?.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };

lib/models/wallet.dart

@@ -20,6 +20,24 @@ sealed class SnWallet with _$SnWallet {
       _$SnWalletFromJson(json);
 }
 
+@freezed
+sealed class SnWalletStats with _$SnWalletStats {
+  const factory SnWalletStats({
+    required DateTime periodBegin,
+    required DateTime periodEnd,
+    required int totalTransactions,
+    required int totalOrders,
+    required double totalIncome,
+    required double totalOutgoing,
+    required double sum,
+    @Default({}) Map<String, double> incomeCategories,
+    @Default({}) Map<String, double> outgoingCategories,
+  }) = _SnWalletStats;
+
+  factory SnWalletStats.fromJson(Map<String, dynamic> json) =>
+      _$SnWalletStatsFromJson(json);
+}
+
 @freezed
 sealed class SnWalletPocket with _$SnWalletPocket {
   const factory SnWalletPocket({
@@ -124,3 +142,72 @@ sealed class SnWalletOrder with _$SnWalletOrder {
   factory SnWalletOrder.fromJson(Map<String, dynamic> json) =>
       _$SnWalletOrderFromJson(json);
 }
+
+@freezed
+sealed class SnWalletGift with _$SnWalletGift {
+  const factory SnWalletGift({
+    required String id,
+    required String giftCode,
+    required String subscriptionIdentifier,
+    required String? recipientId,
+    required SnAccount? recipient,
+    required String gifterId,
+    required SnAccount? gifter,
+    required String? redeemerId,
+    required SnAccount? redeemer,
+    required String? message,
+    required int status,
+    required DateTime? redeemedAt,
+    required DateTime? expiredAt,
+    required String? subscriptionId,
+    required SnWalletSubscription? subscription,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnWalletGift;
+
+  factory SnWalletGift.fromJson(Map<String, dynamic> json) =>
+      _$SnWalletGiftFromJson(json);
+}
+
+@freezed
+sealed class SnWalletFund with _$SnWalletFund {
+  const factory SnWalletFund({
+    required String id,
+    required String currency,
+    required double totalAmount,
+    required int splitType, // 0: even, 1: random
+    required int
+    status, // 0: created, 1: partially claimed, 2: fully claimed, 3: expired
+    required String? message,
+    required String creatorAccountId,
+    required SnAccount? creatorAccount,
+    required DateTime expiredAt,
+    required List<SnWalletFundRecipient> recipients,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnWalletFund;
+
+  factory SnWalletFund.fromJson(Map<String, dynamic> json) =>
+      _$SnWalletFundFromJson(json);
+}
+
+@freezed
+sealed class SnWalletFundRecipient with _$SnWalletFundRecipient {
+  const factory SnWalletFundRecipient({
+    required String id,
+    required String fundId,
+    required String recipientAccountId,
+    required SnAccount? recipientAccount,
+    required double amount,
+    required bool isReceived,
+    required DateTime? receivedAt,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnWalletFundRecipient;
+
+  factory SnWalletFundRecipient.fromJson(Map<String, dynamic> json) =>
+      _$SnWalletFundRecipientFromJson(json);
+}

lib/models/wallet.g.dart

@@ -35,6 +35,40 @@ Map<String, dynamic> _$SnWalletToJson(_SnWallet instance) => <String, dynamic>{
   'deleted_at': instance.deletedAt?.toIso8601String(),
 };
 
+_SnWalletStats _$SnWalletStatsFromJson(Map<String, dynamic> json) =>
+    _SnWalletStats(
+      periodBegin: DateTime.parse(json['period_begin'] as String),
+      periodEnd: DateTime.parse(json['period_end'] as String),
+      totalTransactions: (json['total_transactions'] as num).toInt(),
+      totalOrders: (json['total_orders'] as num).toInt(),
+      totalIncome: (json['total_income'] as num).toDouble(),
+      totalOutgoing: (json['total_outgoing'] as num).toDouble(),
+      sum: (json['sum'] as num).toDouble(),
+      incomeCategories:
+          (json['income_categories'] as Map<String, dynamic>?)?.map(
+            (k, e) => MapEntry(k, (e as num).toDouble()),
+          ) ??
+          const {},
+      outgoingCategories:
+          (json['outgoing_categories'] as Map<String, dynamic>?)?.map(
+            (k, e) => MapEntry(k, (e as num).toDouble()),
+          ) ??
+          const {},
+    );
+
+Map<String, dynamic> _$SnWalletStatsToJson(_SnWalletStats instance) =>
+    <String, dynamic>{
+      'period_begin': instance.periodBegin.toIso8601String(),
+      'period_end': instance.periodEnd.toIso8601String(),
+      'total_transactions': instance.totalTransactions,
+      'total_orders': instance.totalOrders,
+      'total_income': instance.totalIncome,
+      'total_outgoing': instance.totalOutgoing,
+      'sum': instance.sum,
+      'income_categories': instance.incomeCategories,
+      'outgoing_categories': instance.outgoingCategories,
+    };
+
 _SnWalletPocket _$SnWalletPocketFromJson(Map<String, dynamic> json) =>
     _SnWalletPocket(
       id: json['id'] as String,
@@ -228,3 +262,155 @@ Map<String, dynamic> _$SnWalletOrderToJson(_SnWalletOrder instance) =>
       'updated_at': instance.updatedAt.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),
     };
+
+_SnWalletGift _$SnWalletGiftFromJson(Map<String, dynamic> json) =>
+    _SnWalletGift(
+      id: json['id'] as String,
+      giftCode: json['gift_code'] as String,
+      subscriptionIdentifier: json['subscription_identifier'] as String,
+      recipientId: json['recipient_id'] as String?,
+      recipient:
+          json['recipient'] == null
+              ? null
+              : SnAccount.fromJson(json['recipient'] as Map<String, dynamic>),
+      gifterId: json['gifter_id'] as String,
+      gifter:
+          json['gifter'] == null
+              ? null
+              : SnAccount.fromJson(json['gifter'] as Map<String, dynamic>),
+      redeemerId: json['redeemer_id'] as String?,
+      redeemer:
+          json['redeemer'] == null
+              ? null
+              : SnAccount.fromJson(json['redeemer'] as Map<String, dynamic>),
+      message: json['message'] as String?,
+      status: (json['status'] as num).toInt(),
+      redeemedAt:
+          json['redeemed_at'] == null
+              ? null
+              : DateTime.parse(json['redeemed_at'] as String),
+      expiredAt:
+          json['expired_at'] == null
+              ? null
+              : DateTime.parse(json['expired_at'] as String),
+      subscriptionId: json['subscription_id'] as String?,
+      subscription:
+          json['subscription'] == null
+              ? null
+              : SnWalletSubscription.fromJson(
+                json['subscription'] 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> _$SnWalletGiftToJson(_SnWalletGift instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'gift_code': instance.giftCode,
+      'subscription_identifier': instance.subscriptionIdentifier,
+      'recipient_id': instance.recipientId,
+      'recipient': instance.recipient?.toJson(),
+      'gifter_id': instance.gifterId,
+      'gifter': instance.gifter?.toJson(),
+      'redeemer_id': instance.redeemerId,
+      'redeemer': instance.redeemer?.toJson(),
+      'message': instance.message,
+      'status': instance.status,
+      'redeemed_at': instance.redeemedAt?.toIso8601String(),
+      'expired_at': instance.expiredAt?.toIso8601String(),
+      'subscription_id': instance.subscriptionId,
+      'subscription': instance.subscription?.toJson(),
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };
+
+_SnWalletFund _$SnWalletFundFromJson(
+  Map<String, dynamic> json,
+) => _SnWalletFund(
+  id: json['id'] as String,
+  currency: json['currency'] as String,
+  totalAmount: (json['total_amount'] as num).toDouble(),
+  splitType: (json['split_type'] as num).toInt(),
+  status: (json['status'] as num).toInt(),
+  message: json['message'] as String?,
+  creatorAccountId: json['creator_account_id'] as String,
+  creatorAccount:
+      json['creator_account'] == null
+          ? null
+          : SnAccount.fromJson(json['creator_account'] as Map<String, dynamic>),
+  expiredAt: DateTime.parse(json['expired_at'] as String),
+  recipients:
+      (json['recipients'] as List<dynamic>)
+          .map((e) => SnWalletFundRecipient.fromJson(e as Map<String, dynamic>))
+          .toList(),
+  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> _$SnWalletFundToJson(_SnWalletFund instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'currency': instance.currency,
+      'total_amount': instance.totalAmount,
+      'split_type': instance.splitType,
+      'status': instance.status,
+      'message': instance.message,
+      'creator_account_id': instance.creatorAccountId,
+      'creator_account': instance.creatorAccount?.toJson(),
+      'expired_at': instance.expiredAt.toIso8601String(),
+      'recipients': instance.recipients.map((e) => e.toJson()).toList(),
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };
+
+_SnWalletFundRecipient _$SnWalletFundRecipientFromJson(
+  Map<String, dynamic> json,
+) => _SnWalletFundRecipient(
+  id: json['id'] as String,
+  fundId: json['fund_id'] as String,
+  recipientAccountId: json['recipient_account_id'] as String,
+  recipientAccount:
+      json['recipient_account'] == null
+          ? null
+          : SnAccount.fromJson(
+            json['recipient_account'] as Map<String, dynamic>,
+          ),
+  amount: (json['amount'] as num).toDouble(),
+  isReceived: json['is_received'] as bool,
+  receivedAt:
+      json['received_at'] == null
+          ? null
+          : DateTime.parse(json['received_at'] 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> _$SnWalletFundRecipientToJson(
+  _SnWalletFundRecipient instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'fund_id': instance.fundId,
+  'recipient_account_id': instance.recipientAccountId,
+  'recipient_account': instance.recipientAccount?.toJson(),
+  'amount': instance.amount,
+  'is_received': instance.isReceived,
+  'received_at': instance.receivedAt?.toIso8601String(),
+  'created_at': instance.createdAt.toIso8601String(),
+  'updated_at': instance.updatedAt.toIso8601String(),
+  'deleted_at': instance.deletedAt?.toIso8601String(),
+};

lib/pods/activity/activity_rpc.dart

@@ -0,0 +1,454 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/account.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/talker.dart';
+import 'package:island/widgets/account/status.dart';
+import 'package:shelf/shelf.dart';
+import 'package:shelf/shelf_io.dart' as shelf_io;
+import 'package:shelf_web_socket/shelf_web_socket.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+
+// Conditional imports for IPC server - use web stubs on web platform
+import 'ipc_server.dart' if (dart.library.html) 'ipc_server.web.dart';
+
+const String kRpcLogPrefix = 'arRPC.websocket';
+const String kRpcIpcLogPrefix = 'arRPC.ipc';
+
+// IPC Constants
+const String kIpcBasePath = 'discord-ipc';
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// Reference https://github.com/OpenAsar/arrpc/blob/main/src/transports/ipc.js
+class ActivityRpcServer {
+  static const List<int> portRange = [6463, 6472]; // Ports 6463–6472
+  Map<String, Function>
+  handlers; // {connection: (socket), message: (socket, data), close: (socket)}
+  HttpServer? _httpServer;
+  IpcServer? _ipcServer;
+  final List<WebSocketChannel> _wsSockets = [];
+
+  ActivityRpcServer(this.handlers);
+
+  void updateHandlers(Map<String, Function> newHandlers) {
+    handlers = newHandlers;
+  }
+
+  // Start the server
+  Future<void> start() async {
+    int port = portRange[0];
+    bool wsSuccess = false;
+
+    // Start WebSocket server
+    while (port <= portRange[1]) {
+      talker.log('[$kRpcLogPrefix] Trying port $port');
+      try {
+        _httpServer = await HttpServer.bind(InternetAddress.loopbackIPv4, port);
+        talker.log('[$kRpcLogPrefix] Listening on $port');
+
+        shelf_io.serveRequests(_httpServer!, (Request request) async {
+          talker.log('[$kRpcLogPrefix] New request');
+          if (request.headers['upgrade']?.toLowerCase() == 'websocket') {
+            final handler = webSocketHandler((WebSocketChannel channel, _) {
+              _wsSockets.add(channel);
+              _onWsConnection(channel, request);
+            });
+            return handler(request);
+          }
+          talker.log('New request disposed due to not websocket');
+          return Response.notFound('Not a WebSocket request');
+        });
+        wsSuccess = true;
+        break;
+      } catch (e) {
+        if (e is SocketException && e.osError?.errorCode == 98) {
+          talker.log('[$kRpcLogPrefix] $port in use!');
+        } else {
+          talker.log('[$kRpcLogPrefix] HTTP error: $e');
+        }
+        port++;
+        await Future.delayed(Duration(milliseconds: 100)); // Add delay
+      }
+    }
+
+    if (!wsSuccess) {
+      throw Exception(
+        'Failed to bind to any port in range ${portRange[0]}–${portRange[1]}',
+      );
+    }
+
+    // Start IPC server
+    final shouldStartIpc = !Platform.isMacOS && !kIsWeb;
+    if (shouldStartIpc) {
+      try {
+        _ipcServer = MultiPlatformIpcServer();
+
+        // Set up IPC handlers
+        _ipcServer!.handlePacket = (socket, packet, _) {
+          _handleIpcPacket(socket, packet);
+        };
+
+        await _ipcServer!.start();
+      } catch (e) {
+        talker.log('[$kRpcLogPrefix] IPC server error: $e');
+      }
+    } else {
+      talker.log('IPC server disabled on macOS or web in production mode');
+    }
+  }
+
+  // Stop the server
+  Future<void> stop() async {
+    // Stop WebSocket server
+    for (var socket in _wsSockets) {
+      try {
+        await socket.sink.close();
+      } catch (e) {
+        talker.log('[$kRpcLogPrefix] Error closing WebSocket: $e');
+      }
+    }
+    _wsSockets.clear();
+    await _httpServer?.close(force: true);
+
+    // Stop IPC server
+    await _ipcServer?.stop();
+
+    talker.log('[$kRpcLogPrefix] Servers stopped');
+  }
+
+  // Handle new WebSocket connection
+  void _onWsConnection(WebSocketChannel socket, Request request) {
+    final uri = request.url;
+    final params = uri.queryParameters;
+    final ver = int.tryParse(params['v'] ?? '1') ?? 1;
+    final encoding = params['encoding'] ?? 'json';
+    final clientId = params['client_id'] ?? '';
+    final origin = request.headers['origin'] ?? '';
+
+    talker.log('New WS connection! origin: $origin, params: $params');
+
+    if (origin.isNotEmpty &&
+        ![
+          'https://discord.com',
+          'https://ptb.discord.com',
+          'https://canary.discord.com',
+        ].contains(origin)) {
+      talker.log('[$kRpcLogPrefix] Disallowed origin: $origin');
+      socket.sink.close();
+      return;
+    }
+
+    if (encoding != 'json') {
+      talker.log('Unsupported encoding requested: $encoding');
+      socket.sink.close();
+      return;
+    }
+
+    if (ver != 1) {
+      talker.log('[$kRpcLogPrefix] Unsupported version requested: $ver');
+      socket.sink.close();
+      return;
+    }
+
+    final socketWithMeta = _WsSocketWrapper(socket, clientId, encoding);
+
+    socket.stream.listen(
+      (data) => _onWsMessage(socketWithMeta, data),
+      onError: (e) {
+        talker.log('[$kRpcLogPrefix] WS socket error: $e');
+      },
+      onDone: () {
+        talker.log('[$kRpcLogPrefix] WS socket closed');
+        handlers['close']?.call(socketWithMeta);
+        _wsSockets.remove(socket);
+      },
+    );
+
+    handlers['connection']?.call(socketWithMeta);
+  }
+
+  // Handle incoming WebSocket message
+  Future<void> _onWsMessage(_WsSocketWrapper socket, dynamic data) async {
+    if (data is! String) {
+      talker.log('Invalid WebSocket message: not a string');
+      return;
+    }
+    try {
+      final jsonData = await compute(jsonDecode, data);
+      if (jsonData is! Map<String, dynamic>) {
+        talker.log('Invalid WebSocket message: not a JSON object');
+        return;
+      }
+      talker.log('[$kRpcLogPrefix] WS message: $jsonData');
+      handlers['message']?.call(socket, jsonData);
+    } catch (e) {
+      talker.log('[$kRpcLogPrefix] WS message parse error: $e');
+    }
+  }
+
+  // Handle IPC packet
+  void _handleIpcPacket(IpcSocketWrapper socket, IpcPacket packet) {
+    switch (packet.type) {
+      case IpcTypes.ping:
+        talker.log('[$kRpcLogPrefix] IPC ping received');
+        socket.sendPong(packet.data);
+        break;
+
+      case IpcTypes.pong:
+        talker.log('[$kRpcLogPrefix] IPC pong received');
+        break;
+
+      case IpcTypes.handshake:
+        if (socket.handshook) {
+          throw Exception('Already handshook');
+        }
+        socket.handshook = true;
+        _onIpcHandshake(socket, packet.data);
+        break;
+
+      case IpcTypes.frame:
+        if (!socket.handshook) {
+          throw Exception('Need to handshake first');
+        }
+        talker.log('[$kRpcLogPrefix] IPC frame: ${packet.data}');
+        handlers['message']?.call(socket, packet.data);
+        break;
+
+      case IpcTypes.close:
+        socket.close();
+        break;
+
+      default:
+        throw Exception('Invalid packet type: ${packet.type}');
+    }
+  }
+
+  // Handle IPC handshake
+  void _onIpcHandshake(IpcSocketWrapper socket, Map<String, dynamic> params) {
+    talker.log('[$kRpcLogPrefix] IPC handshake: $params');
+
+    final ver = int.tryParse(params['v']?.toString() ?? '1') ?? 1;
+    final clientId = params['client_id']?.toString() ?? '';
+
+    if (ver != 1) {
+      talker.log('IPC unsupported version requested: $ver');
+      socket.closeWithCode(IpcErrorCodes.invalidVersion);
+      return;
+    }
+
+    if (clientId.isEmpty) {
+      talker.log('[$kRpcLogPrefix] IPC client ID required');
+      socket.closeWithCode(IpcErrorCodes.invalidClientId);
+      return;
+    }
+
+    socket.clientId = clientId;
+
+    handlers['connection']?.call(socket);
+  }
+}
+
+// WebSocket wrapper
+class _WsSocketWrapper {
+  final WebSocketChannel channel;
+  final String clientId;
+  final String encoding;
+
+  _WsSocketWrapper(this.channel, this.clientId, this.encoding);
+
+  void send(Map<String, dynamic> msg) {
+    talker.log('[$kRpcLogPrefix] WS sending: $msg');
+    channel.sink.add(jsonEncode(msg));
+  }
+}
+
+// State management for server status and activities
+class ServerState {
+  final String status;
+  final List<String> activities;
+
+  ServerState({required this.status, this.activities = const []});
+
+  ServerState copyWith({String? status, List<String>? activities}) {
+    return ServerState(
+      status: status ?? this.status,
+      activities: activities ?? this.activities,
+    );
+  }
+}
+
+class ServerStateNotifier extends StateNotifier<ServerState> {
+  final ActivityRpcServer server;
+
+  ServerStateNotifier(this.server)
+    : super(ServerState(status: 'Server not started'));
+
+  Future<void> start() async {
+    if (!Platform.isAndroid && !Platform.isIOS && !kIsWeb) {
+      try {
+        await server.start();
+        state = state.copyWith(status: 'Server running');
+      } catch (e) {
+        state = state.copyWith(status: 'Server failed: $e');
+      }
+    } else {
+      Future(() {
+        state = state.copyWith(status: 'Server disabled on mobile/web');
+      });
+    }
+  }
+
+  void updateStatus(String status) {
+    state = state.copyWith(status: status);
+  }
+
+  void addActivity(String activity) {
+    state = state.copyWith(activities: [...state.activities, activity]);
+  }
+}
+
+// Providers
+final rpcServerStateProvider =
+    StateNotifierProvider<ServerStateNotifier, ServerState>((ref) {
+      final server = ActivityRpcServer({});
+      final notifier = ServerStateNotifier(server);
+      server.updateHandlers({
+        'connection': (socket) {
+          final clientId =
+              socket is _WsSocketWrapper
+                  ? socket.clientId
+                  : (socket as IpcSocketWrapper).clientId;
+          notifier.updateStatus('Client connected (ID: $clientId)');
+          socket.send({
+            'cmd': 'DISPATCH',
+            'data': {
+              'v': 1,
+              'config': {
+                'cdn_host': 'fake.cdn',
+                'api_endpoint': '//fake.api',
+                'environment': 'dev',
+              },
+              'user': {
+                'id': 'fake_user_id',
+                'username': 'FakeUser',
+                'discriminator': '0001',
+                'avatar': null,
+                'bot': false,
+              },
+            },
+            'evt': 'READY',
+            'nonce': '12345',
+          });
+        },
+        'message': (socket, dynamic data) async {
+          if (data['cmd'] == 'SET_ACTIVITY') {
+            notifier.addActivity(
+              'Activity: ${data['args']['activity']['details'] ?? ''}',
+            );
+            final label = data['args']['activity']['details'] ?? '';
+            final appId = socket.clientId;
+            final meta = data['args']['activity'];
+            try {
+              await setRemoteActivityStatus(ref, label, appId, meta);
+              final now = DateTime.now();
+              final status = SnAccountStatus(
+                id: 'local_$appId',
+                attitude: 0,
+                isOnline: true,
+                isInvisible: false,
+                isNotDisturb: false,
+                isCustomized: true,
+                label: label,
+                meta: meta,
+                clearedAt: null,
+                accountId: 'me',
+                createdAt: now,
+                updatedAt: now,
+                deletedAt: null,
+              );
+              ref.read(currentAccountStatusProvider.notifier).setStatus(status);
+            } catch (e) {
+              talker.log('Failed to set remote activity status: $e');
+            }
+            socket.send({
+              'cmd': 'SET_ACTIVITY',
+              'data': data['args']['activity'],
+              'evt': null,
+              'nonce': data['nonce'],
+            });
+          }
+        },
+        'close': (socket) async {
+          notifier.updateStatus('Client disconnected');
+          final appId = socket.clientId;
+          try {
+            await unsetRemoteActivityStatus(ref, appId);
+            ref.read(currentAccountStatusProvider.notifier).clearStatus();
+          } catch (e) {
+            talker.log('Failed to unset remote activity status: $e');
+          }
+        },
+      });
+      return notifier;
+    });
+
+final rpcServerProvider = Provider<ActivityRpcServer>((ref) {
+  final notifier = ref.watch(rpcServerStateProvider.notifier);
+  return notifier.server;
+});
+
+Future<void> setRemoteActivityStatus(
+  Ref ref,
+  String label,
+  String appId,
+  Map<String, dynamic> meta,
+) async {
+  final apiClient = ref.read(apiClientProvider);
+  await apiClient.post(
+    '/id/accounts/me/statuses',
+    data: {
+      'is_invisible': false,
+      'is_not_disturb': false,
+      'is_automated': true,
+      'label': label,
+      'app_identifier': appId,
+      'meta': meta,
+    },
+  );
+}
+
+Future<void> unsetRemoteActivityStatus(Ref ref, String appId) async {
+  final apiClient = ref.read(apiClientProvider);
+  await apiClient.delete(
+    '/id/accounts/me/statuses',
+    queryParameters: {'app': appId},
+  );
+}

lib/pods/activity/ipc_server.dart

@@ -0,0 +1,282 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:dart_ipc/dart_ipc.dart';
+import 'package:island/talker.dart';
+import 'package:path/path.dart' as path;
+
+const String kRpcIpcLogPrefix = 'arRPC.ipc';
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// IPC Packet structure
+class IpcPacket {
+  final int type;
+  final Map<String, dynamic> data;
+
+  IpcPacket(this.type, this.data);
+}
+
+// Abstract base class for IPC server
+abstract class IpcServer {
+  final List<IpcSocketWrapper> _sockets = [];
+
+  // Encode IPC packet
+  static Uint8List encodeIpcPacket(int type, Map<String, dynamic> data) {
+    final jsonData = jsonEncode(data);
+    final dataBytes = utf8.encode(jsonData);
+    final dataSize = dataBytes.length;
+
+    final buffer = ByteData(8 + dataSize);
+    buffer.setInt32(0, type, Endian.little);
+    buffer.setInt32(4, dataSize, Endian.little);
+    buffer.buffer.asUint8List().setRange(8, 8 + dataSize, dataBytes);
+
+    return buffer.buffer.asUint8List();
+  }
+
+  Future<void> start();
+  Future<void> stop();
+
+  void addSocket(IpcSocketWrapper socket) {
+    _sockets.add(socket);
+  }
+
+  void removeSocket(IpcSocketWrapper socket) {
+    _sockets.remove(socket);
+  }
+
+  List<IpcSocketWrapper> get sockets => _sockets;
+
+  void Function(
+    IpcSocketWrapper socket,
+    IpcPacket packet,
+    Map<String, Function> handlers,
+  )?
+  handlePacket;
+}
+
+// Abstract base class for IPC socket wrapper
+abstract class IpcSocketWrapper {
+  String clientId = '';
+  bool handshook = false;
+  final List<int> _buffer = [];
+
+  void addData(List<int> data) {
+    _buffer.addAll(data);
+  }
+
+  void send(Map<String, dynamic> msg);
+  void sendPong(dynamic data);
+  void close();
+  void closeWithCode(int code, [String message = '']);
+
+  List<IpcPacket> readPackets() {
+    final packets = <IpcPacket>[];
+
+    while (_buffer.length >= 8) {
+      final buffer = Uint8List.fromList(_buffer);
+      final byteData = ByteData.view(buffer.buffer);
+
+      final type = byteData.getInt32(0, Endian.little);
+      final dataSize = byteData.getInt32(4, Endian.little);
+
+      if (_buffer.length < 8 + dataSize) break;
+
+      final dataBytes = _buffer.sublist(8, 8 + dataSize);
+      final jsonStr = utf8.decode(dataBytes);
+      final jsonData = jsonDecode(jsonStr);
+
+      packets.add(IpcPacket(type, jsonData));
+
+      _buffer.removeRange(0, 8 + dataSize);
+    }
+
+    return packets;
+  }
+}
+
+// Multiplatform IPC Server implementation using dart_ipc
+class MultiPlatformIpcServer extends IpcServer {
+  StreamSubscription? _serverSubscription;
+
+  @override
+  Future<void> start() async {
+    try {
+      final ipcPath =
+          Platform.isWindows
+              ? r'\\.\pipe\discord-ipc-0'
+              : await _findAvailableUnixIpcPath();
+
+      final serverSocket = await bind(ipcPath);
+      talker.log('IPC listening at $ipcPath');
+
+      _serverSubscription = serverSocket.listen((socket) {
+        final socketWrapper = MultiPlatformIpcSocketWrapper(socket);
+        addSocket(socketWrapper);
+        talker.log('New IPC connection!');
+        _handleIpcData(socketWrapper);
+      });
+    } catch (e) {
+      throw Exception('Failed to start IPC server: $e');
+    }
+  }
+
+  @override
+  Future<void> stop() async {
+    for (var socket in sockets) {
+      try {
+        socket.close();
+      } catch (e) {
+        talker.log('Error closing IPC socket: $e');
+      }
+    }
+    sockets.clear();
+    _serverSubscription?.cancel();
+  }
+
+  // Handle incoming IPC data
+  void _handleIpcData(MultiPlatformIpcSocketWrapper socket) {
+    final startTime = DateTime.now();
+    socket.socket.listen(
+      (data) {
+        final readStart = DateTime.now();
+        socket.addData(data);
+        final readDuration =
+            DateTime.now().difference(readStart).inMicroseconds;
+        talker.log('Read data took $readDuration microseconds');
+
+        final packets = socket.readPackets();
+        for (final packet in packets) {
+          handlePacket?.call(socket, packet, {});
+        }
+      },
+      onDone: () {
+        talker.log('IPC connection closed');
+        socket.close();
+      },
+      onError: (e) {
+        talker.log('IPC data error: $e');
+        socket.closeWithCode(IpcCloseCodes.closeUnsupported, e.toString());
+      },
+    );
+    final totalDuration = DateTime.now().difference(startTime).inMicroseconds;
+    talker.log('_handleIpcData took $totalDuration microseconds');
+  }
+
+  Future<String> _getMacOsSystemTmpDir() async {
+    final result = await Process.run('getconf', ['DARWIN_USER_TEMP_DIR']);
+    return (result.stdout as String).trim();
+  }
+
+  // Find available IPC socket path for Unix-like systems
+  Future<String> _findAvailableUnixIpcPath() async {
+    // Build list of directories to try, with macOS-specific handling
+    final baseDirs = <String>[];
+
+    if (Platform.isMacOS) {
+      try {
+        final macTempDir = await _getMacOsSystemTmpDir();
+        if (macTempDir.isNotEmpty) {
+          baseDirs.add(macTempDir);
+        }
+      } catch (e) {
+        talker.log('Failed to get macOS system temp dir: $e');
+      }
+    }
+
+    // Add other standard directories
+    final otherDirs = [
+      Platform.environment['XDG_RUNTIME_DIR'],
+      Platform.environment['TMPDIR'],
+      Platform.environment['TMP'],
+      Platform.environment['TEMP'],
+      '/tmp',
+    ];
+
+    baseDirs.addAll(
+      otherDirs.where((dir) => dir != null && dir.isNotEmpty).cast<String>(),
+    );
+
+    for (final baseDir in baseDirs) {
+      for (int i = 0; i < 10; i++) {
+        final socketPath = path.join(baseDir, 'discord-ipc-$i');
+        try {
+          final socket = await bind(socketPath);
+          socket.close();
+          try {
+            await File(socketPath).delete();
+          } catch (_) {}
+          talker.log('IPC socket will be created at: $socketPath');
+          return socketPath;
+        } catch (e) {
+          if (i == 0) {
+            talker.log('IPC path $socketPath not available: $e');
+          }
+          continue;
+        }
+      }
+    }
+    throw Exception(
+      'No available IPC socket paths found in any temp directory',
+    );
+  }
+}
+
+// Multiplatform IPC Socket Wrapper
+class MultiPlatformIpcSocketWrapper extends IpcSocketWrapper {
+  final dynamic socket;
+
+  MultiPlatformIpcSocketWrapper(this.socket);
+
+  @override
+  void send(Map<String, dynamic> msg) {
+    talker.log('IPC sending: $msg');
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.frame, msg);
+    socket.add(packet);
+  }
+
+  @override
+  void sendPong(dynamic data) {
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.pong, data ?? {});
+    socket.add(packet);
+  }
+
+  @override
+  void close() {
+    socket.close();
+  }
+
+  @override
+  void closeWithCode(int code, [String message = '']) {
+    final closeData = {'code': code, 'message': message};
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.close, closeData);
+    socket.add(packet);
+    socket.close();
+  }
+}

lib/pods/activity/ipc_server.web.dart

@@ -0,0 +1,61 @@
+// Stub implementation for web platform
+// This file provides empty implementations to avoid import errors on web
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// IPC Packet structure
+class IpcPacket {
+  final int type;
+  final Map<String, dynamic> data;
+
+  IpcPacket(this.type, this.data);
+}
+
+class IpcServer {
+  Future<void> start() async {}
+  Future<void> stop() async {}
+  void Function(dynamic, dynamic, dynamic)? handlePacket;
+  void addSocket(dynamic socket) {}
+  void removeSocket(dynamic socket) {}
+  List<dynamic> get sockets => [];
+}
+
+class IpcSocketWrapper {
+  String clientId = '';
+  bool handshook = false;
+
+  void addData(List<int> data) {}
+  void send(Map<String, dynamic> msg) {}
+  void sendPong(dynamic data) {}
+  void close() {}
+  void closeWithCode(int code, [String message = '']) {}
+  List<dynamic> readPackets() => [];
+}
+
+class MultiPlatformIpcServer extends IpcServer {}
+
+class MultiPlatformIpcSocketWrapper extends IpcSocketWrapper {}

lib/pods/activity_rpc.dart

@@ -1,651 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:developer' as developer;
-import 'dart:io';
-import 'package:flutter/foundation.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/pods/network.dart';
-import 'package:shelf/shelf.dart';
-import 'package:shelf/shelf_io.dart' as shelf_io;
-import 'package:shelf_web_socket/shelf_web_socket.dart';
-import 'package:web_socket_channel/web_socket_channel.dart';
-import 'package:path/path.dart' as path;
-
-const String kRpcLogPrefix = 'arRPC.websocket';
-const String kRpcIpcLogPrefix = 'arRPC.ipc';
-
-// IPC Constants
-const String kIpcBasePath = 'discord-ipc';
-
-// IPC Packet Types
-class IpcTypes {
-  static const int handshake = 0;
-  static const int frame = 1;
-  static const int close = 2;
-  static const int ping = 3;
-  static const int pong = 4;
-}
-
-// IPC Close Codes
-class IpcCloseCodes {
-  static const int closeNormal = 1000;
-  static const int closeUnsupported = 1003;
-  static const int closeAbnormal = 1006;
-}
-
-// IPC Error Codes
-class IpcErrorCodes {
-  static const int invalidClientId = 4000;
-  static const int invalidOrigin = 4001;
-  static const int rateLimited = 4002;
-  static const int tokenRevoked = 4003;
-  static const int invalidVersion = 4004;
-  static const int invalidEncoding = 4005;
-}
-
-class ActivityRpcServer {
-  static const List<int> portRange = [6463, 6472]; // Ports 6463–6472
-  Map<String, Function>
-  handlers; // {connection: (socket), message: (socket, data), close: (socket)}
-  HttpServer? _httpServer;
-  ServerSocket? _ipcServer;
-  final List<WebSocketChannel> _wsSockets = [];
-  final List<_IpcSocketWrapper> _ipcSockets = [];
-
-  ActivityRpcServer(this.handlers);
-
-  void updateHandlers(Map<String, Function> newHandlers) {
-    handlers = newHandlers;
-  }
-
-  // Encode IPC packet
-  static Uint8List encodeIpcPacket(int type, Map<String, dynamic> data) {
-    final jsonData = jsonEncode(data);
-    final dataBytes = utf8.encode(jsonData);
-    final dataSize = dataBytes.length;
-
-    final buffer = ByteData(8 + dataSize);
-    buffer.setInt32(0, type, Endian.little);
-    buffer.setInt32(4, dataSize, Endian.little);
-    buffer.buffer.asUint8List().setRange(8, 8 + dataSize, dataBytes);
-
-    return buffer.buffer.asUint8List();
-  }
-
-  Future<String> _getMacOsSystemTmpDir() async {
-    final result = await Process.run('getconf', ['DARWIN_USER_TEMP_DIR']);
-    return (result.stdout as String).trim();
-  }
-
-  // Find available IPC socket path
-  Future<String> _findAvailableIpcPath() async {
-    // Build list of directories to try, with macOS-specific handling
-    final baseDirs = <String>[];
-
-    if (Platform.isMacOS) {
-      try {
-        final macTempDir = await _getMacOsSystemTmpDir();
-        if (macTempDir.isNotEmpty) {
-          baseDirs.add(macTempDir);
-        }
-      } catch (e) {
-        developer.log(
-          'Failed to get macOS system temp dir: $e',
-          name: kRpcIpcLogPrefix,
-        );
-      }
-    }
-
-    // Add other standard directories
-    final otherDirs = [
-      Platform.environment['XDG_RUNTIME_DIR'], // User runtime directory
-      Platform.environment['TMPDIR'], // App container temp (fallback)
-      Platform.environment['TMP'],
-      Platform.environment['TEMP'],
-      '/tmp', // System temp directory - most compatible
-    ];
-
-    baseDirs.addAll(
-      otherDirs.where((dir) => dir != null && dir.isNotEmpty).cast<String>(),
-    );
-
-    for (final baseDir in baseDirs) {
-      for (int i = 0; i < 10; i++) {
-        final socketPath = path.join(baseDir, '$kIpcBasePath-$i');
-        try {
-          final socket = await ServerSocket.bind(
-            InternetAddress(socketPath, type: InternetAddressType.unix),
-            0,
-          );
-          socket.close();
-          // Clean up the test socket
-          try {
-            await File(socketPath).delete();
-          } catch (_) {}
-          developer.log(
-            'IPC socket will be created at: $socketPath',
-            name: kRpcIpcLogPrefix,
-          );
-          return socketPath;
-        } catch (e) {
-          // Path not available, try next
-          if (i == 0) {
-            // Log only for the first attempt per directory
-            developer.log(
-              'IPC path $socketPath not available: $e',
-              name: kRpcIpcLogPrefix,
-            );
-          }
-          continue;
-        }
-      }
-    }
-    throw Exception(
-      'No available IPC socket paths found in any temp directory',
-    );
-  }
-
-  // Start the WebSocket server
-  Future<void> start() async {
-    int port = portRange[0];
-    bool wsSuccess = false;
-
-    // Start WebSocket server
-    while (port <= portRange[1]) {
-      developer.log('trying port $port', name: kRpcLogPrefix);
-      try {
-        // Start HTTP server
-        _httpServer = await HttpServer.bind(InternetAddress.loopbackIPv4, port);
-        developer.log('listening on $port', name: kRpcLogPrefix);
-
-        // Handle WebSocket upgrades
-        shelf_io.serveRequests(_httpServer!, (Request request) async {
-          developer.log('new request', name: kRpcLogPrefix);
-          if (request.headers['upgrade']?.toLowerCase() == 'websocket') {
-            final handler = webSocketHandler((WebSocketChannel channel, _) {
-              _wsSockets.add(channel);
-              _onWsConnection(channel, request);
-            });
-            return handler(request);
-          }
-          developer.log(
-            'new request disposed due to not websocket',
-            name: kRpcLogPrefix,
-          );
-          return Response.notFound('Not a WebSocket request');
-        });
-        wsSuccess = true;
-        break;
-      } catch (e) {
-        if (e is SocketException && e.osError?.errorCode == 98) {
-          // EADDRINUSE
-          developer.log('$port in use!', name: kRpcLogPrefix);
-        } else {
-          developer.log('http error: $e', name: kRpcLogPrefix);
-        }
-        port++;
-      }
-    }
-
-    if (!wsSuccess) {
-      throw Exception(
-        'Failed to bind to any port in range ${portRange[0]}–${portRange[1]}',
-      );
-    }
-
-    // Start IPC server (skip on macOS due to sandboxing)
-    final shouldStartIpc = !Platform.isMacOS;
-    if (shouldStartIpc) {
-      try {
-        final ipcPath = await _findAvailableIpcPath();
-        _ipcServer = await ServerSocket.bind(
-          InternetAddress(ipcPath, type: InternetAddressType.unix),
-          0,
-        );
-        developer.log('IPC listening at $ipcPath', name: kRpcIpcLogPrefix);
-
-        _ipcServer!.listen((Socket socket) {
-          _onIpcConnection(socket);
-        });
-      } catch (e) {
-        developer.log('IPC server error: $e', name: kRpcIpcLogPrefix);
-        // Continue without IPC if it fails
-      }
-    } else {
-      developer.log(
-        'IPC server disabled on macOS in production mode due to sandboxing',
-        name: kRpcIpcLogPrefix,
-      );
-    }
-  }
-
-  // Stop the server
-  Future<void> stop() async {
-    // Stop WebSocket server
-    for (var socket in _wsSockets) {
-      await socket.sink.close();
-    }
-    _wsSockets.clear();
-    await _httpServer?.close();
-
-    // Stop IPC server
-    for (var socket in _ipcSockets) {
-      socket.close();
-    }
-    _ipcSockets.clear();
-    await _ipcServer?.close();
-
-    developer.log('servers stopped', name: kRpcLogPrefix);
-  }
-
-  // Handle new WebSocket connection
-  void _onWsConnection(WebSocketChannel socket, Request request) {
-    // Parse query parameters
-    final uri = request.url;
-    final params = uri.queryParameters;
-    final ver = int.tryParse(params['v'] ?? '1') ?? 1;
-    final encoding = params['encoding'] ?? 'json';
-    final clientId = params['client_id'] ?? '';
-    final origin = request.headers['origin'] ?? '';
-
-    developer.log(
-      'new WS connection! origin: $origin, params: $params',
-      name: kRpcLogPrefix,
-    );
-
-    // Validate origin
-    if (origin.isNotEmpty &&
-        ![
-          'https://discord.com',
-          'https://ptb.discord.com',
-          'https://canary.discord.com',
-        ].contains(origin)) {
-      developer.log('disallowed origin: $origin', name: kRpcLogPrefix);
-      socket.sink.close();
-      return;
-    }
-
-    // Validate encoding
-    if (encoding != 'json') {
-      developer.log(
-        'unsupported encoding requested: $encoding',
-        name: kRpcLogPrefix,
-      );
-      socket.sink.close();
-      return;
-    }
-
-    // Validate version
-    if (ver != 1) {
-      developer.log('unsupported version requested: $ver', name: kRpcLogPrefix);
-      socket.sink.close();
-      return;
-    }
-
-    // Store client info on socket
-    final socketWithMeta = _WsSocketWrapper(socket, clientId, encoding);
-
-    // Set up event listeners
-    socket.stream.listen(
-      (data) => _onWsMessage(socketWithMeta, data),
-      onError: (e) {
-        developer.log('WS socket error: $e', name: kRpcLogPrefix);
-      },
-      onDone: () {
-        developer.log('WS socket closed', name: kRpcLogPrefix);
-        handlers['close']?.call(socketWithMeta);
-        _wsSockets.remove(socket);
-      },
-    );
-
-    // Notify handler of new connection
-    handlers['connection']?.call(socketWithMeta);
-  }
-
-  // Handle new IPC connection
-  void _onIpcConnection(Socket socket) {
-    developer.log('new IPC connection!', name: kRpcIpcLogPrefix);
-
-    final socketWrapper = _IpcSocketWrapper(socket);
-    _ipcSockets.add(socketWrapper);
-
-    // Set up event listeners
-    socket.listen(
-      (data) => _onIpcData(socketWrapper, data),
-      onError: (e) {
-        developer.log('IPC socket error: $e', name: kRpcIpcLogPrefix);
-        socket.close();
-      },
-      onDone: () {
-        developer.log('IPC socket closed', name: kRpcIpcLogPrefix);
-        handlers['close']?.call(socketWrapper);
-        _ipcSockets.remove(socketWrapper);
-      },
-    );
-  }
-
-  // Handle incoming WebSocket message
-  void _onWsMessage(_WsSocketWrapper socket, dynamic data) {
-    try {
-      final jsonData = jsonDecode(data as String);
-      developer.log('WS message: $jsonData', name: kRpcLogPrefix);
-      handlers['message']?.call(socket, jsonData);
-    } catch (e) {
-      developer.log('WS message parse error: $e', name: kRpcLogPrefix);
-    }
-  }
-
-  // Handle incoming IPC data
-  void _onIpcData(_IpcSocketWrapper socket, List<int> data) {
-    try {
-      socket.addData(data);
-      final packets = socket.readPackets();
-      for (final packet in packets) {
-        _handleIpcPacket(socket, packet);
-      }
-    } catch (e) {
-      developer.log('IPC data error: $e', name: kRpcIpcLogPrefix);
-      socket.closeWithCode(IpcCloseCodes.closeUnsupported, e.toString());
-    }
-  }
-
-  // Handle IPC packet
-  void _handleIpcPacket(_IpcSocketWrapper socket, _IpcPacket packet) {
-    switch (packet.type) {
-      case IpcTypes.ping:
-        developer.log('IPC ping received', name: kRpcIpcLogPrefix);
-        socket.sendPong(packet.data);
-        break;
-
-      case IpcTypes.pong:
-        developer.log('IPC pong received', name: kRpcIpcLogPrefix);
-        // Handle pong if needed
-        break;
-
-      case IpcTypes.handshake:
-        if (socket.handshook) {
-          throw Exception('Already handshook');
-        }
-        socket.handshook = true;
-        _onIpcHandshake(socket, packet.data);
-        break;
-
-      case IpcTypes.frame:
-        if (!socket.handshook) {
-          throw Exception('Need to handshake first');
-        }
-        developer.log('IPC frame: ${packet.data}', name: kRpcIpcLogPrefix);
-        handlers['message']?.call(socket, packet.data);
-        break;
-
-      case IpcTypes.close:
-        socket.close();
-        break;
-
-      default:
-        throw Exception('Invalid packet type: ${packet.type}');
-    }
-  }
-
-  // Handle IPC handshake
-  void _onIpcHandshake(_IpcSocketWrapper socket, Map<String, dynamic> params) {
-    developer.log('IPC handshake: $params', name: kRpcIpcLogPrefix);
-
-    final ver = int.tryParse(params['v']?.toString() ?? '1') ?? 1;
-    final clientId = params['client_id']?.toString() ?? '';
-
-    // Validate version
-    if (ver != 1) {
-      developer.log(
-        'IPC unsupported version requested: $ver',
-        name: kRpcIpcLogPrefix,
-      );
-      socket.closeWithCode(IpcErrorCodes.invalidVersion);
-      return;
-    }
-
-    // Validate client ID
-    if (clientId.isEmpty) {
-      developer.log('IPC client ID required', name: kRpcIpcLogPrefix);
-      socket.closeWithCode(IpcErrorCodes.invalidClientId);
-      return;
-    }
-
-    socket.clientId = clientId;
-
-    // Notify handler of new connection
-    handlers['connection']?.call(socket);
-  }
-}
-
-// WebSocket wrapper
-class _WsSocketWrapper {
-  final WebSocketChannel channel;
-  final String clientId;
-  final String encoding;
-
-  _WsSocketWrapper(this.channel, this.clientId, this.encoding);
-
-  void send(Map<String, dynamic> msg) {
-    developer.log('WS sending: $msg', name: kRpcLogPrefix);
-    channel.sink.add(jsonEncode(msg));
-  }
-}
-
-// IPC wrapper
-class _IpcSocketWrapper {
-  final Socket socket;
-  String clientId = '';
-  bool handshook = false;
-  final List<int> _buffer = [];
-
-  _IpcSocketWrapper(this.socket);
-
-  void addData(List<int> data) {
-    _buffer.addAll(data);
-  }
-
-  void send(Map<String, dynamic> msg) {
-    developer.log('IPC sending: $msg', name: kRpcIpcLogPrefix);
-    final packet = ActivityRpcServer.encodeIpcPacket(IpcTypes.frame, msg);
-    socket.add(packet);
-  }
-
-  void sendPong(dynamic data) {
-    final packet = ActivityRpcServer.encodeIpcPacket(IpcTypes.pong, data ?? {});
-    socket.add(packet);
-  }
-
-  void close() {
-    socket.close();
-  }
-
-  void closeWithCode(int code, [String message = '']) {
-    final closeData = {'code': code, 'message': message};
-    final packet = ActivityRpcServer.encodeIpcPacket(IpcTypes.close, closeData);
-    socket.add(packet);
-    socket.close();
-  }
-
-  List<_IpcPacket> readPackets() {
-    final packets = <_IpcPacket>[];
-
-    while (_buffer.length >= 8) {
-      final buffer = Uint8List.fromList(_buffer);
-      final byteData = ByteData.view(buffer.buffer);
-
-      final type = byteData.getInt32(0, Endian.little);
-      final dataSize = byteData.getInt32(4, Endian.little);
-
-      if (_buffer.length < 8 + dataSize) break;
-
-      final dataBytes = _buffer.sublist(8, 8 + dataSize);
-      final jsonStr = utf8.decode(dataBytes);
-      final jsonData = jsonDecode(jsonStr);
-
-      packets.add(_IpcPacket(type, jsonData));
-
-      _buffer.removeRange(0, 8 + dataSize);
-    }
-
-    return packets;
-  }
-}
-
-// IPC Packet structure
-class _IpcPacket {
-  final int type;
-  final Map<String, dynamic> data;
-
-  _IpcPacket(this.type, this.data);
-}
-
-// State management for server status and activities
-class ServerState {
-  final String status;
-  final List<String> activities;
-
-  ServerState({required this.status, this.activities = const []});
-
-  ServerState copyWith({String? status, List<String>? activities}) {
-    return ServerState(
-      status: status ?? this.status,
-      activities: activities ?? this.activities,
-    );
-  }
-}
-
-class ServerStateNotifier extends StateNotifier<ServerState> {
-  final ActivityRpcServer server;
-
-  ServerStateNotifier(this.server)
-    : super(ServerState(status: 'Server not started'));
-
-  Future<void> start() async {
-    // Only start server on desktop platforms
-    if (!Platform.isAndroid && !Platform.isIOS && !kIsWeb) {
-      try {
-        await server.start();
-        state = state.copyWith(status: 'Server running');
-      } catch (e) {
-        state = state.copyWith(status: 'Server failed: $e');
-      }
-    } else {
-      state = state.copyWith(status: 'Server disabled on mobile/web');
-    }
-  }
-
-  void updateStatus(String status) {
-    state = state.copyWith(status: status);
-  }
-
-  void addActivity(String activity) {
-    state = state.copyWith(activities: [...state.activities, activity]);
-  }
-}
-
-// Providers
-final rpcServerStateProvider =
-    StateNotifierProvider<ServerStateNotifier, ServerState>((ref) {
-      final server = ActivityRpcServer({});
-      final notifier = ServerStateNotifier(server);
-      server.updateHandlers({
-        'connection': (socket) {
-          final clientId =
-              socket is _WsSocketWrapper
-                  ? socket.clientId
-                  : (socket as _IpcSocketWrapper).clientId;
-          notifier.updateStatus('Client connected (ID: $clientId)');
-          // Send READY event
-          socket.send({
-            'cmd': 'DISPATCH',
-            'data': {
-              'v': 1,
-              'config': {
-                'cdn_host': 'fake.cdn',
-                'api_endpoint': '//fake.api',
-                'environment': 'dev',
-              },
-              'user': {
-                'id': 'fake_user_id',
-                'username': 'FakeUser',
-                'discriminator': '0001',
-                'avatar': null,
-                'bot': false,
-              },
-            },
-            'evt': 'READY',
-            'nonce': '12345', // Should be dynamic
-          });
-        },
-        'message': (socket, dynamic data) async {
-          if (data['cmd'] == 'SET_ACTIVITY') {
-            notifier.addActivity(
-              'Activity: ${data['args']['activity']['details'] ?? 'Unknown'}',
-            );
-            // Call setRemoteActivityStatus
-            final label = data['args']['activity']['details'] ?? 'Unknown';
-            final appId = socket.clientId;
-            try {
-              await setRemoteActivityStatus(ref, label, appId);
-            } catch (e) {
-              developer.log(
-                'Failed to set remote activity status: $e',
-                name: kRpcLogPrefix,
-              );
-            }
-            // Echo back success
-            socket.send({
-              'cmd': 'SET_ACTIVITY',
-              'data': data['args']['activity'],
-              'evt': null,
-              'nonce': data['nonce'],
-            });
-          }
-        },
-        'close': (socket) async {
-          notifier.updateStatus('Client disconnected');
-          final appId = socket.clientId;
-          try {
-            await unsetRemoteActivityStatus(ref, appId);
-          } catch (e) {
-            developer.log(
-              'Failed to unset remote activity status: $e',
-              name: kRpcLogPrefix,
-            );
-          }
-        },
-      });
-      return notifier;
-    });
-
-final rpcServerProvider = Provider<ActivityRpcServer>((ref) {
-  final notifier = ref.watch(rpcServerStateProvider.notifier);
-  return notifier.server;
-});
-
-Future<void> setRemoteActivityStatus(
-  Ref ref,
-  String label,
-  String appId,
-) async {
-  final apiClient = ref.read(apiClientProvider);
-  await apiClient.post(
-    '/id/accounts/me/statuses',
-    data: {
-      'is_invisible': false,
-      'is_not_disturb': false,
-      'is_automated': true,
-      'label': label,
-      'app_identifier': appId,
-    },
-  );
-}
-
-Future<void> unsetRemoteActivityStatus(Ref ref, String appId) async {
-  final apiClient = ref.read(apiClientProvider);
-  await apiClient.delete(
-    '/id/accounts/me/statuses',
-    queryParameters: {'app': appId},
-  );
-}

lib/pods/chat/call.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:developer';
 import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart';
@@ -10,6 +9,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/models/chat.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
+import 'package:island/talker.dart';
 
 part 'call.g.dart';
 part 'call.freezed.dart';
@@ -212,7 +212,7 @@ class CallNotifier extends _$CallNotifier {
 
   Future<void> joinRoom(String roomId) async {
     if (_roomId == roomId && _room != null) {
-      log('[Call] Call skipped. Already has data');
+      talker.info('[Call] Call skipped. Already has data');
       return;
     } else if (_room != null) {
       if (!_room!.isDisposed &&

lib/pods/chat/call.g.dart

@@ -6,7 +6,7 @@ part of 'call.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$callNotifierHash() => r'eb9bd41b97e9b5e9d54007c8327edb6567458846';
+String _$callNotifierHash() => r'd374402e51d331cf40724e51fd86bce3c5504776';
 
 /// See also [CallNotifier].
 @ProviderFor(CallNotifier)

lib/pods/chat/chat_online_count.dart

@@ -0,0 +1,50 @@
+import 'dart:async';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/models/account.dart';
+
+part 'chat_online_count.g.dart';
+
+@riverpod
+class ChatOnlineCountNotifier extends _$ChatOnlineCountNotifier {
+  @override
+  Future<int> build(String chatroomId) async {
+    final apiClient = ref.watch(apiClientProvider);
+    final ws = ref.watch(websocketProvider);
+
+    // Fetch initial online count
+    final response = await apiClient.get(
+      '/sphere/chat/$chatroomId/members/online',
+    );
+    final initialCount = response.data as int;
+
+    // Listen for websocket status updates
+    final subscription = ws.dataStream.listen((WebSocketPacket packet) {
+      if (packet.type == 'accounts.status.update') {
+        final data = packet.data;
+        if (data != null && data['chat_room_id'] == chatroomId) {
+          final status = SnAccountStatus.fromJson(data['status']);
+          var delta = status.isOnline ? 1 : -1;
+          if (status.clearedAt != null &&
+              status.clearedAt!.isBefore(DateTime.now())) {
+            if (status.isInvisible) delta = 1;
+          }
+          // Update count based on online status
+          state.whenData((currentCount) {
+            final newCount = currentCount + delta;
+            state = AsyncData(
+              newCount.clamp(0, double.infinity).toInt(),
+            ); // Ensure non-negative
+          });
+        }
+      }
+    });
+
+    ref.onDispose(() {
+      subscription.cancel();
+    });
+
+    return initialCount;
+  }
+}

lib/pods/chat/chat_online_count.g.dart

@@ -0,0 +1,168 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'chat_online_count.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$chatOnlineCountNotifierHash() =>
+    r'19af8fd0e9f62c65e12a68215406776085235fa3';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$ChatOnlineCountNotifier
+    extends BuildlessAutoDisposeAsyncNotifier<int> {
+  late final String chatroomId;
+
+  FutureOr<int> build(String chatroomId);
+}
+
+/// See also [ChatOnlineCountNotifier].
+@ProviderFor(ChatOnlineCountNotifier)
+const chatOnlineCountNotifierProvider = ChatOnlineCountNotifierFamily();
+
+/// See also [ChatOnlineCountNotifier].
+class ChatOnlineCountNotifierFamily extends Family<AsyncValue<int>> {
+  /// See also [ChatOnlineCountNotifier].
+  const ChatOnlineCountNotifierFamily();
+
+  /// See also [ChatOnlineCountNotifier].
+  ChatOnlineCountNotifierProvider call(String chatroomId) {
+    return ChatOnlineCountNotifierProvider(chatroomId);
+  }
+
+  @override
+  ChatOnlineCountNotifierProvider getProviderOverride(
+    covariant ChatOnlineCountNotifierProvider provider,
+  ) {
+    return call(provider.chatroomId);
+  }
+
+  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'chatOnlineCountNotifierProvider';
+}
+
+/// See also [ChatOnlineCountNotifier].
+class ChatOnlineCountNotifierProvider
+    extends AutoDisposeAsyncNotifierProviderImpl<ChatOnlineCountNotifier, int> {
+  /// See also [ChatOnlineCountNotifier].
+  ChatOnlineCountNotifierProvider(String chatroomId)
+    : this._internal(
+        () => ChatOnlineCountNotifier()..chatroomId = chatroomId,
+        from: chatOnlineCountNotifierProvider,
+        name: r'chatOnlineCountNotifierProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$chatOnlineCountNotifierHash,
+        dependencies: ChatOnlineCountNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            ChatOnlineCountNotifierFamily._allTransitiveDependencies,
+        chatroomId: chatroomId,
+      );
+
+  ChatOnlineCountNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.chatroomId,
+  }) : super.internal();
+
+  final String chatroomId;
+
+  @override
+  FutureOr<int> runNotifierBuild(covariant ChatOnlineCountNotifier notifier) {
+    return notifier.build(chatroomId);
+  }
+
+  @override
+  Override overrideWith(ChatOnlineCountNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: ChatOnlineCountNotifierProvider._internal(
+        () => create()..chatroomId = chatroomId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        chatroomId: chatroomId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeAsyncNotifierProviderElement<ChatOnlineCountNotifier, int>
+  createElement() {
+    return _ChatOnlineCountNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ChatOnlineCountNotifierProvider &&
+        other.chatroomId == chatroomId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, chatroomId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin ChatOnlineCountNotifierRef on AutoDisposeAsyncNotifierProviderRef<int> {
+  /// The parameter `chatroomId` of this provider.
+  String get chatroomId;
+}
+
+class _ChatOnlineCountNotifierProviderElement
+    extends
+        AutoDisposeAsyncNotifierProviderElement<ChatOnlineCountNotifier, int>
+    with ChatOnlineCountNotifierRef {
+  _ChatOnlineCountNotifierProviderElement(super.provider);
+
+  @override
+  String get chatroomId =>
+      (origin as ChatOnlineCountNotifierProvider).chatroomId;
+}
+
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/pods/chat/chat_rooms.dart

@@ -0,0 +1,5 @@
+import "package:hooks_riverpod/hooks_riverpod.dart";
+
+final isSyncingProvider = StateProvider.autoDispose<bool>((ref) => false);
+
+final flashingMessagesProvider = StateProvider<Set<String>>((ref) => {});

lib/pods/chat/chat_subscribe.dart

@@ -0,0 +1,229 @@
+import "dart:async";
+import "dart:convert";
+import "package:flutter/material.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:island/models/chat.dart";
+import "package:island/pods/lifecycle.dart";
+import "package:island/pods/chat/messages_notifier.dart";
+import "package:island/pods/websocket.dart";
+import "package:island/screens/chat/chat.dart";
+import "package:island/widgets/chat/call_button.dart";
+import "package:riverpod_annotation/riverpod_annotation.dart";
+
+part 'chat_subscribe.g.dart';
+
+final currentSubscribedChatIdProvider = StateProvider<String?>((ref) => null);
+
+@riverpod
+class ChatSubscribeNotifier extends _$ChatSubscribeNotifier {
+  late final String _roomId;
+  late final SnChatRoom _chatRoom;
+  late final SnChatMember _chatIdentity;
+  late final MessagesNotifier _messagesNotifier;
+
+  final List<SnChatMember> _typingStatuses = [];
+  Timer? _typingCleanupTimer;
+  Timer? _typingCooldownTimer;
+  Timer? _periodicSubscribeTimer;
+  StreamSubscription? _wsSubscription;
+
+  @override
+  List<SnChatMember> build(String roomId) {
+    _roomId = roomId;
+    final ws = ref.watch(websocketProvider);
+    final chatRoomAsync = ref.watch(chatroomProvider(roomId));
+    final chatIdentityAsync = ref.watch(chatroomIdentityProvider(roomId));
+    _messagesNotifier = ref.watch(messagesNotifierProvider(roomId).notifier);
+
+    if (chatRoomAsync.isLoading || chatIdentityAsync.isLoading) {
+      return [];
+    }
+
+    if (chatRoomAsync.value == null || chatIdentityAsync.value == null) {
+      return [];
+    }
+
+    _chatRoom = chatRoomAsync.value!;
+    _chatIdentity = chatIdentityAsync.value!;
+
+    // Subscribe to messages
+    final wsState = ref.read(websocketStateProvider.notifier);
+    wsState.sendMessage(
+      jsonEncode(
+        WebSocketPacket(
+          type: 'messages.subscribe',
+          data: {'chat_room_id': roomId},
+          endpoint: 'sphere',
+        ),
+      ),
+    );
+
+    Future.microtask(
+      () => ref.read(currentSubscribedChatIdProvider.notifier).state = roomId,
+    );
+
+    // Send initial read receipt
+    sendReadReceipt();
+
+    // Set up WebSocket listener
+    _wsSubscription = ws.dataStream.listen(onMessage);
+
+    // Set up typing status cleanup timer
+    _typingCleanupTimer = Timer.periodic(const Duration(seconds: 5), (_) {
+      if (_typingStatuses.isNotEmpty) {
+        // Remove typing statuses older than 5 seconds
+        final now = DateTime.now();
+        _typingStatuses.removeWhere((member) {
+          final lastTyped =
+              member.lastTyped ??
+              DateTime.now().subtract(const Duration(milliseconds: 1350));
+          return now.difference(lastTyped).inSeconds > 5;
+        });
+        state = List.of(_typingStatuses);
+      }
+    });
+
+    // Set up periodic subscribe timer (every 5 minutes)
+    _periodicSubscribeTimer = Timer.periodic(const Duration(minutes: 5), (_) {
+      final wsState = ref.read(websocketStateProvider.notifier);
+      wsState.sendMessage(
+        jsonEncode(
+          WebSocketPacket(
+            type: 'messages.subscribe',
+            data: {'chat_room_id': roomId},
+            endpoint: 'sphere',
+          ),
+        ),
+      );
+    });
+
+    // Listen to app lifecycle changes
+    ref.listen(appLifecycleStateProvider, (previous, next) {
+      final lifecycleState = next.value;
+      if (lifecycleState == AppLifecycleState.paused ||
+          lifecycleState == AppLifecycleState.inactive) {
+        // Unsubscribe when app goes to background
+        final wsState = ref.read(websocketStateProvider.notifier);
+        wsState.sendMessage(
+          jsonEncode(
+            WebSocketPacket(
+              type: 'messages.unsubscribe',
+              data: {'chat_room_id': roomId},
+              endpoint: 'sphere',
+            ),
+          ),
+        );
+      } else if (lifecycleState == AppLifecycleState.resumed) {
+        // Resubscribe when app comes back to foreground
+        final wsState = ref.read(websocketStateProvider.notifier);
+        wsState.sendMessage(
+          jsonEncode(
+            WebSocketPacket(
+              type: 'messages.subscribe',
+              data: {'chat_room_id': roomId},
+              endpoint: 'sphere',
+            ),
+          ),
+        );
+      }
+    });
+
+    // Cleanup on dispose
+    ref.onDispose(() {
+      ref.read(currentSubscribedChatIdProvider.notifier).state = null;
+      wsState.sendMessage(
+        jsonEncode(
+          WebSocketPacket(
+            type: 'messages.unsubscribe',
+            data: {'chat_room_id': roomId},
+            endpoint: 'sphere',
+          ),
+        ),
+      );
+      _wsSubscription?.cancel();
+      _typingCleanupTimer?.cancel();
+      _typingCooldownTimer?.cancel();
+      _periodicSubscribeTimer?.cancel();
+    });
+
+    return _typingStatuses;
+  }
+
+  void onMessage(WebSocketPacket pkt) {
+    if (!pkt.type.startsWith('messages')) return;
+    if (['messages.read'].contains(pkt.type)) return;
+
+    if (pkt.type == 'messages.typing' && pkt.data?['sender'] != null) {
+      if (pkt.data?['room_id'] != _chatRoom.id) return;
+      if (pkt.data?['sender_id'] == _chatIdentity.id) return;
+
+      final sender = SnChatMember.fromJson(
+        pkt.data?['sender'],
+      ).copyWith(lastTyped: DateTime.now());
+
+      // Check if the sender is already in the typing list
+      final existingIndex = _typingStatuses.indexWhere(
+        (member) => member.id == sender.id,
+      );
+      if (existingIndex >= 0) {
+        // Update the existing entry with new timestamp
+        _typingStatuses[existingIndex] = sender;
+      } else {
+        // Add new typing status
+        _typingStatuses.add(sender);
+      }
+      state = List.of(_typingStatuses);
+      return;
+    }
+
+    final message = SnChatMessage.fromJson(pkt.data!);
+    if (message.chatRoomId != _chatRoom.id) return;
+    switch (pkt.type) {
+      case 'messages.new':
+      case 'messages.update':
+      case 'messages.delete':
+        if (message.type.startsWith('call')) {
+          // Handle the ongoing call.
+          ref.invalidate(ongoingCallProvider(message.chatRoomId));
+        }
+        _messagesNotifier.receiveMessage(message);
+        // Send read receipt for new message
+        sendReadReceipt();
+    }
+  }
+
+  void sendReadReceipt() {
+    // Send websocket packet
+    final wsState = ref.read(websocketStateProvider.notifier);
+    wsState.sendMessage(
+      jsonEncode(
+        WebSocketPacket(
+          type: 'messages.read',
+          data: {'chat_room_id': _roomId},
+          endpoint: 'sphere',
+        ),
+      ),
+    );
+  }
+
+  void sendTypingStatus() {
+    // Don't send if we're already in a cooldown period
+    if (_typingCooldownTimer != null) return;
+
+    // Send typing status immediately
+    final wsState = ref.read(websocketStateProvider.notifier);
+    wsState.sendMessage(
+      jsonEncode(
+        WebSocketPacket(
+          type: 'messages.typing',
+          data: {'chat_room_id': _roomId},
+          endpoint: 'sphere',
+        ),
+      ),
+    );
+
+    _typingCooldownTimer = Timer(const Duration(milliseconds: 850), () {
+      _typingCooldownTimer = null;
+    });
+  }
+}

lib/pods/chat/chat_subscribe.g.dart

@@ -0,0 +1,176 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'chat_subscribe.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$chatSubscribeNotifierHash() =>
+    r'c605e0c9c45df64e5ba7b65f8de9b47bde8e2b3b';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$ChatSubscribeNotifier
+    extends BuildlessAutoDisposeNotifier<List<SnChatMember>> {
+  late final String roomId;
+
+  List<SnChatMember> build(String roomId);
+}
+
+/// See also [ChatSubscribeNotifier].
+@ProviderFor(ChatSubscribeNotifier)
+const chatSubscribeNotifierProvider = ChatSubscribeNotifierFamily();
+
+/// See also [ChatSubscribeNotifier].
+class ChatSubscribeNotifierFamily extends Family<List<SnChatMember>> {
+  /// See also [ChatSubscribeNotifier].
+  const ChatSubscribeNotifierFamily();
+
+  /// See also [ChatSubscribeNotifier].
+  ChatSubscribeNotifierProvider call(String roomId) {
+    return ChatSubscribeNotifierProvider(roomId);
+  }
+
+  @override
+  ChatSubscribeNotifierProvider getProviderOverride(
+    covariant ChatSubscribeNotifierProvider provider,
+  ) {
+    return call(provider.roomId);
+  }
+
+  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'chatSubscribeNotifierProvider';
+}
+
+/// See also [ChatSubscribeNotifier].
+class ChatSubscribeNotifierProvider
+    extends
+        AutoDisposeNotifierProviderImpl<
+          ChatSubscribeNotifier,
+          List<SnChatMember>
+        > {
+  /// See also [ChatSubscribeNotifier].
+  ChatSubscribeNotifierProvider(String roomId)
+    : this._internal(
+        () => ChatSubscribeNotifier()..roomId = roomId,
+        from: chatSubscribeNotifierProvider,
+        name: r'chatSubscribeNotifierProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$chatSubscribeNotifierHash,
+        dependencies: ChatSubscribeNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            ChatSubscribeNotifierFamily._allTransitiveDependencies,
+        roomId: roomId,
+      );
+
+  ChatSubscribeNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.roomId,
+  }) : super.internal();
+
+  final String roomId;
+
+  @override
+  List<SnChatMember> runNotifierBuild(
+    covariant ChatSubscribeNotifier notifier,
+  ) {
+    return notifier.build(roomId);
+  }
+
+  @override
+  Override overrideWith(ChatSubscribeNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: ChatSubscribeNotifierProvider._internal(
+        () => create()..roomId = roomId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        roomId: roomId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<ChatSubscribeNotifier, List<SnChatMember>>
+  createElement() {
+    return _ChatSubscribeNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ChatSubscribeNotifierProvider && other.roomId == roomId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, roomId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin ChatSubscribeNotifierRef
+    on AutoDisposeNotifierProviderRef<List<SnChatMember>> {
+  /// The parameter `roomId` of this provider.
+  String get roomId;
+}
+
+class _ChatSubscribeNotifierProviderElement
+    extends
+        AutoDisposeNotifierProviderElement<
+          ChatSubscribeNotifier,
+          List<SnChatMember>
+        >
+    with ChatSubscribeNotifierRef {
+  _ChatSubscribeNotifierProviderElement(super.provider);
+
+  @override
+  String get roomId => (origin as ChatSubscribeNotifierProvider).roomId;
+}
+
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/pods/chat/chat_summary.dart

@@ -1,6 +1,8 @@
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:island/models/chat.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/pods/chat/chat_subscribe.dart';
 
 part 'chat_summary.g.dart';
 
@@ -12,9 +14,27 @@ class ChatSummary extends _$ChatSummary {
     final resp = await client.get('/sphere/chat/summary');
 
     final Map<String, dynamic> data = resp.data;
-    return data.map(
+    final summaries = data.map(
       (key, value) => MapEntry(key, SnChatSummary.fromJson(value)),
     );
+
+    final ws = ref.watch(websocketProvider);
+    final subscription = ws.dataStream.listen((WebSocketPacket pkt) {
+      if (!pkt.type.startsWith('messages')) return;
+      if (pkt.type == 'messages.new') {
+        final message = SnChatMessage.fromJson(pkt.data!);
+        updateLastMessage(message.chatRoomId, message);
+      } else if (pkt.type == 'messages.update') {
+        final message = SnChatMessage.fromJson(pkt.data!);
+        updateMessageContent(message.chatRoomId, message);
+      }
+    });
+
+    ref.onDispose(() {
+      subscription.cancel();
+    });
+
+    return summaries;
   }
 
   Future<void> clearUnreadCount(String chatId) async {
@@ -36,10 +56,12 @@ class ChatSummary extends _$ChatSummary {
     state.whenData((summaries) {
       final summary = summaries[chatId];
       if (summary != null) {
+        final currentSubscribed = ref.read(currentSubscribedChatIdProvider);
+        final increment = (chatId != currentSubscribed) ? 1 : 0;
         state = AsyncData({
           ...summaries,
           chatId: SnChatSummary(
-            unreadCount: summary.unreadCount + 1,
+            unreadCount: summary.unreadCount + increment,
             lastMessage: message,
           ),
         });
@@ -61,4 +83,19 @@ class ChatSummary extends _$ChatSummary {
       }
     });
   }
+
+  void updateMessageContent(String chatId, SnChatMessage message) {
+    state.whenData((summaries) {
+      final summary = summaries[chatId];
+      if (summary != null && summary.lastMessage?.id == message.id) {
+        state = AsyncData({
+          ...summaries,
+          chatId: SnChatSummary(
+            unreadCount: summary.unreadCount,
+            lastMessage: message,
+          ),
+        });
+      }
+    });
+  }
 }

lib/pods/chat/chat_summary.g.dart

@@ -6,7 +6,7 @@ part of 'chat_summary.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$chatSummaryHash() => r'87a10e4cefa37dc5fa8eadb175ef1b2bed6070bf';
+String _$chatSummaryHash() => r'33815a3bd81d20902b7063e8194fe336930df9b4';
 
 /// See also [ChatSummary].
 @ProviderFor(ChatSummary)

lib/pods/chat/messages_notifier.dart

@@ -0,0 +1,807 @@
+import "dart:async";
+import "package:dio/dio.dart";
+import "package:drift/drift.dart" show Variable;
+import "package:easy_localization/easy_localization.dart";
+import "package:flutter/material.dart";
+import "package:island/database/drift_db.dart";
+import "package:island/database/message.dart";
+import "package:island/models/chat.dart";
+import "package:island/models/file.dart";
+import "package:island/pods/database.dart";
+import "package:island/pods/lifecycle.dart";
+import "package:island/pods/network.dart";
+import "package:island/services/file_uploader.dart";
+import "package:island/talker.dart";
+import "package:island/widgets/alert.dart";
+import "package:riverpod_annotation/riverpod_annotation.dart";
+import "package:uuid/uuid.dart";
+import "package:island/screens/chat/chat.dart";
+import "package:island/pods/chat/chat_rooms.dart";
+
+part 'messages_notifier.g.dart';
+
+@riverpod
+class MessagesNotifier extends _$MessagesNotifier {
+  late final Dio _apiClient;
+  late final AppDatabase _database;
+  late final SnChatRoom _room;
+  late final SnChatMember _identity;
+
+  final Map<String, LocalChatMessage> _pendingMessages = {};
+  final Map<String, Map<int, double>> _fileUploadProgress = {};
+  int? _totalCount;
+  String? _searchQuery;
+  bool? _withLinks;
+  bool? _withAttachments;
+
+  late final String _roomId;
+  static const int _pageSize = 20;
+  bool _hasMore = true;
+  bool _isSyncing = false;
+  bool _isJumping = false;
+  DateTime? _lastPauseTime;
+
+  @override
+  FutureOr<List<LocalChatMessage>> build(String roomId) async {
+    _roomId = roomId;
+    _apiClient = ref.watch(apiClientProvider);
+    _database = ref.watch(databaseProvider);
+    final room = await ref.watch(chatroomProvider(roomId).future);
+    final identity = await ref.watch(chatroomIdentityProvider(roomId).future);
+
+    if (room == null) {
+      throw Exception('Room not found');
+    }
+    _room = room;
+
+    // Allow building even if identity is null for public rooms
+    if (identity != null) {
+      _identity = identity;
+    }
+
+    talker.log('MessagesNotifier built for room $roomId');
+
+    // Only setup sync and lifecycle listeners if user is a member
+    if (identity != null) {
+      ref.listen(appLifecycleStateProvider, (_, next) {
+        next.whenData((state) {
+          if (state == AppLifecycleState.paused) {
+            _lastPauseTime = DateTime.now();
+            talker.log('App paused, recording time');
+          } else if (state == AppLifecycleState.resumed) {
+            if (_lastPauseTime != null) {
+              final diff = DateTime.now().difference(_lastPauseTime!);
+              if (diff > const Duration(minutes: 1)) {
+                talker.log('App resumed after >1 min, syncing messages');
+                syncMessages();
+              } else {
+                talker.log('App resumed within 1 min, skipping sync');
+              }
+            }
+          }
+        });
+      });
+    }
+
+    loadInitial();
+    return [];
+  }
+
+  List<LocalChatMessage> _sortMessages(List<LocalChatMessage> messages) {
+    messages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
+    return messages;
+  }
+
+  Future<List<LocalChatMessage>> _getCachedMessages({
+    int offset = 0,
+    int take = 20,
+  }) async {
+    talker.log('Getting cached messages from offset $offset, take $take');
+    final List<LocalChatMessage> dbMessages;
+    if (_searchQuery != null && _searchQuery!.isNotEmpty) {
+      dbMessages = await _database.searchMessages(
+        _roomId,
+        _searchQuery ?? '',
+        withAttachments: _withAttachments,
+      );
+    } else {
+      final chatMessagesFromDb = await _database.getMessagesForRoom(
+        _roomId,
+        offset: offset,
+        limit: take,
+      );
+      dbMessages =
+          chatMessagesFromDb.map(_database.companionToMessage).toList();
+    }
+
+    List<LocalChatMessage> filteredMessages = dbMessages;
+
+    if (_withLinks == true) {
+      filteredMessages =
+          filteredMessages.where((msg) => _hasLink(msg)).toList();
+    }
+
+    final dbLocalMessages = filteredMessages;
+
+    // Always ensure unique messages to prevent duplicate keys
+    final uniqueMessages = <LocalChatMessage>[];
+    final seenIds = <String>{};
+    for (final message in dbLocalMessages) {
+      if (seenIds.add(message.id)) {
+        uniqueMessages.add(message);
+      }
+    }
+
+    if (offset == 0) {
+      final pendingForRoom =
+          _pendingMessages.values
+              .where((msg) => msg.roomId == _roomId)
+              .toList();
+
+      final allMessages = [...pendingForRoom, ...uniqueMessages];
+      _sortMessages(allMessages); // Use the helper function
+
+      final finalUniqueMessages = <LocalChatMessage>[];
+      final finalSeenIds = <String>{};
+      for (final message in allMessages) {
+        if (finalSeenIds.add(message.id)) {
+          finalUniqueMessages.add(message);
+        }
+      }
+      return finalUniqueMessages;
+    }
+
+    return uniqueMessages;
+  }
+
+  Future<List<LocalChatMessage>> _fetchAndCacheMessages({
+    int offset = 0,
+    int take = 20,
+  }) async {
+    talker.log('Fetching messages from API, offset $offset, take $take');
+    if (_totalCount == null) {
+      final response = await _apiClient.get(
+        '/sphere/chat/$_roomId/messages',
+        queryParameters: {'offset': 0, 'take': 1},
+      );
+      _totalCount = int.parse(response.headers['x-total']?.firstOrNull ?? '0');
+    }
+
+    if (offset >= _totalCount!) {
+      return [];
+    }
+
+    final response = await _apiClient.get(
+      '/sphere/chat/$_roomId/messages',
+      queryParameters: {'offset': offset, 'take': take},
+    );
+
+    final List<dynamic> data = response.data;
+    _totalCount = int.parse(response.headers['x-total']?.firstOrNull ?? '0');
+
+    final messages =
+        data.map((json) {
+          final remoteMessage = SnChatMessage.fromJson(json);
+          return LocalChatMessage.fromRemoteMessage(
+            remoteMessage,
+            MessageStatus.sent,
+          );
+        }).toList();
+
+    for (final message in messages) {
+      await _database.saveMessage(_database.messageToCompanion(message));
+      if (message.nonce != null) {
+        _pendingMessages.removeWhere(
+          (_, pendingMsg) => pendingMsg.nonce == message.nonce,
+        );
+      }
+    }
+
+    return messages;
+  }
+
+  Future<void> syncMessages() async {
+    if (_isSyncing) {
+      talker.log('Sync already in progress, skipping.');
+      return;
+    }
+    _isSyncing = true;
+
+    talker.log('Starting message sync');
+    Future.microtask(() => ref.read(isSyncingProvider.notifier).state = true);
+    try {
+      final dbMessages = await _database.getMessagesForRoom(
+        _room.id,
+        offset: 0,
+        limit: 1,
+      );
+      final lastMessage =
+          dbMessages.isEmpty
+              ? null
+              : _database.companionToMessage(dbMessages.first);
+
+      if (lastMessage == null) {
+        talker.log('No local messages, fetching from network');
+        final newMessages = await _fetchAndCacheMessages(
+          offset: 0,
+          take: _pageSize,
+        );
+        state = AsyncValue.data(newMessages);
+        return;
+      }
+
+      final resp = await _apiClient.post(
+        '/sphere/chat/${_room.id}/sync',
+        data: {
+          'last_sync_timestamp':
+              lastMessage.toRemoteMessage().updatedAt.millisecondsSinceEpoch,
+        },
+      );
+
+      final response = MessageSyncResponse.fromJson(resp.data);
+      talker.log('Sync response: ${response.messages.length} changes');
+      for (final message in response.messages) {
+        switch (message.type) {
+          case "messages.update":
+          case "messages.update.links":
+            await receiveMessageUpdate(message);
+            break;
+          case "messages.delete":
+            await receiveMessageDeletion(message.id.toString());
+            break;
+        }
+        // Still need receive the message to show the history actions
+        await receiveMessage(message);
+      }
+    } catch (err, stackTrace) {
+      talker.log(
+        'Error syncing messages',
+        exception: err,
+        stackTrace: stackTrace,
+      );
+      showErrorAlert(err);
+    } finally {
+      talker.log('Finished message sync');
+      Future.microtask(
+        () => ref.read(isSyncingProvider.notifier).state = false,
+      );
+      _isSyncing = false;
+    }
+  }
+
+  Future<List<LocalChatMessage>> listMessages({
+    int offset = 0,
+    int take = 20,
+    bool synced = false,
+  }) async {
+    try {
+      if (offset == 0 &&
+          !synced &&
+          (_searchQuery == null || _searchQuery!.isEmpty)) {
+        _fetchAndCacheMessages(offset: 0, take: take).catchError((_) {
+          return <LocalChatMessage>[];
+        });
+      }
+
+      final localMessages = await _getCachedMessages(
+        offset: offset,
+        take: take,
+      );
+
+      if (localMessages.isNotEmpty) {
+        return localMessages;
+      }
+
+      if (_searchQuery == null || _searchQuery!.isEmpty) {
+        return await _fetchAndCacheMessages(offset: offset, take: take);
+      } else {
+        return []; // If searching, and no local messages, don't fetch from network
+      }
+    } catch (e) {
+      final localMessages = await _getCachedMessages(
+        offset: offset,
+        take: take,
+      );
+
+      if (localMessages.isNotEmpty) {
+        return localMessages;
+      }
+      rethrow;
+    }
+  }
+
+  Future<void> loadInitial() async {
+    talker.log('Loading initial messages');
+    if (_searchQuery == null || _searchQuery!.isEmpty) {
+      syncMessages();
+    }
+
+    final messages = await _getCachedMessages(offset: 0, take: _pageSize);
+
+    _hasMore = messages.length == _pageSize;
+
+    state = AsyncValue.data(messages);
+  }
+
+  Future<void> loadMore() async {
+    if (!_hasMore || state is AsyncLoading) return;
+    talker.log('Loading more messages');
+
+    try {
+      final currentMessages = state.value ?? [];
+      final offset = currentMessages.length;
+
+      final newMessages = await listMessages(offset: offset, take: _pageSize);
+
+      if (newMessages.isEmpty || newMessages.length < _pageSize) {
+        _hasMore = false;
+      }
+
+      state = AsyncValue.data(
+        _sortMessages([...currentMessages, ...newMessages]),
+      );
+    } catch (err, stackTrace) {
+      talker.log(
+        'Error loading more messages',
+
+        exception: err,
+        stackTrace: stackTrace,
+      );
+      showErrorAlert(err);
+    }
+  }
+
+  Future<void> sendMessage(
+    String content,
+    List<UniversalFile> attachments, {
+    SnChatMessage? editingTo,
+    SnChatMessage? forwardingTo,
+    SnChatMessage? replyingTo,
+    Function(String, Map<int, double>)? onProgress,
+  }) async {
+    final nonce = const Uuid().v4();
+    talker.log('Sending message with nonce $nonce');
+
+    final mockMessage = SnChatMessage(
+      id: 'pending_$nonce',
+      chatRoomId: _roomId,
+      senderId: _identity.id,
+      content: content,
+      createdAt: DateTime.now(),
+      updatedAt: DateTime.now(),
+      nonce: nonce,
+      sender: _identity,
+    );
+
+    final localMessage = LocalChatMessage.fromRemoteMessage(
+      mockMessage,
+      MessageStatus.pending,
+    );
+
+    _pendingMessages[localMessage.id] = localMessage;
+    _fileUploadProgress[localMessage.id] = {};
+    await _database.saveMessage(_database.messageToCompanion(localMessage));
+
+    final currentMessages = state.value ?? [];
+    state = AsyncValue.data([localMessage, ...currentMessages]);
+
+    try {
+      var cloudAttachments = List.empty(growable: true);
+      for (var idx = 0; idx < attachments.length; idx++) {
+        final cloudFile =
+            await FileUploader.createCloudFile(
+              fileData: attachments[idx],
+              client: ref.read(apiClientProvider),
+              onProgress: (progress, _) {
+                _fileUploadProgress[localMessage.id]?[idx] = progress;
+                onProgress?.call(
+                  localMessage.id,
+                  _fileUploadProgress[localMessage.id] ?? {},
+                );
+              },
+            ).future;
+        if (cloudFile == null) {
+          throw ArgumentError('Failed to upload the file...');
+        }
+        cloudAttachments.add(cloudFile);
+      }
+
+      final response = await _apiClient.request(
+        editingTo == null
+            ? '/sphere/chat/$_roomId/messages'
+            : '/sphere/chat/$_roomId/messages/${editingTo.id}',
+        data: {
+          'content': content,
+          'attachments_id': cloudAttachments.map((e) => e.id).toList(),
+          'replied_message_id': replyingTo?.id,
+          'forwarded_message_id': forwardingTo?.id,
+          'meta': {},
+          'nonce': nonce,
+        },
+        options: Options(method: editingTo == null ? 'POST' : 'PATCH'),
+      );
+
+      final remoteMessage = SnChatMessage.fromJson(response.data);
+      final updatedMessage = LocalChatMessage.fromRemoteMessage(
+        remoteMessage,
+        MessageStatus.sent,
+      );
+
+      _pendingMessages.remove(localMessage.id);
+      await _database.deleteMessage(localMessage.id);
+      await _database.saveMessage(_database.messageToCompanion(updatedMessage));
+
+      final currentMessages = state.value ?? [];
+      if (editingTo != null) {
+        final newMessages =
+            currentMessages
+                .where((m) => m.id != localMessage.id) // remove pending message
+                .map(
+                  (m) => m.id == editingTo.id ? updatedMessage : m,
+                ) // update original message
+                .toList();
+        state = AsyncValue.data(newMessages);
+      } else {
+        final newMessages =
+            currentMessages.map((m) {
+              if (m.id == localMessage.id) {
+                return updatedMessage;
+              }
+              return m;
+            }).toList();
+        state = AsyncValue.data(newMessages);
+      }
+      talker.log('Message with nonce $nonce sent successfully');
+    } catch (e, stackTrace) {
+      talker.log(
+        'Failed to send message with nonce $nonce',
+
+        exception: e,
+        stackTrace: stackTrace,
+      );
+      localMessage.status = MessageStatus.failed;
+      _pendingMessages[localMessage.id] = localMessage;
+      await _database.updateMessageStatus(
+        localMessage.id,
+        MessageStatus.failed,
+      );
+      final newMessages =
+          (state.value ?? []).map((m) {
+            if (m.id == localMessage.id) {
+              return m..status = MessageStatus.failed;
+            }
+            return m;
+          }).toList();
+      state = AsyncValue.data(newMessages);
+      showErrorAlert(e);
+    }
+  }
+
+  Future<void> retryMessage(String pendingMessageId) async {
+    talker.log('Retrying message $pendingMessageId');
+    final message = await fetchMessageById(pendingMessageId);
+    if (message == null) {
+      throw Exception('Message not found');
+    }
+
+    message.status = MessageStatus.pending;
+    _pendingMessages[pendingMessageId] = message;
+    await _database.updateMessageStatus(
+      pendingMessageId,
+      MessageStatus.pending,
+    );
+
+    try {
+      var remoteMessage = message.toRemoteMessage();
+      final response = await _apiClient.post(
+        '/sphere/chat/${message.roomId}/messages',
+        data: {
+          'content': remoteMessage.content,
+          'attachments_id': remoteMessage.attachments,
+          'meta': remoteMessage.meta,
+          'nonce': message.nonce,
+        },
+      );
+
+      remoteMessage = SnChatMessage.fromJson(response.data);
+      final updatedMessage = LocalChatMessage.fromRemoteMessage(
+        remoteMessage,
+        MessageStatus.sent,
+      );
+
+      _pendingMessages.remove(pendingMessageId);
+      await _database.deleteMessage(pendingMessageId);
+      await _database.saveMessage(_database.messageToCompanion(updatedMessage));
+
+      final newMessages =
+          (state.value ?? []).map((m) {
+            if (m.id == pendingMessageId) {
+              return updatedMessage;
+            }
+            return m;
+          }).toList();
+      state = AsyncValue.data(newMessages);
+    } catch (e, stackTrace) {
+      talker.log(
+        'Failed to retry message $pendingMessageId',
+
+        exception: e,
+        stackTrace: stackTrace,
+      );
+      message.status = MessageStatus.failed;
+      _pendingMessages[pendingMessageId] = message;
+      await _database.updateMessageStatus(
+        pendingMessageId,
+        MessageStatus.failed,
+      );
+      final newMessages =
+          (state.value ?? []).map((m) {
+            if (m.id == pendingMessageId) {
+              return m..status = MessageStatus.failed;
+            }
+            return m;
+          }).toList();
+      state = AsyncValue.data(_sortMessages(newMessages));
+      showErrorAlert(e);
+    }
+  }
+
+  Future<void> receiveMessage(SnChatMessage remoteMessage) async {
+    if (remoteMessage.chatRoomId != _roomId) return;
+    talker.log('Received new message ${remoteMessage.id}');
+
+    final localMessage = LocalChatMessage.fromRemoteMessage(
+      remoteMessage,
+      MessageStatus.sent,
+    );
+
+    if (remoteMessage.nonce != null) {
+      _pendingMessages.removeWhere(
+        (_, pendingMsg) => pendingMsg.nonce == remoteMessage.nonce,
+      );
+    }
+
+    await _database.saveMessage(_database.messageToCompanion(localMessage));
+
+    final currentMessages = state.value ?? [];
+    final existingIndex = currentMessages.indexWhere(
+      (m) =>
+          m.id == localMessage.id ||
+          (localMessage.nonce != null && m.nonce == localMessage.nonce),
+    );
+
+    if (existingIndex >= 0) {
+      final newList = [...currentMessages];
+      newList[existingIndex] = localMessage;
+      state = AsyncValue.data(_sortMessages(newList));
+    } else {
+      state = AsyncValue.data(
+        _sortMessages([localMessage, ...currentMessages]),
+      );
+    }
+
+    switch (remoteMessage.type) {
+      case "messages.delete":
+        await receiveMessageDeletion(
+          remoteMessage.meta['message_id'] ?? remoteMessage.id,
+        );
+      case "messages.update":
+      case "messages.update.links":
+        await receiveMessageUpdate(remoteMessage);
+    }
+  }
+
+  Future<void> receiveMessageUpdate(SnChatMessage remoteMessage) async {
+    if (remoteMessage.chatRoomId != _roomId) return;
+    talker.log('Received message update ${remoteMessage.id}');
+
+    final targetId = remoteMessage.meta['message_id'] ?? remoteMessage.id;
+    final updatedMessage = LocalChatMessage.fromRemoteMessage(
+      remoteMessage.copyWith(
+        id: targetId,
+        meta: Map.of(remoteMessage.meta)..remove('message_id'),
+      ),
+      MessageStatus.sent,
+    );
+    await _database.updateMessage(_database.messageToCompanion(updatedMessage));
+
+    final currentMessages = state.value ?? [];
+    final index = currentMessages.indexWhere((m) => m.id == updatedMessage.id);
+
+    if (index >= 0) {
+      final newList = [...currentMessages];
+      newList[index] = updatedMessage;
+      state = AsyncValue.data(_sortMessages(newList));
+    }
+  }
+
+  Future<void> receiveMessageDeletion(String messageId) async {
+    talker.log('Received message deletion $messageId');
+    _pendingMessages.remove(messageId);
+
+    final currentMessages = state.value ?? [];
+    final messageIndex = currentMessages.indexWhere((m) => m.id == messageId);
+
+    LocalChatMessage? messageToUpdate;
+    if (messageIndex != -1) {
+      messageToUpdate = currentMessages[messageIndex];
+    } else {
+      messageToUpdate = await fetchMessageById(messageId);
+    }
+
+    if (messageToUpdate == null) return;
+
+    final remote = messageToUpdate.toRemoteMessage();
+    final updatedRemote = remote.copyWith(
+      content: 'This message was deleted',
+      deletedAt: DateTime.now(),
+      attachments: [],
+    );
+
+    final deletedMessage = LocalChatMessage.fromRemoteMessage(
+      updatedRemote,
+      messageToUpdate.status,
+    );
+
+    await _database.saveMessage(_database.messageToCompanion(deletedMessage));
+
+    if (messageIndex != -1) {
+      final newList = [...currentMessages];
+      newList[messageIndex] = deletedMessage;
+      state = AsyncValue.data(newList);
+    }
+  }
+
+  Future<void> deleteMessage(String messageId) async {
+    talker.log('Deleting message $messageId');
+    try {
+      await _apiClient.delete('/sphere/chat/$_roomId/messages/$messageId');
+      await receiveMessageDeletion(messageId);
+    } catch (err, stackTrace) {
+      talker.log(
+        'Error deleting message $messageId',
+
+        exception: err,
+        stackTrace: stackTrace,
+      );
+      showErrorAlert(err);
+    }
+  }
+
+  void searchMessages(String query, {bool? withLinks, bool? withAttachments}) {
+    _searchQuery = query.trim();
+    _withLinks = withLinks;
+    _withAttachments = withAttachments;
+    loadInitial();
+  }
+
+  void clearSearch() {
+    _searchQuery = null;
+    _withLinks = null;
+    _withAttachments = null;
+    loadInitial();
+  }
+
+  Future<LocalChatMessage?> fetchMessageById(String messageId) async {
+    talker.log('Fetching message by id $messageId');
+    try {
+      final localMessage =
+          await (_database.select(_database.chatMessages)
+            ..where((tbl) => tbl.id.equals(messageId))).getSingleOrNull();
+      if (localMessage != null) {
+        return _database.companionToMessage(localMessage);
+      }
+
+      final response = await _apiClient.get(
+        '/sphere/chat/$_roomId/messages/$messageId',
+      );
+      final remoteMessage = SnChatMessage.fromJson(response.data);
+      final message = LocalChatMessage.fromRemoteMessage(
+        remoteMessage,
+        MessageStatus.sent,
+      );
+
+      await _database.saveMessage(_database.messageToCompanion(message));
+      return message;
+    } catch (e) {
+      if (e is DioException) return null;
+      rethrow;
+    }
+  }
+
+  Future<int> jumpToMessage(String messageId) async {
+    talker.log('Starting jump to message $messageId');
+    if (_isJumping) {
+      talker.log('Jump already in progress, skipping');
+      return -1;
+    }
+    _isJumping = true;
+
+    try {
+      talker.log('Fetching message $messageId');
+      final message = await fetchMessageById(messageId);
+      if (message == null) {
+        talker.log('Message $messageId not found');
+        showSnackBar('messageNotFound'.tr());
+        return -1;
+      }
+
+      // Check if message is already in current state to avoid duplicate loading
+      final currentMessages = state.value ?? [];
+      final existingIndex = currentMessages.indexWhere(
+        (m) => m.id == messageId,
+      );
+      if (existingIndex >= 0) {
+        talker.log(
+          'Message $messageId already in current state at index $existingIndex, jumping directly',
+        );
+        return existingIndex;
+      }
+
+      talker.log(
+        'Message $messageId not in current state, loading messages around it',
+      );
+
+      // Count messages newer than this one
+      final query = _database.customSelect(
+        'SELECT COUNT(*) as count FROM chat_messages WHERE room_id = ? AND created_at > ?',
+        variables: [
+          Variable.withString(_roomId),
+          Variable.withDateTime(message.createdAt),
+        ],
+        readsFrom: {_database.chatMessages},
+      );
+      final result = await query.getSingle();
+      final newerCount = result.read<int>('count');
+
+      // Load messages around this position
+      final offset =
+          (newerCount - _pageSize ~/ 2).clamp(0, double.infinity).toInt();
+      talker.log('Loading messages with offset $offset, take $_pageSize');
+      final loadedMessages = await _getCachedMessages(
+        offset: offset,
+        take: _pageSize,
+      );
+
+      // Check if loaded messages are already in current state
+      final currentIds = currentMessages.map((m) => m.id).toSet();
+      final newMessages =
+          loadedMessages.where((m) => !currentIds.contains(m.id)).toList();
+      talker.log(
+        'Loaded ${loadedMessages.length} messages, ${newMessages.length} are new',
+      );
+
+      if (newMessages.isNotEmpty) {
+        // Merge with current messages
+        final allMessages = [...currentMessages, ...newMessages];
+        final uniqueMessages = <LocalChatMessage>[];
+        final seenIds = <String>{};
+        for (final message in allMessages) {
+          if (seenIds.add(message.id)) {
+            uniqueMessages.add(message);
+          }
+        }
+        _sortMessages(uniqueMessages);
+        state = AsyncValue.data(uniqueMessages);
+        talker.log(
+          'Updated state with ${uniqueMessages.length} total messages',
+        );
+      }
+
+      final finalIndex = (state.value ?? []).indexWhere(
+        (m) => m.id == messageId,
+      );
+      talker.log('Final index for message $messageId is $finalIndex');
+      return finalIndex;
+    } finally {
+      _isJumping = false;
+    }
+  }
+
+  bool _hasLink(LocalChatMessage message) {
+    final content = message.toRemoteMessage().content;
+    if (content == null) return false;
+    final urlRegex = RegExp(r'https?://[^\s/$.?#].[^\s]*');
+    return urlRegex.hasMatch(content);
+  }
+}

lib/pods/chat/messages_notifier.g.dart

@@ -1,12 +1,12 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'room.dart';
+part of 'messages_notifier.dart';
 
 // **************************************************************************
 // RiverpodGenerator
 // **************************************************************************
 
-String _$messagesNotifierHash() => r'fc3b66dfb8dd3fc55d142dae5c5e7bdc67eca5d4';
+String _$messagesNotifierHash() => r'70acac63c720987d8b1688500e3735f1c2d16fdc';
 
 /// Copied from Dart SDK
 class _SystemHash {

lib/pods/config.dart

@@ -4,6 +4,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/pods/theme.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:window_manager/window_manager.dart';
 
 part 'config.freezed.dart';
 part 'config.g.dart';
@@ -24,7 +25,11 @@ const kAppDataSavingMode = 'app_data_saving_mode';
 const kAppSoundEffects = 'app_sound_effects';
 const kAppAprilFoolFeatures = 'app_april_fool_features';
 const kAppWindowSize = 'app_window_size';
+const kAppWindowOpacity = 'app_window_opacity';
 const kAppEnterToSend = 'app_enter_to_send';
+const kAppDefaultPoolId = 'app_default_pool_id';
+const kAppMessageDisplayStyle = 'app_message_display_style';
+const kAppThemeMode = 'app_theme_mode';
 const kFeaturedPostsCollapsedId =
     'featured_posts_collapsed_id'; // Key for storing the ID of the collapsed featured post
 
@@ -65,6 +70,10 @@ sealed class AppSettings with _$AppSettings {
     required String? customFonts,
     required int? appColorScheme, // The color stored via the int type
     required Size? windowSize, // The window size for desktop platforms
+    required double windowOpacity, // The window opacity for desktop platforms
+    required String? defaultPoolId,
+    required String messageDisplayStyle,
+    required String? themeMode,
   }) = _AppSettings;
 }
 
@@ -84,6 +93,10 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
       customFonts: prefs.getString(kAppCustomFonts),
       appColorScheme: prefs.getInt(kAppColorSchemeStoreKey),
       windowSize: _getWindowSizeFromPrefs(prefs),
+      windowOpacity: prefs.getDouble(kAppWindowOpacity) ?? 1.0,
+      defaultPoolId: prefs.getString(kAppDefaultPoolId),
+      messageDisplayStyle: prefs.getString(kAppMessageDisplayStyle) ?? 'bubble',
+      themeMode: prefs.getString(kAppThemeMode) ?? 'system',
     );
   }
 
@@ -104,13 +117,23 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
     return null;
   }
 
+  void setDefaultPoolId(String? value) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    if (value != null) {
+      prefs.setString(kAppDefaultPoolId, value);
+    } else {
+      prefs.remove(kAppDefaultPoolId);
+    }
+    state = state.copyWith(defaultPoolId: value);
+  }
+
   void setAutoTranslate(bool value) {
     final prefs = ref.read(sharedPreferencesProvider);
     prefs.setBool(kAppAutoTranslate, value);
     state = state.copyWith(autoTranslate: value);
   }
 
-  void setDataSavingMode(bool value){
+  void setDataSavingMode(bool value) {
     final prefs = ref.read(sharedPreferencesProvider);
     prefs.setBool(kAppDataSavingMode, value);
     state = state.copyWith(dataSavingMode: value);
@@ -174,6 +197,25 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
   Size? getWindowSize() {
     return state.windowSize;
   }
+
+  void setMessageDisplayStyle(String value) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    prefs.setString(kAppMessageDisplayStyle, value);
+    state = state.copyWith(messageDisplayStyle: value);
+  }
+
+  void setWindowOpacity(double value) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    prefs.setDouble(kAppWindowOpacity, value);
+    state = state.copyWith(windowOpacity: value);
+    Future(() => windowManager.setOpacity(value));
+  }
+
+  void setThemeMode(String value) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    prefs.setString(kAppThemeMode, value);
+    state = state.copyWith(themeMode: value);
+  }
 }
 
 final updateInfoProvider =

lib/pods/config.freezed.dart

@@ -15,7 +15,9 @@ T _$identity<T>(T value) => value;
 mixin _$AppSettings {
 
  bool get autoTranslate; bool get dataSavingMode; bool get soundEffects; bool get aprilFoolFeatures; bool get enterToSend; bool get appBarTransparent; bool get showBackgroundImage; String? get customFonts; int? get appColorScheme;// The color stored via the int type
- Size? get windowSize;
+ Size? get windowSize;// The window size for desktop platforms
+ double get windowOpacity;// The window opacity for desktop platforms
+ String? get defaultPoolId; String get messageDisplayStyle; String? get themeMode;
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -26,16 +28,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.windowSize, windowSize) || other.windowSize == windowSize));
+  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.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.windowOpacity, windowOpacity) || other.windowOpacity == windowOpacity)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId)&&(identical(other.messageDisplayStyle, messageDisplayStyle) || other.messageDisplayStyle == messageDisplayStyle)&&(identical(other.themeMode, themeMode) || other.themeMode == themeMode));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize,windowOpacity,defaultPoolId,messageDisplayStyle,themeMode);
 
 @override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize)';
+  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize, windowOpacity: $windowOpacity, defaultPoolId: $defaultPoolId, messageDisplayStyle: $messageDisplayStyle, themeMode: $themeMode)';
 }
 
 
@@ -46,7 +48,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, Size? windowSize
+ bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, Size? windowSize, double windowOpacity, String? defaultPoolId, String messageDisplayStyle, String? themeMode
 });
 
 
@@ -63,7 +65,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? windowSize = freezed,}) {
+@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? windowSize = freezed,Object? windowOpacity = null,Object? defaultPoolId = freezed,Object? messageDisplayStyle = null,Object? themeMode = freezed,}) {
   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
@@ -75,7 +77,11 @@ as bool,showBackgroundImage: null == showBackgroundImage ? _self.showBackgroundI
 as bool,customFonts: freezed == customFonts ? _self.customFonts : customFonts // ignore: cast_nullable_to_non_nullable
 as String?,appColorScheme: freezed == appColorScheme ? _self.appColorScheme : appColorScheme // ignore: cast_nullable_to_non_nullable
 as int?,windowSize: freezed == windowSize ? _self.windowSize : windowSize // ignore: cast_nullable_to_non_nullable
-as Size?,
+as Size?,windowOpacity: null == windowOpacity ? _self.windowOpacity : windowOpacity // ignore: cast_nullable_to_non_nullable
+as double,defaultPoolId: freezed == defaultPoolId ? _self.defaultPoolId : defaultPoolId // ignore: cast_nullable_to_non_nullable
+as String?,messageDisplayStyle: null == messageDisplayStyle ? _self.messageDisplayStyle : messageDisplayStyle // ignore: cast_nullable_to_non_nullable
+as String,themeMode: freezed == themeMode ? _self.themeMode : themeMode // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 
@@ -157,10 +163,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,  Size? windowSize)?  $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,  Size? windowSize,  double windowOpacity,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode)?  $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.windowSize);case _:
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.windowOpacity,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode);case _:
   return orElse();
 
 }
@@ -178,10 +184,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,  Size? windowSize)  $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,  Size? windowSize,  double windowOpacity,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode)  $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.windowSize);}
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.windowOpacity,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -195,10 +201,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,  Size? windowSize)?  $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,  Size? windowSize,  double windowOpacity,  String? defaultPoolId,  String messageDisplayStyle,  String? themeMode)?  $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.windowSize);case _:
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.windowOpacity,_that.defaultPoolId,_that.messageDisplayStyle,_that.themeMode);case _:
   return null;
 
 }
@@ -210,7 +216,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.windowSize});
+  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.windowSize, required this.windowOpacity, required this.defaultPoolId, required this.messageDisplayStyle, required this.themeMode});
   
 
 @override final  bool autoTranslate;
@@ -224,6 +230,12 @@ class _AppSettings implements AppSettings {
 @override final  int? appColorScheme;
 // The color stored via the int type
 @override final  Size? windowSize;
+// The window size for desktop platforms
+@override final  double windowOpacity;
+// The window opacity for desktop platforms
+@override final  String? defaultPoolId;
+@override final  String messageDisplayStyle;
+@override final  String? themeMode;
 
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
@@ -235,16 +247,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.windowSize, windowSize) || other.windowSize == windowSize));
+  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.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.windowOpacity, windowOpacity) || other.windowOpacity == windowOpacity)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId)&&(identical(other.messageDisplayStyle, messageDisplayStyle) || other.messageDisplayStyle == messageDisplayStyle)&&(identical(other.themeMode, themeMode) || other.themeMode == themeMode));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize,windowOpacity,defaultPoolId,messageDisplayStyle,themeMode);
 
 @override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize)';
+  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize, windowOpacity: $windowOpacity, defaultPoolId: $defaultPoolId, messageDisplayStyle: $messageDisplayStyle, themeMode: $themeMode)';
 }
 
 
@@ -255,7 +267,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, Size? windowSize
+ bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, Size? windowSize, double windowOpacity, String? defaultPoolId, String messageDisplayStyle, String? themeMode
 });
 
 
@@ -272,7 +284,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? windowSize = freezed,}) {
+@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? windowSize = freezed,Object? windowOpacity = null,Object? defaultPoolId = freezed,Object? messageDisplayStyle = null,Object? themeMode = freezed,}) {
   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
@@ -284,7 +296,11 @@ as bool,showBackgroundImage: null == showBackgroundImage ? _self.showBackgroundI
 as bool,customFonts: freezed == customFonts ? _self.customFonts : customFonts // ignore: cast_nullable_to_non_nullable
 as String?,appColorScheme: freezed == appColorScheme ? _self.appColorScheme : appColorScheme // ignore: cast_nullable_to_non_nullable
 as int?,windowSize: freezed == windowSize ? _self.windowSize : windowSize // ignore: cast_nullable_to_non_nullable
-as Size?,
+as Size?,windowOpacity: null == windowOpacity ? _self.windowOpacity : windowOpacity // ignore: cast_nullable_to_non_nullable
+as double,defaultPoolId: freezed == defaultPoolId ? _self.defaultPoolId : defaultPoolId // ignore: cast_nullable_to_non_nullable
+as String?,messageDisplayStyle: null == messageDisplayStyle ? _self.messageDisplayStyle : messageDisplayStyle // ignore: cast_nullable_to_non_nullable
+as String,themeMode: freezed == themeMode ? _self.themeMode : themeMode // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 

lib/pods/config.g.dart

@@ -7,7 +7,7 @@ part of 'config.dart';
 // **************************************************************************
 
 String _$appSettingsNotifierHash() =>
-    r'cd18bff2614a94e3523634e6c577cefad0367eba';
+    r'c3042f77067b5f36102f17277e174a756121ac74';
 
 /// See also [AppSettingsNotifier].
 @ProviderFor(AppSettingsNotifier)

lib/pods/file_pool.dart

@@ -0,0 +1,24 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file_pool.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+
+final poolsProvider = FutureProvider<List<SnFilePool>>((ref) async {
+  final dio = ref.watch(apiClientProvider);
+  final response = await dio.get('/drive/pools');
+  return response.data
+      .map((e) => SnFilePool.fromJson(e))
+      .cast<SnFilePool>()
+      .toList();
+});
+
+String? resolveDefaultPoolId(WidgetRef ref, List<SnFilePool> pools) {
+  final settings = ref.watch(appSettingsNotifierProvider);
+
+  final configuredId = settings.defaultPoolId;
+  if (configuredId != null && pools.any((p) => p.id == configuredId)) {
+    return configuredId;
+  }
+
+  return pools.firstOrNull?.id;
+}

lib/pods/lifecycle.dart

@@ -0,0 +1,30 @@
+import "dart:async";
+import "package:flutter/material.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
+
+final appLifecycleStateProvider = StreamProvider<AppLifecycleState>((ref) {
+  final controller = StreamController<AppLifecycleState>();
+
+  final observer = _AppLifecycleObserver((state) {
+    if (controller.isClosed) return;
+    controller.add(state);
+  });
+  WidgetsBinding.instance.addObserver(observer);
+
+  ref.onDispose(() {
+    WidgetsBinding.instance.removeObserver(observer);
+    controller.close();
+  });
+
+  return controller.stream;
+});
+
+class _AppLifecycleObserver extends WidgetsBindingObserver {
+  final ValueChanged<AppLifecycleState> onChange;
+  _AppLifecycleObserver(this.onChange);
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    onChange(state);
+  }
+}

lib/pods/message.dart

@@ -10,17 +10,19 @@ Future<void> resetDatabase(WidgetRef ref) async {
   if (kIsWeb) return;
 
   final db = ref.read(databaseProvider);
-  final basepath = await getApplicationSupportDirectory();
-  final file = File(join(basepath.path, 'solar_network_data.sqlite'));
 
   // Close current database connection
-  db.close();
+  await db.close();
 
-  // Delete database file
+  // Get the correct database file path
+  final dbFolder = await getApplicationDocumentsDirectory();
+  final file = File(join(dbFolder.path, 'solar_network_data.sqlite'));
+
+  // Delete database file if it exists
   if (await file.exists()) {
     await file.delete();
   }
 
-  // Force refresh the database provider
+  // Force refresh the database provider to create a new instance
   ref.invalidate(databaseProvider);
 }

lib/pods/network.dart

@@ -10,6 +10,8 @@ import 'package:package_info_plus/package_info_plus.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:island/models/auth.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:talker_dio_logger/talker_dio_logger.dart';
+import 'package:island/talker.dart';
 
 import 'config.dart';
 
@@ -75,7 +77,7 @@ final apiClientProvider = Provider<Dio>((ref) {
     ),
   );
 
-  dio.interceptors.add(
+  dio.interceptors.addAll([
     InterceptorsWrapper(
       onRequest: (
         RequestOptions options,
@@ -97,7 +99,17 @@ final apiClientProvider = Provider<Dio>((ref) {
         return handler.next(options);
       },
     ),
-  );
+    TalkerDioLogger(
+      talker: talker,
+      settings: const TalkerDioLoggerSettings(
+        printRequestHeaders: false,
+        printResponseHeaders: false,
+        printResponseMessage: false,
+        printRequestData: false,
+        printResponseData: false,
+      ),
+    ),
+  ]);
 
   return dio;
 });

lib/pods/theme.dart

@@ -100,10 +100,6 @@ Future<ThemeData> createAppTheme(
       opticalSize: 20,
       color: colorScheme.onSurface,
     ),
-    snackBarTheme: SnackBarThemeData(
-      behavior: useM3 ? SnackBarBehavior.floating : SnackBarBehavior.fixed,
-      width: 480,
-    ),
     appBarTheme: AppBarTheme(
       centerTitle: true,
       elevation: hasAppBarTransparent ? 0 : null,

lib/pods/userinfo.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:developer';
 import 'dart:io' show Platform;
 
 import 'package:dio/dio.dart';
@@ -12,6 +11,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/account.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/talker.dart';
 
 class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
   final Ref _ref;
@@ -21,7 +21,7 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
   Future<void> fetchUser() async {
     final token = _ref.watch(tokenProvider);
     if (token == null) {
-      log('[UserInfo] No token found, not going to fetch...');
+      talker.info('[UserInfo] No token found, not going to fetch...');
       return;
     }
     try {
@@ -30,7 +30,7 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
       final user = SnAccount.fromJson(response.data);
       state = AsyncValue.data(user);
 
-      if (kIsWeb || !Platform.isLinux) {
+      if (kIsWeb || !(Platform.isLinux || Platform.isWindows)) {
         FirebaseAnalytics.instance.setUserId(id: user.id);
       }
     } catch (error, stackTrace) {
@@ -44,9 +44,12 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
                       : 'failedToLoadUserInfoNetwork')
                   .tr()
                   .trim(),
-              '${error.response!.statusCode}\n${error.response?.headers}',
+              '',
-              jsonEncode(error.response?.data),
+              '${error.response?.statusCode ?? 'Network Error'}',
-            ].join('\n\n'),
+              if (error.response?.headers != null) error.response?.headers,
+              if (error.response?.data != null)
+                jsonEncode(error.response?.data),
+            ].join('\n'),
             iconStyle: IconStyle.error,
             neutralButtonTitle: 'retry'.tr(),
             negativeButtonTitle: 'okay'.tr(),
@@ -72,11 +75,10 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
           }
         });
       }
-      log(
+      talker.error(
         "[UserInfo] Failed to fetch user info...",
-        name: 'UserInfoNotifier',
+        error,
-        error: error,
+        stackTrace,
-        stackTrace: stackTrace,
       );
       state = AsyncValue.data(null);
     }
@@ -87,7 +89,7 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
     final prefs = _ref.read(sharedPreferencesProvider);
     await prefs.remove(kTokenPairStoreKey);
     _ref.invalidate(tokenProvider);
-    if (kIsWeb || !Platform.isLinux) {
+    if (kIsWeb || !(Platform.isLinux || Platform.isWindows)) {
       FirebaseAnalytics.instance.setUserId(id: null);
     }
   }

lib/pods/websocket.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -8,6 +7,7 @@ import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:web_socket_channel/io.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
+import 'package:island/talker.dart';
 
 part 'websocket.freezed.dart';
 part 'websocket.g.dart';
@@ -64,7 +64,7 @@ class WebSocketService {
 
     final url = '$baseUrl/ws'.replaceFirst('http', 'ws');
 
-    log('[WebSocket] Trying connecting to $url');
+    talker.info('[WebSocket] Trying connecting to $url');
     try {
       if (kIsWeb) {
         _channel = WebSocketChannel.connect(Uri.parse('$url?tk=$token'));
@@ -88,24 +88,24 @@ class WebSocketService {
             return;
           }
           _streamController.sink.add(packet);
-          log(
+          talker.info(
             "[WebSocket] Received packet: ${packet.type} ${packet.errorMessage}",
           );
           if (packet.type == 'pong' && _heartbeatAt != null) {
             var now = DateTime.now();
             heartbeatDelay = now.difference(_heartbeatAt!);
-            log(
+            talker.info(
               "[WebSocket] Server respond last heartbeat for ${heartbeatDelay!.inMilliseconds} ms",
             );
           }
         },
         onDone: () {
-          log('[WebSocket] Connection closed, attempting to reconnect...');
+          talker.info('[WebSocket] Connection closed, attempting to reconnect...');
           _scheduleReconnect();
           _statusStreamController.sink.add(WebSocketState.disconnected());
         },
         onError: (error) {
-          log('[WebSocket] Error occurred: $error, attempting to reconnect...');
+          talker.error('[WebSocket] Error occurred: $error, attempting to reconnect...');
           _scheduleReconnect();
           _statusStreamController.sink.add(
             WebSocketState.error(error.toString()),
@@ -113,7 +113,7 @@ class WebSocketService {
         },
       );
     } catch (err) {
-      log('[WebSocket] Failed to connect: $err');
+      talker.error('[WebSocket] Failed to connect: $err');
       _scheduleReconnect();
     }
   }
@@ -135,7 +135,7 @@ class WebSocketService {
 
   void _beatTheHeart() {
     _heartbeatAt = DateTime.now();
-    log('[WebSocket] We\'re beating the heart! $_heartbeatAt');
+    talker.info('[WebSocket] We\'re beating the heart! $_heartbeatAt');
     sendMessage(jsonEncode(WebSocketPacket(type: 'ping', data: null)));
   }
 

lib/route.dart

@@ -6,7 +6,6 @@ import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/screens/about.dart';
-import 'package:island/screens/account/credits.dart';
 import 'package:island/screens/developers/app_detail.dart';
 import 'package:island/screens/developers/bot_detail.dart';
 import 'package:island/screens/developers/edit_app.dart';
@@ -19,6 +18,7 @@ import 'package:island/screens/developers/edit_project.dart';
 import 'package:island/screens/developers/new_project.dart';
 import 'package:island/screens/developers/project_detail.dart';
 import 'package:island/screens/discovery/articles.dart';
+import 'package:island/screens/files/file_list.dart';
 import 'package:island/screens/posts/post_categories_list.dart';
 import 'package:island/screens/posts/post_category_detail.dart';
 import 'package:island/screens/posts/post_search.dart';
@@ -35,10 +35,11 @@ import 'package:island/screens/account/me/profile_update.dart';
 import 'package:island/screens/account/leveling.dart';
 import 'package:island/screens/account/me/account_settings.dart';
 import 'package:island/screens/chat/chat.dart';
+import 'package:island/screens/chat/chat_form.dart';
 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_screen.dart';
+import 'package:island/screens/chat/search_messages.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';
@@ -48,7 +49,7 @@ import 'package:island/screens/stickers/pack_detail.dart';
 import 'package:island/screens/discovery/feeds/feed_marketplace.dart';
 import 'package:island/screens/discovery/feeds/feed_detail.dart';
 import 'package:island/screens/creators/poll/poll_list.dart';
-import 'package:island/screens/creators/publishers.dart';
+import 'package:island/screens/creators/publishers_form.dart';
 import 'package:island/screens/creators/webfeed/webfeed_list.dart';
 import 'package:island/screens/creators/webfeed/webfeed_edit.dart';
 import 'package:island/screens/poll/poll_editor.dart';
@@ -59,12 +60,15 @@ import 'package:island/screens/auth/login.dart';
 import 'package:island/screens/auth/create_account.dart';
 import 'package:island/screens/settings.dart';
 import 'package:island/screens/realm/realms.dart';
+import 'package:island/screens/realm/realm_form.dart';
 import 'package:island/screens/realm/realm_detail.dart';
 import 'package:island/screens/account/event_calendar.dart';
 import 'package:island/screens/discovery/realms.dart';
 import 'package:island/screens/reports/report_detail.dart';
 import 'package:island/screens/reports/report_list.dart';
+import 'package:island/talker.dart';
 import 'package:island/widgets/post/post_shuffle.dart';
+import 'package:talker_flutter/talker_flutter.dart';
 
 // Shell route keys for nested navigation
 final rootNavigatorKey = GlobalKey<NavigatorState>();
@@ -86,11 +90,7 @@ Widget _tabPagesTransitionBuilder(
 }
 
 bool get _supportsAnalytics =>
-    kIsWeb ||
+    kIsWeb || Platform.isAndroid || Platform.isIOS || Platform.isMacOS;
-    Platform.isAndroid ||
-    Platform.isIOS ||
-    Platform.isMacOS ||
-    Platform.isWindows;
 
 // Provider for the router
 final routerProvider = Provider<GoRouter>((ref) {
@@ -100,6 +100,7 @@ final routerProvider = Provider<GoRouter>((ref) {
     observers: [
       if (_supportsAnalytics)
         FirebaseAnalyticsObserver(analytics: FirebaseAnalytics.instance),
+      TalkerRouteObserver(talker),
     ],
     routes: [
       ShellRoute(
@@ -136,6 +137,11 @@ final routerProvider = Provider<GoRouter>((ref) {
               return CallScreen(roomId: id);
             },
           ),
+          GoRoute(
+            name: 'logs',
+            path: '/logs',
+            builder: (context, state) => TalkerScreen(talker: talker),
+          ),
           GoRoute(
             name: 'accountCalendar',
             path: '/account/:name/calendar',
@@ -660,9 +666,9 @@ final routerProvider = Provider<GoRouter>((ref) {
                     builder: (context, state) => const WalletScreen(),
                   ),
                   GoRoute(
-                    name: 'socialCredits',
+                    name: 'files',
-                    path: '/account/credits',
+                    path: '/account/files',
-                    builder: (context, state) => const SocialCreditsScreen(),
+                    builder: (context, state) => const FileListScreen(),
                   ),
                   GoRoute(
                     name: 'relationships',

lib/screens/about.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/services/udid.native.dart';
+import 'package:island/services/udid.dart' as udid;
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -68,7 +68,7 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
     try {
       final deviceInfoPlugin = DeviceInfoPlugin();
       _deviceInfo = await deviceInfoPlugin.deviceInfo;
-      _deviceUdid = await getUdid();
+      _deviceUdid = await udid.getUdid();
       if (mounted) {
         setState(() {});
       }
@@ -174,12 +174,20 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
                             context,
                             title: 'Device Information',
                             children: [
-                              _buildInfoItem(
+                              FutureBuilder<String>(
-                                context,
+                                future: udid.getDeviceName(),
-                                icon: Symbols.label,
+                                builder: (context, snapshot) {
-                                label: 'aboutDeviceName'.tr(),
+                                  final value =
-                                value:
+                                      snapshot.hasData
-                                    _deviceInfo?.data['name'] ?? 'unknown'.tr(),
+                                          ? snapshot.data!
+                                          : 'unknown'.tr();
+                                  return _buildInfoItem(
+                                    context,
+                                    icon: Symbols.label,
+                                    label: 'aboutDeviceName'.tr(),
+                                    value: value,
+                                  );
+                                },
                               ),
                               _buildInfoItem(
                                 context,
@@ -203,21 +211,11 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
                               icon: Symbols.system_update,
                               title: 'Check for updates',
                               onTap: () async {
-                                // Fetch latest release and show the unified sheet
                                 final svc = UpdateService();
-                                // Reuse service fetch + compare to decide content
                                 showLoadingModal(context);
-                                final release = await svc.fetchLatestRelease();
+                                svc.checkForUpdates(context);
                                 if (!context.mounted) return;
                                 hideLoadingModal(context);
-                                if (release != null) {
-                                  await svc.showUpdateSheet(context, release);
-                                } else {
-                                  showInfoAlert(
-                                    'Currently cannot get update from the GitHub.',
-                                    'Unable to check for updates',
-                                  );
-                                }
                               },
                             ),
                             _buildListTile(

lib/screens/account.dart

@@ -66,7 +66,6 @@ class AccountScreen extends HookConsumerWidget {
       isNoBackground: isWide,
       appBar: AppBar(backgroundColor: Colors.transparent, toolbarHeight: 0),
       body: SingleChildScrollView(
-        padding: getTabbedPadding(context),
         child: Column(
           spacing: 4,
           children: <Widget>[
@@ -141,20 +140,22 @@ class AccountScreen extends HookConsumerWidget {
                 ],
               ),
             ).padding(horizontal: 8),
-            GestureDetector(
+            LevelingProgressCard(
-              child: LevelingProgressCard(
+              isCompact: true,
-                level: user.value!.profile.level,
+              level: user.value!.profile.level,
-                experience: user.value!.profile.experience,
+              experience: user.value!.profile.experience,
-                progress: user.value!.profile.levelingProgress,
+              progress: user.value!.profile.levelingProgress,
-              ),
               onTap: () {
                 context.pushNamed('leveling');
               },
             ).padding(horizontal: 12),
+            const SizedBox.shrink(),
             Row(
+              spacing: 8,
               children: [
                 Expanded(
                   child: Card(
+                    margin: EdgeInsets.zero,
                     child: InkWell(
                       borderRadius: BorderRadius.circular(8),
                       child: Column(
@@ -181,6 +182,7 @@ class AccountScreen extends HookConsumerWidget {
                 ),
                 Expanded(
                   child: Card(
+                    margin: EdgeInsets.zero,
                     child: InkWell(
                       borderRadius: BorderRadius.circular(8),
                       child: Column(
@@ -206,7 +208,73 @@ class AccountScreen extends HookConsumerWidget {
                   ).height(140),
                 ),
               ],
-            ).padding(horizontal: 8),
+            ).padding(horizontal: 12),
+            const SizedBox.shrink(),
+            Row(
+              spacing: 8,
+              children: [
+                Expanded(
+                  child: Card(
+                    margin: EdgeInsets.zero,
+                    child: InkWell(
+                      borderRadius: BorderRadius.circular(8),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Icon(Symbols.settings, size: 28).padding(bottom: 8),
+                          Text('appSettings').tr().fontSize(16).bold(),
+                        ],
+                      ).padding(horizontal: 16, vertical: 12),
+                      onTap: () {
+                        context.pushNamed('settings');
+                      },
+                    ),
+                  ).height(120),
+                ),
+                Expanded(
+                  child: Card(
+                    margin: EdgeInsets.zero,
+                    child: InkWell(
+                      borderRadius: BorderRadius.circular(8),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Icon(
+                            Symbols.person_edit,
+                            size: 28,
+                          ).padding(bottom: 8),
+                          Text('updateYourProfile').tr().fontSize(16).bold(),
+                        ],
+                      ).padding(horizontal: 16, vertical: 12),
+                      onTap: () {
+                        context.pushNamed('profileUpdate');
+                      },
+                    ),
+                  ).height(120),
+                ),
+                Expanded(
+                  child: Card(
+                    margin: EdgeInsets.zero,
+                    child: InkWell(
+                      borderRadius: BorderRadius.circular(8),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Icon(
+                            Symbols.manage_accounts,
+                            size: 28,
+                          ).padding(bottom: 8),
+                          Text('accountSettings').tr().fontSize(16).bold(),
+                        ],
+                      ).padding(horizontal: 16, vertical: 12),
+                      onTap: () {
+                        context.pushNamed('accountSettings');
+                      },
+                    ),
+                  ).height(120),
+                ),
+              ],
+            ).padding(horizontal: 12),
             ListTile(
               minTileHeight: 48,
               leading: const Icon(Symbols.notifications),
@@ -235,6 +303,16 @@ class AccountScreen extends HookConsumerWidget {
                 context.pushNamed('wallet');
               },
             ),
+            ListTile(
+              minTileHeight: 48,
+              leading: const Icon(Symbols.files),
+              trailing: const Icon(Symbols.chevron_right),
+              contentPadding: EdgeInsets.symmetric(horizontal: 24),
+              title: Text('files').tr(),
+              onTap: () {
+                context.pushNamed('files');
+              },
+            ),
             ListTile(
               minTileHeight: 48,
               leading: const Icon(Symbols.people),
@@ -265,16 +343,6 @@ class AccountScreen extends HookConsumerWidget {
                 context.pushNamed('webFeedMarketplace');
               },
             ),
-            ListTile(
-              minTileHeight: 48,
-              leading: const Icon(Symbols.star),
-              trailing: const Icon(Symbols.chevron_right),
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-              title: Text('credits').tr(),
-              onTap: () {
-                context.pushNamed('socialCredits');
-              },
-            ),
             ListTile(
               minTileHeight: 48,
               title: Text('abuseReport').tr(),
@@ -284,37 +352,6 @@ class AccountScreen extends HookConsumerWidget {
               onTap: () => context.pushNamed('reportList'),
             ),
             const Divider(height: 1).padding(vertical: 8),
-            ListTile(
-              minTileHeight: 48,
-              leading: const Icon(Symbols.settings),
-              trailing: const Icon(Symbols.chevron_right),
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-              title: Text('appSettings').tr(),
-              onTap: () {
-                context.pushNamed('settings');
-              },
-            ),
-            ListTile(
-              minTileHeight: 48,
-              leading: const Icon(Symbols.person_edit),
-              trailing: const Icon(Symbols.chevron_right),
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-              title: Text('updateYourProfile').tr(),
-              onTap: () {
-                context.pushNamed('profileUpdate');
-              },
-            ),
-            ListTile(
-              minTileHeight: 48,
-              leading: const Icon(Symbols.manage_accounts),
-              trailing: const Icon(Symbols.chevron_right),
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-              title: Text('accountSettings').tr(),
-              onTap: () {
-                context.pushNamed('accountSettings');
-              },
-            ),
-            const Divider(height: 1).padding(vertical: 8),
             ListTile(
               minTileHeight: 48,
               leading: const Icon(Symbols.info),
@@ -333,6 +370,8 @@ class AccountScreen extends HookConsumerWidget {
               title: Text('debugOptions').tr(),
               onTap: () {
                 showModalBottomSheet(
+                  useRootNavigator: true,
+                  isScrollControlled: true,
                   context: context,
                   builder: (context) => DebugSheet(),
                 );

lib/screens/account/credits.dart

@@ -4,7 +4,6 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
@@ -59,94 +58,93 @@ class SocialCreditHistoryNotifier extends _$SocialCreditHistoryNotifier
   }
 }
 
-class SocialCreditsScreen extends HookConsumerWidget {
+class SocialCreditsTab extends HookConsumerWidget {
-  const SocialCreditsScreen({super.key});
+  const SocialCreditsTab({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final socialCredits = ref.watch(socialCreditsProvider);
-
+    return Column(
-    return AppScaffold(
+      children: [
-      appBar: AppBar(title: Text('socialCredits').tr()),
+        const Gap(8),
-      body: Column(
+        Card(
-        children: [
+          margin: const EdgeInsets.only(left: 16, right: 16, top: 8),
-          Card(
+          child: socialCredits
-            margin: EdgeInsets.only(left: 16, right: 16, top: 8),
+              .when(
-            child: socialCredits
+                data:
-                .when(
+                    (credits) => Stack(
-                  data:
+                      children: [
-                      (credits) => Stack(
+                        Column(
-                        children: [
+                          crossAxisAlignment: CrossAxisAlignment.start,
-                          Column(
+                          children: [
-                            crossAxisAlignment: CrossAxisAlignment.start,
+                            Text(
-                            children: [
+                              credits < 100
-                              Text(
+                                  ? 'socialCreditsLevelPoor'.tr()
-                                credits < 100
+                                  : credits < 150
-                                    ? 'socialCreditsLevelPoor'.tr()
+                                  ? 'socialCreditsLevelNormal'.tr()
-                                    : credits < 150
+                                  : credits < 200
-                                    ? 'socialCreditsLevelNormal'.tr()
+                                  ? 'socialCreditsLevelGood'.tr()
-                                    : credits < 200
+                                  : 'socialCreditsLevelExcellent'.tr(),
-                                    ? 'socialCreditsLevelGood'.tr()
+                            ).tr().bold().fontSize(20),
-                                    : 'socialCreditsLevelExcellent'.tr(),
+                            Text(
-                              ).tr().bold().fontSize(20),
+                              '${credits.toStringAsFixed(2)} pts',
-                              Text(
+                            ).fontSize(14),
-                                '${credits.toStringAsFixed(2)} pts',
+                            const Gap(8),
-                              ).fontSize(14),
+                            LinearProgressIndicator(value: credits / 200),
-                              const Gap(8),
+                          ],
-                              LinearProgressIndicator(value: credits / 200),
+                        ),
-                            ],
+                        Positioned(
+                          right: 0,
+                          top: 0,
+                          child: IconButton(
+                            onPressed: () {},
+                            icon: const Icon(Symbols.info),
+                            tooltip: 'socialCreditsDescription'.tr(),
                           ),
-                          Positioned(
+                        ),
-                            right: 0,
+                      ],
-                            top: 0,
+                    ),
-                            child: IconButton(
+                error: (_, _) => Text('Error loading credits'),
-                              onPressed: () {},
+                loading: () => const LinearProgressIndicator(),
-                              icon: const Icon(Symbols.info),
+              )
-                              tooltip: 'socialCreditsDescription'.tr(),
+              .padding(horizontal: 20, vertical: 16),
-                            ),
+        ),
-                          ),
+        Expanded(
-                        ],
+          child: PagingHelperView(
+            provider: socialCreditHistoryNotifierProvider,
+            futureRefreshable: socialCreditHistoryNotifierProvider.future,
+            notifierRefreshable: socialCreditHistoryNotifierProvider.notifier,
+            contentBuilder:
+                (data, widgetCount, endItemView) => ListView.builder(
+                  padding: EdgeInsets.zero,
+                  itemCount: widgetCount,
+                  itemBuilder: (context, index) {
+                    if (index == widgetCount - 1) {
+                      return endItemView;
+                    }
+                    final record = data.items[index];
+                    return ListTile(
+                      contentPadding: const EdgeInsets.symmetric(
+                        horizontal: 24,
                       ),
-                  error: (_, _) => Text('Error loading credits'),
+                      title: Text(record.reason),
-                  loading: () => const LinearProgressIndicator(),
+                      subtitle: Text(
-                )
+                        DateFormat.yMMMd().format(record.createdAt),
-                .padding(horizontal: 20, vertical: 16),
+                      ),
-          ),
+                      trailing: Text(
-          Expanded(
+                        record.delta > 0
-            child: PagingHelperView(
+                            ? '+${record.delta}'
-              provider: socialCreditHistoryNotifierProvider,
+                            : '${record.delta}',
-              futureRefreshable: socialCreditHistoryNotifierProvider.future,
+                        style: TextStyle(
-              notifierRefreshable: socialCreditHistoryNotifierProvider.notifier,
+                          color: record.delta > 0 ? Colors.green : Colors.red,
-              contentBuilder:
-                  (data, widgetCount, endItemView) => ListView.builder(
-                    padding: EdgeInsets.zero,
-                    itemCount: widgetCount,
-                    itemBuilder: (context, index) {
-                      if (index == widgetCount - 1) {
-                        return endItemView;
-                      }
-                      final record = data.items[index];
-                      return ListTile(
-                        contentPadding: EdgeInsets.symmetric(horizontal: 24),
-                        title: Text(record.reason),
-                        subtitle: Text(
-                          DateFormat.yMMMd().format(record.createdAt),
                         ),
-                        trailing: Text(
+                      ),
-                          record.delta > 0
+                    );
-                              ? '+${record.delta}'
+                  },
-                              : '${record.delta}',
+                ),
-                          style: TextStyle(
-                            color: record.delta > 0 ? Colors.green : Colors.red,
-                          ),
-                        ),
-                      );
-                    },
-                  ),
-            ),
           ),
-        ],
+        ),
-      ),
+      ],
     );
   }
 }

lib/screens/account/leveling.dart

@@ -1,42 +1,21 @@
-import 'dart:io';
-
-import 'package:dio/dio.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/account.dart';
-import 'package:island/models/wallet.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
-import 'package:island/services/responsive.dart';
+import 'package:island/screens/account/credits.dart';
 import 'package:island/services/time.dart';
 import 'package:island/widgets/account/leveling_progress.dart';
-import 'package:island/widgets/account/restore_purchase_sheet.dart';
+import 'package:island/widgets/account/stellar_program_tab.dart';
-import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
-import 'package:island/widgets/payment/payment_overlay.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:styled_widget/styled_widget.dart';
 
 part 'leveling.g.dart';
 
-@riverpod
-Future<SnWalletSubscription?> accountStellarSubscription(Ref ref) async {
-  try {
-    final client = ref.watch(apiClientProvider);
-    final resp = await client.get('/id/subscriptions/fuzzy/solian.stellar');
-    return SnWalletSubscription.fromJson(resp.data);
-  } catch (err) {
-    if (err is DioException && err.response?.statusCode == 404) return null;
-    rethrow;
-  }
-}
-
 @riverpod
 class LevelingHistoryNotifier extends _$LevelingHistoryNotifier
     with CursorPagingNotifierMixin<SnExperienceRecord> {
@@ -89,7 +68,7 @@ class LevelingScreen extends HookConsumerWidget {
     }
 
     return DefaultTabController(
-      length: 2,
+      length: 3,
       child: AppScaffold(
         appBar: AppBar(
           title: Text('levelingProgress'.tr()),
@@ -104,6 +83,15 @@ class LevelingScreen extends HookConsumerWidget {
                   ),
                 ),
               ),
+              Tab(
+                child: Text(
+                  'socialCredits'.tr(),
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: Theme.of(context).appBarTheme.foregroundColor!,
+                  ),
+                ),
+              ),
               Tab(
                 child: Text(
                   'stellarProgram'.tr(),
@@ -119,7 +107,8 @@ class LevelingScreen extends HookConsumerWidget {
         body: TabBarView(
           children: [
             _buildLevelingTab(context, ref, user.value!),
-            _buildStellarProgramTab(context, ref),
+            const SocialCreditsTab(),
+            const StellarProgramTab(),
           ],
         ),
       ),
@@ -138,7 +127,6 @@ class LevelingScreen extends HookConsumerWidget {
     return Center(
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 20),
-        constraints: const BoxConstraints(maxWidth: 480),
         child: CustomScrollView(
           slivers: [
             const SliverGap(20),
@@ -164,10 +152,33 @@ class LevelingScreen extends HookConsumerWidget {
             ),
             const SliverGap(16),
 
-            // Stairs visualization with fixed height and horizontal scroll
+            SliverToBoxAdapter(
-            SliverToBoxAdapter(child: _buildLevelStairs(context, currentLevel)),
+              child: Card(
-            const SliverGap(24),
+                margin: EdgeInsets.zero,
-
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Text(
+                      '${'levelingProgressLevel'.tr(args: [currentLevel.toString()])} / 120',
+                      textAlign: TextAlign.start,
+                      style: Theme.of(context).textTheme.bodySmall,
+                    ),
+                    const Gap(8),
+                    LinearProgressIndicator(
+                      value: currentLevel / 120,
+                      minHeight: 10,
+                      stopIndicatorRadius: 0,
+                      trackGap: 0,
+                      color: Theme.of(context).colorScheme.primary,
+                      backgroundColor:
+                          Theme.of(context).colorScheme.surfaceContainerHigh,
+                      borderRadius: BorderRadius.circular(32),
+                    ),
+                  ],
+                ).padding(horizontal: 16, top: 16, bottom: 12),
+              ),
+            ),
+            const SliverGap(16),
             // Leveling History
             SliverToBoxAdapter(
               child: Text(
@@ -227,582 +238,12 @@ class LevelingScreen extends HookConsumerWidget {
                   ),
             ),
 
-            SliverGap(getTabbedPadding(context, vertical: 20).vertical),
+            SliverGap(20),
           ],
         ),
       ),
     );
   }
-
-  Widget _buildStellarProgramTab(BuildContext context, WidgetRef ref) {
-    final stellarSubscription = ref.watch(accountStellarSubscriptionProvider);
-
-    return SingleChildScrollView(
-      padding: getTabbedPadding(context, horizontal: 20, vertical: 20),
-      child: Center(
-        child: ConstrainedBox(
-          constraints: const BoxConstraints(maxWidth: 480),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              _buildMembershipSection(context, ref, stellarSubscription),
-              const Gap(16),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildLevelStairs(BuildContext context, int currentLevel) {
-    const totalLevels = 14;
-    const stairHeight = 20.0;
-    const stairWidth = 50.0;
-    const containerHeight = 280.0;
-
-    return Container(
-      height: containerHeight,
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(12),
-        border: Border.all(
-          color: Theme.of(context).colorScheme.outline.withOpacity(0.2),
-        ),
-      ),
-      child: SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        padding: const EdgeInsets.symmetric(horizontal: 16),
-        child: SizedBox(
-          width: (totalLevels * (stairWidth + 8)) + 40,
-          height: containerHeight,
-          child: CustomPaint(
-            painter: LevelStairsPainter(
-              currentLevel: currentLevel,
-              totalLevels: totalLevels,
-              primaryColor: Theme.of(context).colorScheme.primary,
-              surfaceColor: Theme.of(context).colorScheme.surfaceContainerHigh,
-              onSurfaceColor: Theme.of(context).colorScheme.onSurface,
-              stairHeight: stairHeight,
-              stairWidth: stairWidth,
-            ),
-            child: Stack(
-              children: List.generate(totalLevels, (index) {
-                final level = index + 1;
-                final isCompleted = level <= currentLevel;
-                final isCurrent = level == currentLevel;
-
-                // Calculate position from bottom
-                final bottomPosition = 0.0;
-                final leftPosition = 20.0 + (index * (stairWidth + 8));
-
-                // Make higher levels progressively taller
-                final progressiveHeight =
-                    40.0 + (index * 15.0); // Base height + progressive increase
-
-                return Positioned(
-                  left: leftPosition,
-                  bottom: bottomPosition,
-                  child: Container(
-                    width: stairWidth,
-                    height: progressiveHeight,
-                    decoration: BoxDecoration(
-                      color:
-                          isCompleted
-                              ? Theme.of(context).colorScheme.primary
-                              : Theme.of(
-                                context,
-                              ).colorScheme.surfaceContainerHigh,
-                      borderRadius: const BorderRadius.only(
-                        topLeft: Radius.circular(6),
-                        topRight: Radius.circular(6),
-                      ),
-                      border:
-                          isCurrent
-                              ? Border.all(
-                                color: Theme.of(context).colorScheme.primary,
-                                width: 2,
-                              )
-                              : null,
-                      boxShadow:
-                          isCurrent
-                              ? [
-                                BoxShadow(
-                                  color: Theme.of(
-                                    context,
-                                  ).colorScheme.primary.withOpacity(0.3),
-                                  blurRadius: 6,
-                                  spreadRadius: 1,
-                                ),
-                              ]
-                              : null,
-                    ),
-                    child: Padding(
-                      padding: const EdgeInsets.only(top: 8),
-                      child: Column(
-                        children: [
-                          Text(
-                            level.toString(),
-                            style: GoogleFonts.robotoMono(
-                              fontSize: 14,
-                              fontWeight: FontWeight.bold,
-                              color:
-                                  isCompleted
-                                      ? Theme.of(context).colorScheme.onPrimary
-                                      : Theme.of(context).colorScheme.onSurface,
-                            ),
-                          ),
-                          if (isCurrent) ...[
-                            const Gap(4),
-                            Container(
-                              width: 4,
-                              height: 4,
-                              decoration: BoxDecoration(
-                                color: Theme.of(context).colorScheme.onPrimary,
-                                shape: BoxShape.circle,
-                              ),
-                            ),
-                          ],
-                        ],
-                      ),
-                    ),
-                  ),
-                );
-              }),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildMembershipSection(
-    BuildContext context,
-    WidgetRef ref,
-    AsyncValue<SnWalletSubscription?> stellarSubscriptionAsync,
-  ) {
-    return stellarSubscriptionAsync.when(
-      data: (membership) => _buildMembershipContent(context, ref, membership),
-      loading:
-          () => Container(
-            width: double.infinity,
-            padding: const EdgeInsets.all(16),
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                colors: [
-                  Theme.of(context).colorScheme.primaryContainer,
-                  Theme.of(context).colorScheme.secondaryContainer,
-                ],
-                begin: Alignment.topLeft,
-                end: Alignment.bottomRight,
-              ),
-              borderRadius: BorderRadius.circular(12),
-            ),
-            child: const Center(child: CircularProgressIndicator()),
-          ),
-      error:
-          (error, stack) => Container(
-            width: double.infinity,
-            padding: const EdgeInsets.all(16),
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                colors: [
-                  Theme.of(context).colorScheme.primaryContainer,
-                  Theme.of(context).colorScheme.secondaryContainer,
-                ],
-                begin: Alignment.topLeft,
-                end: Alignment.bottomRight,
-              ),
-              borderRadius: BorderRadius.circular(12),
-            ),
-            child: Text('Error loading membership: $error'),
-          ),
-    );
-  }
-
-  Widget _buildMembershipContent(
-    BuildContext context,
-    WidgetRef ref,
-    SnWalletSubscription? membership,
-  ) {
-    final isActive = membership?.isActive ?? false;
-
-    Future<void> membershipCancel() async {
-      if (!isActive || membership == null) return;
-
-      final confirm = await showConfirmAlert(
-        'membershipCancelHint'.tr(),
-        'membershipCancelConfirm'.tr(),
-      );
-      if (!confirm || !context.mounted) return;
-
-      try {
-        showLoadingModal(context);
-        final client = ref.watch(apiClientProvider);
-        await client.post('/id/subscriptions/${membership.identifier}/cancel');
-        ref.invalidate(accountStellarSubscriptionProvider);
-        ref.read(userInfoProvider.notifier).fetchUser();
-        if (context.mounted) {
-          hideLoadingModal(context);
-          showSnackBar('membershipCancelSuccess'.tr());
-        }
-      } catch (err) {
-        if (context.mounted) hideLoadingModal(context);
-        showErrorAlert(err);
-      }
-    }
-
-    return Container(
-      width: double.infinity,
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        gradient: LinearGradient(
-          colors: [
-            Theme.of(context).colorScheme.primaryContainer,
-            Theme.of(context).colorScheme.secondaryContainer,
-          ],
-          begin: Alignment.topLeft,
-          end: Alignment.bottomRight,
-        ),
-        borderRadius: BorderRadius.circular(12),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          Row(
-            children: [
-              Icon(
-                isActive ? Icons.star : Icons.star_border,
-                color: Theme.of(context).colorScheme.primary,
-                size: 24,
-              ),
-              const Gap(8),
-              Text(
-                'stellarMembership'.tr(),
-                style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-              ),
-            ],
-          ),
-          const Gap(12),
-
-          if (isActive) ...[
-            _buildCurrentMembershipCard(context, membership!),
-            const Gap(12),
-            FilledButton.icon(
-              style: ButtonStyle(
-                backgroundColor: WidgetStateProperty.all(
-                  Theme.of(context).colorScheme.error,
-                ),
-                foregroundColor: WidgetStateProperty.all(
-                  Theme.of(context).colorScheme.onError,
-                ),
-              ),
-              onPressed: membershipCancel,
-              icon: const Icon(Symbols.cancel),
-              label: Text('membershipCancel'.tr()),
-            ),
-          ],
-
-          if (!isActive) ...[
-            Text(
-              'chooseYourPlan'.tr(),
-              style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
-            ),
-            const Gap(12),
-            _buildMembershipTiers(context, ref, membership),
-          ],
-
-          // Restore Purchase Button
-          // As you know Apple platform need IAP
-          if (kIsWeb || !(Platform.isIOS || Platform.isMacOS))
-            OutlinedButton.icon(
-              onPressed: () => _showRestorePurchaseSheet(context, ref),
-              icon: const Icon(Icons.restore),
-              label: Text('restorePurchase'.tr()),
-              style: OutlinedButton.styleFrom(
-                minimumSize: const Size(double.infinity, 48),
-              ),
-            ).padding(top: 12),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCurrentMembershipCard(
-    BuildContext context,
-    SnWalletSubscription membership,
-  ) {
-    final tierName = _getMembershipTierName(membership.identifier);
-    final tierColor = _getMembershipTierColor(context, membership.identifier);
-
-    return Container(
-      padding: const EdgeInsets.all(12),
-      decoration: BoxDecoration(
-        color: tierColor.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(8),
-        border: Border.all(color: tierColor, width: 1),
-      ),
-      child: Row(
-        children: [
-          Icon(Icons.verified, color: tierColor, size: 20),
-          const Gap(8),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  'currentMembership'.tr(args: [tierName]),
-                  style: TextStyle(
-                    fontSize: 14,
-                    fontWeight: FontWeight.w600,
-                    color: tierColor,
-                  ),
-                ),
-                if (membership.endedAt != null)
-                  Text(
-                    'membershipExpires'.tr(
-                      args: [membership.endedAt!.formatSystem()],
-                    ),
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
-                  ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildMembershipTiers(
-    BuildContext context,
-    WidgetRef ref,
-    SnWalletSubscription? currentMembership,
-  ) {
-    final tiers = [
-      {
-        'id': 'solian.stellar.primary',
-        'name': 'membershipTierStellar'.tr(),
-        'price': 'membershipPriceStellar'.tr(),
-        'color': Colors.blue,
-      },
-      {
-        'id': 'solian.stellar.nova',
-        'name': 'membershipTierNova'.tr(),
-        'price': 'membershipPriceNova'.tr(),
-        'color': Color.fromRGBO(57, 197, 187, 1),
-      },
-      {
-        'id': 'solian.stellar.supernova',
-        'name': 'membershipTierSupernova'.tr(),
-        'price': 'membershipPriceSupernova'.tr(),
-        'color': Colors.orange,
-      },
-    ];
-
-    return Column(
-      children:
-          tiers.map((tier) {
-            final isCurrentTier = currentMembership?.identifier == tier['id'];
-            final tierColor = tier['color'] as Color;
-
-            return Container(
-              margin: const EdgeInsets.only(bottom: 8),
-              child: Material(
-                color: Colors.transparent,
-                child: InkWell(
-                  onTap:
-                      isCurrentTier
-                          ? null
-                          : () => _purchaseMembership(
-                            context,
-                            ref,
-                            tier['id'] as String,
-                          ),
-                  borderRadius: BorderRadius.circular(8),
-                  child: Container(
-                    padding: const EdgeInsets.all(12),
-                    decoration: BoxDecoration(
-                      color:
-                          isCurrentTier
-                              ? tierColor.withOpacity(0.1)
-                              : Theme.of(context).colorScheme.surface,
-                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(
-                        color:
-                            isCurrentTier
-                                ? tierColor
-                                : Theme.of(
-                                  context,
-                                ).colorScheme.outline.withOpacity(0.2),
-                        width: isCurrentTier ? 2 : 1,
-                      ),
-                    ),
-                    child: Row(
-                      children: [
-                        Container(
-                          width: 4,
-                          height: 40,
-                          decoration: BoxDecoration(
-                            color: tierColor,
-                            borderRadius: BorderRadius.circular(2),
-                          ),
-                        ),
-                        const Gap(12),
-                        Expanded(
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Row(
-                                children: [
-                                  Text(
-                                    tier['name'] as String,
-                                    style: TextStyle(
-                                      fontSize: 16,
-                                      fontWeight: FontWeight.w600,
-                                      color: isCurrentTier ? tierColor : null,
-                                    ),
-                                  ),
-                                  const Gap(8),
-                                  if (isCurrentTier)
-                                    Container(
-                                      padding: const EdgeInsets.symmetric(
-                                        horizontal: 6,
-                                        vertical: 2,
-                                      ),
-                                      decoration: BoxDecoration(
-                                        color: tierColor,
-                                        borderRadius: BorderRadius.circular(4),
-                                      ),
-                                      child: Text(
-                                        'membershipCurrentBadge'.tr(),
-                                        style: TextStyle(
-                                          fontSize: 10,
-                                          fontWeight: FontWeight.bold,
-                                          color: Colors.white,
-                                        ),
-                                      ),
-                                    ),
-                                ],
-                              ),
-                              Text(
-                                tier['price'] as String,
-                                style: Theme.of(
-                                  context,
-                                ).textTheme.bodyMedium?.copyWith(
-                                  color:
-                                      Theme.of(
-                                        context,
-                                      ).colorScheme.onSurfaceVariant,
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                        if (!isCurrentTier)
-                          Icon(
-                            Icons.arrow_forward_ios,
-                            size: 16,
-                            color:
-                                Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            );
-          }).toList(),
-    );
-  }
-
-  String _getMembershipTierName(String identifier) {
-    switch (identifier) {
-      case 'solian.stellar.primary':
-        return 'membershipTierStellar'.tr();
-      case 'solian.stellar.nova':
-        return 'membershipTierNova'.tr();
-      case 'solian.stellar.supernova':
-        return 'membershipTierSupernova'.tr();
-      default:
-        return 'membershipTierUnknown'.tr();
-    }
-  }
-
-  Color _getMembershipTierColor(BuildContext context, String identifier) {
-    switch (identifier) {
-      case 'solian.stellar.primary':
-        return Colors.blue;
-      case 'solian.stellar.nova':
-        return Colors.purple;
-      case 'solian.stellar.supernova':
-        return Colors.orange;
-      default:
-        return Theme.of(context).colorScheme.primary;
-    }
-  }
-
-  Future<void> _showRestorePurchaseSheet(
-    BuildContext context,
-    WidgetRef ref,
-  ) async {
-    await showModalBottomSheet(
-      context: context,
-      builder: (context) => const RestorePurchaseSheet(),
-    );
-  }
-
-  Future<void> _purchaseMembership(
-    BuildContext context,
-    WidgetRef ref,
-    String tierId,
-  ) async {
-    final client = ref.watch(apiClientProvider);
-    try {
-      showLoadingModal(context);
-      final resp = await client.post(
-        '/id/subscriptions',
-        data: {
-          'identifier': tierId,
-          'payment_method': 'solian.wallet',
-          'payment_details': {'currency': 'golds'},
-          'cycle_duration_days': 30,
-        },
-        options: Options(headers: {'X-Noop': true}),
-      );
-      final subscription = SnWalletSubscription.fromJson(resp.data);
-      if (subscription.status == 1) return;
-      final orderResp = await client.post(
-        '/id/subscriptions/${subscription.identifier}/order',
-      );
-      final order = SnWalletOrder.fromJson(orderResp.data);
-
-      if (context.mounted) hideLoadingModal(context);
-
-      // Show payment overlay to complete the payment
-      if (!context.mounted) return;
-      final paidOrder = await PaymentOverlay.show(
-        context: context,
-        order: order,
-        enableBiometric: true,
-      );
-
-      if (context.mounted) showLoadingModal(context);
-
-      if (paidOrder != null) {
-        // Wait for server to handle order
-        await Future.delayed(const Duration(seconds: 1));
-        ref.invalidate(accountStellarSubscriptionProvider);
-        ref.read(userInfoProvider.notifier).fetchUser();
-        if (context.mounted) {
-          showSnackBar('membershipPurchaseSuccess'.tr());
-        }
-      }
-    } catch (err) {
-      showErrorAlert(err);
-    } finally {
-      if (context.mounted) hideLoadingModal(context);
-    }
-  }
 }
 
 class LevelStairsPainter extends CustomPainter {

lib/screens/account/leveling.g.dart

@@ -6,27 +6,6 @@ part of 'leveling.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$accountStellarSubscriptionHash() =>
-    r'80abcdefb3868775fd8fe3c980215713efff5948';
-
-/// See also [accountStellarSubscription].
-@ProviderFor(accountStellarSubscription)
-final accountStellarSubscriptionProvider =
-    AutoDisposeFutureProvider<SnWalletSubscription?>.internal(
-      accountStellarSubscription,
-      name: r'accountStellarSubscriptionProvider',
-      debugGetCreateSourceHash:
-          const bool.fromEnvironment('dart.vm.product')
-              ? null
-              : _$accountStellarSubscriptionHash,
-      dependencies: null,
-      allTransitiveDependencies: null,
-    );
-
-@Deprecated('Will be removed in 3.0. Use Ref instead')
-// ignore: unused_element
-typedef AccountStellarSubscriptionRef =
-    AutoDisposeFutureProviderRef<SnWalletSubscription?>;
 String _$levelingHistoryNotifierHash() =>
     r'e795f9b7911c9e50f15c095ea237cb0e87bf1e89';
 

lib/screens/account/me/profile_update.dart

@@ -9,10 +9,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/account.dart';
-import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/services/file.dart';
+import 'package:island/services/file_uploader.dart';
 import 'package:island/services/timezone.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -62,19 +62,13 @@ class UpdateProfileScreen extends HookConsumerWidget {
 
       submitting.value = true;
       try {
-        final baseUrl = ref.watch(serverUrlProvider);
-        final token = await getToken(ref.watch(tokenProvider));
-        if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await FileUploader.createCloudFile(
+              client: ref.read(apiClientProvider),
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,
               ),
-              atk: token,
-              baseUrl: baseUrl,
-              filename: result.name,
-              mimetype: result.mimeType ?? 'image/jpeg',
             ).future;
         if (cloudFile == null) {
           throw ArgumentError('Failed to upload the file...');

lib/screens/account/me/settings_connections.dart

@@ -168,7 +168,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
               scopes: [AppleIDAuthorizationScopes.email],
               webAuthenticationOptions: WebAuthenticationOptions(
                 clientId: 'dev.solsynth.solarpass',
-                redirectUri: Uri.parse('https://id.solian.app/auth/callback'),
+                redirectUri: Uri.parse('https://solian.app/auth/callback'),
               ),
             );
 

lib/screens/account/profile.dart

@@ -32,7 +32,7 @@ import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/markdown.dart';
 import 'package:island/widgets/safety/abuse_report_helper.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:palette_generator/palette_generator.dart';
+import 'package:island/services/color_extraction.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:styled_widget/styled_widget.dart';
@@ -98,7 +98,7 @@ class _AccountBasicInfo extends StatelessWidget {
             onPressed: () {
               SharePlus.instance.share(
                 ShareParams(
-                  uri: Uri.parse('https://id.solian.app/@${data.name}'),
+                  uri: Uri.parse('https://solian.app/@${data.name}'),
                 ),
               );
             },
@@ -581,14 +581,14 @@ Future<Color?> accountAppbarForcegroundColor(Ref ref, String uname) async {
   try {
     final account = await ref.watch(accountProvider(uname).future);
     if (account.profile.background == null) return null;
-    final palette = await PaletteGenerator.fromImageProvider(
+    final colors = await ColorExtractionService.getColorsFromImage(
       CloudImageWidget.provider(
         fileId: account.profile.background!.id,
         serverUrl: ref.watch(serverUrlProvider),
       ),
     );
-    final dominantColor = palette.dominantColor?.color;
+    if (colors.isEmpty) return null;
-    if (dominantColor == null) return null;
+    final dominantColor = colors.first;
     return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
   } catch (_) {
     return null;

lib/screens/account/profile.g.dart

@@ -268,7 +268,7 @@ class _AccountBadgesProviderElement
 }
 
 String _$accountAppbarForcegroundColorHash() =>
-    r'8ee0cae10817b77fb09548a482f5247662b4374c';
+    r'127fcc7fd6ec6a41ac4a6975276b5271aa4fa7d0';
 
 /// See also [accountAppbarForcegroundColor].
 @ProviderFor(accountAppbarForcegroundColor)

lib/screens/auth/captcha.config.dart

@@ -7,11 +7,6 @@ part 'captcha.config.g.dart';
 @riverpod
 Future<String> captchaUrl(Ref ref) async {
   final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get('/.well-known/services');
+  final baseUrl = await apiClient.get('/config/site');
-  final serviceMapping = await resp.data;
+  return '$baseUrl/auth/captcha';
-  var baseUrl = serviceMapping['DysonNetwork.Pass'] as String;
-  // The backend using self-signed certicates on development
-  // Which mobile simulator might not accept, use this to avoid errors
-  if (baseUrl.contains('https://localhost')) baseUrl = 'http://localhost:5216';
-  return '$baseUrl/captcha';
 }

lib/screens/auth/captcha.config.g.dart

@@ -6,7 +6,7 @@ part of 'captcha.config.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$captchaUrlHash() => r'bbed0d18272dd205069642b3c6583ea2eef735d1';
+String _$captchaUrlHash() => r'5d59de4f26a0544bf4fbd5209943f0b111959ce6';
 
 /// See also [captchaUrl].
 @ProviderFor(captchaUrl)

lib/screens/auth/login.dart

@@ -1,9 +1,6 @@
 import 'dart:convert';
-import 'dart:io';
 import 'dart:math' as math;
-
 import 'package:animations/animations.dart';
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
@@ -42,22 +39,6 @@ final Map<int, (String, String, IconData)> kFactorTypes = {
   4: ('authFactorPin', 'authFactorPinDescription', Symbols.nest_secure_alarm),
 };
 
-Future<String?> getDeviceName() async {
-  if (kIsWeb) return null;
-  String? name;
-  if (Platform.isIOS) {
-    final deviceInfo = await DeviceInfoPlugin().iosInfo;
-    name = deviceInfo.name;
-  } else if (Platform.isAndroid) {
-    final deviceInfo = await DeviceInfoPlugin().androidInfo;
-    name = deviceInfo.name;
-  } else if (Platform.isWindows) {
-    final deviceInfo = await DeviceInfoPlugin().windowsInfo;
-    name = deviceInfo.computerName;
-  }
-  return name;
-}
-
 class LoginScreen extends HookConsumerWidget {
   const LoginScreen({super.key});
 

lib/screens/chat/call.dart

@@ -1,11 +1,10 @@
-import 'dart:developer';
-
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart' hide ConnectionState;
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/pods/call.dart';
+import 'package:island/pods/chat/call.dart';
+import 'package:island/talker.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/chat/call_button.dart';
 import 'package:island/widgets/chat/call_overlay.dart';
@@ -26,14 +25,14 @@ class CallScreen extends HookConsumerWidget {
     final callNotifier = ref.watch(callNotifierProvider.notifier);
 
     useEffect(() {
-      log('[Call] Joining the call...');
+      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;
-          log('[Call] Joining the call... with overrides');
+          talker.info('[Call] Joining the call... with overrides');
           callNotifier.disconnect();
           callNotifier.dispose();
           callNotifier.joinRoom(roomId);

lib/screens/chat/chat.dart

@@ -1,5 +1,3 @@
-import 'package:collection/collection.dart';
-import 'package:croppy/croppy.dart' hide cropImage;
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -7,25 +5,18 @@ import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:image_picker/image_picker.dart';
 import 'package:island/models/chat.dart';
-import 'package:island/models/file.dart';
+import 'package:island/pods/chat/call.dart';
-import 'package:island/models/realm.dart';
+import 'package:island/pods/chat/chat_summary.dart';
-import 'package:island/pods/call.dart';
-import 'package:island/pods/chat_summary.dart';
-import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/screens/realm/realms.dart';
-import 'package:island/services/file.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/realm/realm_selection_dropdown.dart';
 import 'package:island/widgets/response.dart';
-import 'package:island/screens/tabs.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:relative_time/relative_time.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -178,6 +169,101 @@ Future<List<SnChatRoom>> chatroomsJoined(Ref ref) async {
       .toList();
 }
 
+class ChatListBodyWidget extends HookConsumerWidget {
+  final bool isFloating;
+  final TabController tabController;
+  final ValueNotifier<int> selectedTab;
+
+  const ChatListBodyWidget({
+    super.key,
+    this.isFloating = false,
+    required this.tabController,
+    required this.selectedTab,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final chats = ref.watch(chatroomsJoinedProvider);
+    final callState = ref.watch(callNotifierProvider);
+
+    Widget bodyWidget = Column(
+      children: [
+        Consumer(
+          builder: (context, ref, _) {
+            final summaryState = ref.watch(chatSummaryProvider);
+            return summaryState.maybeWhen(
+              loading:
+                  () => const LinearProgressIndicator(
+                    minHeight: 2,
+                    borderRadius: BorderRadius.zero,
+                  ),
+              orElse: () => const SizedBox.shrink(),
+            );
+          },
+        ),
+        Expanded(
+          child: chats.when(
+            data:
+                (items) => RefreshIndicator(
+                  onRefresh:
+                      () => Future.sync(() {
+                        ref.invalidate(chatroomsJoinedProvider);
+                      }),
+                  child: ListView.builder(
+                    padding: EdgeInsets.only(
+                      bottom: callState.isConnected ? 96 : 0,
+                    ),
+                    itemCount:
+                        items
+                            .where(
+                              (item) =>
+                                  selectedTab.value == 0 ||
+                                  (selectedTab.value == 1 && item.type == 1) ||
+                                  (selectedTab.value == 2 && item.type != 1),
+                            )
+                            .length,
+                    itemBuilder: (context, index) {
+                      final filteredItems =
+                          items
+                              .where(
+                                (item) =>
+                                    selectedTab.value == 0 ||
+                                    (selectedTab.value == 1 &&
+                                        item.type == 1) ||
+                                    (selectedTab.value == 2 && item.type != 1),
+                              )
+                              .toList();
+                      final item = filteredItems[index];
+                      return ChatRoomListTile(
+                        room: item,
+                        isDirect: item.type == 1,
+                        onTap: () {
+                          context.pushNamed(
+                            'chatRoom',
+                            pathParameters: {'id': item.id},
+                          );
+                        },
+                      );
+                    },
+                  ),
+                ),
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error:
+                (error, stack) => ResponseErrorWidget(
+                  error: error,
+                  onRetry: () {
+                    ref.invalidate(chatroomsJoinedProvider);
+                  },
+                ),
+          ),
+        ),
+      ],
+    );
+
+    return isFloating ? Card(child: bodyWidget) : bodyWidget;
+  }
+}
+
 class ChatShellScreen extends HookConsumerWidget {
   final Widget child;
   const ChatShellScreen({super.key, required this.child});
@@ -191,9 +277,23 @@ class ChatShellScreen extends HookConsumerWidget {
         isRoot: true,
         child: Row(
           children: [
-            Flexible(flex: 2, child: ChatListScreen(isAside: true)),
+            Flexible(
-            const VerticalDivider(width: 1),
+              flex: 2,
-            Flexible(flex: 4, child: child),
+              child: ChatListScreen(
+                isAside: true,
+                isFloating: true,
+              ).padding(left: 16, vertical: 16),
+            ),
+            const Gap(8),
+            Flexible(
+              flex: 4,
+              child: ClipRRect(
+                borderRadius: const BorderRadius.only(
+                  topLeft: Radius.circular(8),
+                ),
+                child: child,
+              ).padding(top: 16),
+            ),
           ],
         ),
       );
@@ -205,24 +305,23 @@ class ChatShellScreen extends HookConsumerWidget {
 
 class ChatListScreen extends HookConsumerWidget {
   final bool isAside;
-  const ChatListScreen({super.key, this.isAside = false});
+  final bool isFloating;
+  const ChatListScreen({
+    super.key,
+    this.isAside = false,
+    this.isFloating = false,
+  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final isWide = isWideScreen(context);
-    if (isWide && !isAside) {
-      return const EmptyPageHolder();
-    }
 
-    final chats = ref.watch(chatroomsJoinedProvider);
     final chatInvites = ref.watch(chatroomInvitesProvider);
     final tabController = useTabController(initialLength: 3);
     final selectedTab = useState(
       0,
     ); // 0 for All, 1 for Direct Messages, 2 for Group Chats
 
-    final callState = ref.watch(callNotifierProvider);
-
     useEffect(() {
       tabController.addListener(() {
         selectedTab.value = tabController.index;
@@ -250,6 +349,76 @@ class ChatListScreen extends HookConsumerWidget {
       }
     }
 
+    if (isAside) {
+      return Card(
+        margin: EdgeInsets.zero,
+        child: ClipRRect(
+          borderRadius: const BorderRadius.all(Radius.circular(8)),
+          child: Column(
+            children: [
+              Row(
+                children: [
+                  Expanded(
+                    child: TabBar(
+                      dividerColor: Colors.transparent,
+                      controller: tabController,
+                      tabAlignment: TabAlignment.start,
+                      isScrollable: true,
+                      tabs: [
+                        const Tab(icon: Icon(Symbols.chat)),
+                        const Tab(icon: Icon(Symbols.person)),
+                        const Tab(icon: Icon(Symbols.group)),
+                      ],
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(right: 8),
+                    child: IconButton(
+                      icon: Badge(
+                        label: Text(
+                          chatInvites.when(
+                            data: (invites) => invites.length.toString(),
+                            error: (_, _) => '0',
+                            loading: () => '0',
+                          ),
+                        ),
+                        isLabelVisible: chatInvites.when(
+                          data: (invites) => invites.isNotEmpty,
+                          error: (_, _) => false,
+                          loading: () => false,
+                        ),
+                        child: const Icon(Symbols.email),
+                      ),
+                      onPressed: () {
+                        showModalBottomSheet(
+                          useRootNavigator: true,
+                          isScrollControlled: true,
+                          context: context,
+                          builder: (context) => const _ChatInvitesSheet(),
+                        );
+                      },
+                    ),
+                  ),
+                ],
+              ).padding(horizontal: 8),
+              const Divider(height: 1),
+              Expanded(
+                child: ChatListBodyWidget(
+                  isFloating: false,
+                  tabController: tabController,
+                  selectedTab: selectedTab,
+                ),
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+
+    if (isWide && !isAside) {
+      return const EmptyPageHolder();
+    }
+
     return AppScaffold(
       extendBody: false, // Prevent conflicts with tabs navigation
       appBar: AppBar(
@@ -352,82 +521,10 @@ class ChatListScreen extends HookConsumerWidget {
         },
         child: const Icon(Symbols.add),
       ),
-      floatingActionButtonLocation: TabbedFabLocation(context),
+      body: ChatListBodyWidget(
-      body: Column(
+        isFloating: false,
-        children: [
+        tabController: tabController,
-          Consumer(
+        selectedTab: selectedTab,
-            builder: (context, ref, _) {
-              final summaryState = ref.watch(chatSummaryProvider);
-              return summaryState.maybeWhen(
-                loading:
-                    () => const LinearProgressIndicator(
-                      minHeight: 2,
-                      borderRadius: BorderRadius.zero,
-                    ),
-                orElse: () => const SizedBox.shrink(),
-              );
-            },
-          ),
-          Expanded(
-            child: chats.when(
-              data:
-                  (items) => RefreshIndicator(
-                    onRefresh:
-                        () => Future.sync(() {
-                          ref.invalidate(chatroomsJoinedProvider);
-                        }),
-                    child: ListView.builder(
-                      padding: getTabbedPadding(
-                        context,
-                        bottom: callState.isConnected ? 96 : null,
-                      ),
-                      itemCount:
-                          items
-                              .where(
-                                (item) =>
-                                    selectedTab.value == 0 ||
-                                    (selectedTab.value == 1 &&
-                                        item.type == 1) ||
-                                    (selectedTab.value == 2 && item.type != 1),
-                              )
-                              .length,
-                      itemBuilder: (context, index) {
-                        final filteredItems =
-                            items
-                                .where(
-                                  (item) =>
-                                      selectedTab.value == 0 ||
-                                      (selectedTab.value == 1 &&
-                                          item.type == 1) ||
-                                      (selectedTab.value == 2 &&
-                                          item.type != 1),
-                                )
-                                .toList();
-                        final item = filteredItems[index];
-                        return ChatRoomListTile(
-                          room: item,
-                          isDirect: item.type == 1,
-                          onTap: () {
-                            context.pushNamed(
-                              'chatRoom',
-                              pathParameters: {'id': item.id},
-                            );
-                          },
-                        );
-                      },
-                    ),
-                  ),
-              loading: () => const Center(child: CircularProgressIndicator()),
-              error:
-                  (error, stack) => ResponseErrorWidget(
-                    error: error,
-                    onRetry: () {
-                      ref.invalidate(chatroomsJoinedProvider);
-                    },
-                  ),
-            ),
-          ),
-        ],
       ),
     );
   }
@@ -463,275 +560,6 @@ Future<SnChatMember?> chatroomIdentity(Ref ref, String? identifier) async {
   }
 }
 
-class NewChatScreen extends StatelessWidget {
-  const NewChatScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return const EditChatScreen();
-  }
-}
-
-class EditChatScreen extends HookConsumerWidget {
-  final String? id;
-  const EditChatScreen({super.key, this.id});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final formKey = useMemoized(() => GlobalKey<FormState>(), []);
-
-    final submitting = useState(false);
-
-    final nameController = useTextEditingController();
-    final descriptionController = useTextEditingController();
-    final picture = useState<SnCloudFile?>(null);
-    final background = useState<SnCloudFile?>(null);
-    final isPublic = useState(true);
-    final isCommunity = useState(false);
-
-    final chat = ref.watch(chatroomProvider(id));
-
-    final joinedRealms = ref.watch(realmsJoinedProvider);
-    final currentRealm = useState<SnRealm?>(null);
-
-    useEffect(() {
-      if (chat.value != null) {
-        nameController.text = chat.value!.name ?? '';
-        descriptionController.text = chat.value!.description ?? '';
-        picture.value = chat.value!.picture;
-        background.value = chat.value!.background;
-        isPublic.value = chat.value!.isPublic;
-        isCommunity.value = chat.value!.isCommunity;
-        currentRealm.value = joinedRealms.value?.firstWhereOrNull(
-          (realm) => realm.id == chat.value!.realmId,
-        );
-      }
-      return;
-    }, [chat, joinedRealms]);
-
-    void setPicture(String position) async {
-      showLoadingModal(context);
-      var result = await ref
-          .read(imagePickerProvider)
-          .pickImage(source: ImageSource.gallery);
-      if (result == null) {
-        if (context.mounted) hideLoadingModal(context);
-        return;
-      }
-      if (!context.mounted) return;
-      hideLoadingModal(context);
-      result = await cropImage(
-        context,
-        image: result,
-        allowedAspectRatios: [
-          if (position == 'background')
-            const CropAspectRatio(height: 7, width: 16)
-          else
-            const CropAspectRatio(height: 1, width: 1),
-        ],
-      );
-      if (result == null) {
-        if (context.mounted) hideLoadingModal(context);
-        return;
-      }
-      if (!context.mounted) return;
-      showLoadingModal(context);
-
-      submitting.value = true;
-      try {
-        final baseUrl = ref.watch(serverUrlProvider);
-        final token = await getToken(ref.watch(tokenProvider));
-        if (token == null) throw ArgumentError('Token is null');
-        final cloudFile =
-            await putMediaToCloud(
-              fileData: UniversalFile(
-                data: result,
-                type: UniversalFileType.image,
-              ),
-              atk: token,
-              baseUrl: baseUrl,
-              filename: result.name,
-              mimetype: result.mimeType ?? 'image/jpeg',
-            ).future;
-        if (cloudFile == null) {
-          throw ArgumentError('Failed to upload the file...');
-        }
-        switch (position) {
-          case 'picture':
-            picture.value = cloudFile;
-          case 'background':
-            background.value = cloudFile;
-        }
-      } catch (err) {
-        showErrorAlert(err);
-      } finally {
-        if (context.mounted) hideLoadingModal(context);
-        submitting.value = false;
-      }
-    }
-
-    Future<void> performAction() async {
-      if (!formKey.currentState!.validate()) return;
-
-      submitting.value = true;
-      try {
-        final client = ref.watch(apiClientProvider);
-        final resp = await client.request(
-          id == null ? '/sphere/chat' : '/sphere/chat/$id',
-          data: {
-            'name': nameController.text,
-            'description': descriptionController.text,
-            'background_id': background.value?.id,
-            'picture_id': picture.value?.id,
-            'realm_id': currentRealm.value?.id,
-            'is_public': isPublic.value,
-            'is_community': isCommunity.value,
-          },
-          options: Options(method: id == null ? 'POST' : 'PATCH'),
-        );
-        if (context.mounted) {
-          context.pop(SnChatRoom.fromJson(resp.data));
-        }
-      } catch (err) {
-        showErrorAlert(err);
-      } finally {
-        submitting.value = false;
-      }
-    }
-
-    return AppScaffold(
-      appBar: AppBar(
-        title: Text(id == null ? 'createChatRoom' : 'editChatRoom').tr(),
-        leading: const PageBackButton(),
-      ),
-      body: SingleChildScrollView(
-        child: Column(
-          children: [
-            RealmSelectionDropdown(
-              value: currentRealm.value,
-              realms: joinedRealms.when(
-                data: (realms) => realms,
-                loading: () => [],
-                error: (_, _) => [],
-              ),
-              onChanged: (SnRealm? value) {
-                currentRealm.value = value;
-              },
-              isLoading: joinedRealms.isLoading,
-              error: joinedRealms.error?.toString(),
-            ),
-            AspectRatio(
-              aspectRatio: 16 / 7,
-              child: Stack(
-                clipBehavior: Clip.none,
-                fit: StackFit.expand,
-                children: [
-                  GestureDetector(
-                    child: Container(
-                      color: Theme.of(context).colorScheme.surfaceContainerHigh,
-                      child:
-                          background.value != null
-                              ? CloudFileWidget(
-                                item: background.value!,
-                                fit: BoxFit.cover,
-                              )
-                              : const SizedBox.shrink(),
-                    ),
-                    onTap: () {
-                      setPicture('background');
-                    },
-                  ),
-                  Positioned(
-                    left: 20,
-                    bottom: -32,
-                    child: GestureDetector(
-                      child: ProfilePictureWidget(
-                        fileId: picture.value?.id,
-                        radius: 40,
-                        fallbackIcon: Symbols.group,
-                      ),
-                      onTap: () {
-                        setPicture('picture');
-                      },
-                    ),
-                  ),
-                ],
-              ),
-            ).padding(bottom: 32),
-            Form(
-              key: formKey,
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  TextFormField(
-                    controller: nameController,
-                    decoration: const InputDecoration(labelText: 'Name'),
-                    onTapOutside:
-                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                  ),
-                  const SizedBox(height: 16),
-                  TextFormField(
-                    controller: descriptionController,
-                    decoration: const InputDecoration(
-                      labelText: 'Description',
-                      alignLabelWithHint: true,
-                    ),
-                    minLines: 3,
-                    maxLines: null,
-                    onTapOutside:
-                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                  ),
-                  const SizedBox(height: 16),
-                  Card(
-                    margin: EdgeInsets.zero,
-                    child: Column(
-                      children: [
-                        CheckboxListTile(
-                          secondary: const Icon(Symbols.public),
-                          title: Text('publicChat').tr(),
-                          subtitle: Text('publicChatDescription').tr(),
-                          value: isPublic.value,
-                          onChanged: (value) {
-                            isPublic.value = value ?? true;
-                          },
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(8),
-                          ),
-                        ),
-                        CheckboxListTile(
-                          secondary: const Icon(Symbols.travel_explore),
-                          title: Text('communityChat').tr(),
-                          subtitle: Text('communityChatDescription').tr(),
-                          value: isCommunity.value,
-                          onChanged: (value) {
-                            isCommunity.value = value ?? false;
-                          },
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(8),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 16),
-                  Align(
-                    alignment: Alignment.centerRight,
-                    child: TextButton.icon(
-                      onPressed: submitting.value ? null : performAction,
-                      label: const Text('Save'),
-                      icon: const Icon(Symbols.save),
-                    ),
-                  ),
-                ],
-              ).padding(all: 24),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
 @riverpod
 Future<List<SnChatMember>> chatroomInvites(Ref ref) async {
   final client = ref.watch(apiClientProvider);

lib/screens/chat/chat_form.dart

@@ -0,0 +1,299 @@
+import 'package:collection/collection.dart';
+import 'package:croppy/croppy.dart' hide cropImage;
+import 'package:dio/dio.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:island/models/chat.dart';
+import 'package:island/models/file.dart';
+import 'package:island/models/realm.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/screens/chat/chat.dart';
+import 'package:island/screens/realm/realms.dart';
+import 'package:island/services/file.dart';
+import 'package:island/services/file_uploader.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/cloud_files.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class NewChatScreen extends StatelessWidget {
+  const NewChatScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const EditChatScreen();
+  }
+}
+
+class EditChatScreen extends HookConsumerWidget {
+  final String? id;
+  const EditChatScreen({super.key, this.id});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final formKey = useMemoized(() => GlobalKey<FormState>(), []);
+
+    final submitting = useState(false);
+
+    final nameController = useTextEditingController();
+    final descriptionController = useTextEditingController();
+    final picture = useState<SnCloudFile?>(null);
+    final background = useState<SnCloudFile?>(null);
+    final isPublic = useState(true);
+    final isCommunity = useState(false);
+
+    final chat = ref.watch(chatroomProvider(id));
+
+    final joinedRealms = ref.watch(realmsJoinedProvider);
+    final currentRealm = useState<SnRealm?>(null);
+
+    useEffect(() {
+      if (chat.value != null) {
+        nameController.text = chat.value!.name ?? '';
+        descriptionController.text = chat.value!.description ?? '';
+        picture.value = chat.value!.picture;
+        background.value = chat.value!.background;
+        isPublic.value = chat.value!.isPublic;
+        isCommunity.value = chat.value!.isCommunity;
+        currentRealm.value = joinedRealms.value?.firstWhereOrNull(
+          (realm) => realm.id == chat.value!.realmId,
+        );
+      }
+      return;
+    }, [chat, joinedRealms]);
+
+    void setPicture(String position) async {
+      showLoadingModal(context);
+      var result = await ref
+          .read(imagePickerProvider)
+          .pickImage(source: ImageSource.gallery);
+      if (result == null) {
+        if (context.mounted) hideLoadingModal(context);
+        return;
+      }
+      if (!context.mounted) return;
+      hideLoadingModal(context);
+      result = await cropImage(
+        context,
+        image: result,
+        allowedAspectRatios: [
+          if (position == 'background')
+            const CropAspectRatio(height: 7, width: 16)
+          else
+            const CropAspectRatio(height: 1, width: 1),
+        ],
+      );
+      if (result == null) {
+        if (context.mounted) hideLoadingModal(context);
+        return;
+      }
+      if (!context.mounted) return;
+      showLoadingModal(context);
+
+      submitting.value = true;
+      try {
+        final cloudFile =
+            await FileUploader.createCloudFile(
+              client: ref.read(apiClientProvider),
+              fileData: UniversalFile(
+                data: result,
+                type: UniversalFileType.image,
+              ),
+            ).future;
+        if (cloudFile == null) {
+          throw ArgumentError('Failed to upload the file...');
+        }
+        switch (position) {
+          case 'picture':
+            picture.value = cloudFile;
+          case 'background':
+            background.value = cloudFile;
+        }
+      } catch (err) {
+        showErrorAlert(err);
+      } finally {
+        if (context.mounted) hideLoadingModal(context);
+        submitting.value = false;
+      }
+    }
+
+    Future<void> performAction() async {
+      if (!formKey.currentState!.validate()) return;
+
+      submitting.value = true;
+      try {
+        final client = ref.watch(apiClientProvider);
+        final resp = await client.request(
+          id == null ? '/sphere/chat' : '/sphere/chat/$id',
+          data: {
+            'name': nameController.text,
+            'description': descriptionController.text,
+            'background_id': background.value?.id,
+            'picture_id': picture.value?.id,
+            'realm_id': currentRealm.value?.id,
+            'is_public': isPublic.value,
+            'is_community': isCommunity.value,
+          },
+          options: Options(method: id == null ? 'POST' : 'PATCH'),
+        );
+        if (context.mounted) {
+          context.pop(SnChatRoom.fromJson(resp.data));
+        }
+      } catch (err) {
+        showErrorAlert(err);
+      } finally {
+        submitting.value = false;
+      }
+    }
+
+    return AppScaffold(
+      appBar: AppBar(
+        title: Text(id == null ? 'createChatRoom' : 'editChatRoom').tr(),
+        leading: const PageBackButton(),
+      ),
+      body: SingleChildScrollView(
+        child: Column(
+          children: [
+            AspectRatio(
+              aspectRatio: 16 / 7,
+              child: Stack(
+                clipBehavior: Clip.none,
+                fit: StackFit.expand,
+                children: [
+                  GestureDetector(
+                    child: Container(
+                      color: Theme.of(context).colorScheme.surfaceContainerHigh,
+                      child:
+                          background.value != null
+                              ? CloudFileWidget(
+                                item: background.value!,
+                                fit: BoxFit.cover,
+                              )
+                              : const SizedBox.shrink(),
+                    ),
+                    onTap: () {
+                      setPicture('background');
+                    },
+                  ),
+                  Positioned(
+                    left: 20,
+                    bottom: -32,
+                    child: GestureDetector(
+                      child: ProfilePictureWidget(
+                        fileId: picture.value?.id,
+                        radius: 40,
+                        fallbackIcon: Symbols.group,
+                      ),
+                      onTap: () {
+                        setPicture('picture');
+                      },
+                    ),
+                  ),
+                ],
+              ),
+            ).padding(bottom: 32),
+            Form(
+              key: formKey,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  TextFormField(
+                    controller: nameController,
+                    decoration: const InputDecoration(labelText: 'Name'),
+                    onTapOutside:
+                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  ),
+                  const SizedBox(height: 16),
+                  TextFormField(
+                    controller: descriptionController,
+                    decoration: const InputDecoration(
+                      labelText: 'Description',
+                      alignLabelWithHint: true,
+                    ),
+                    minLines: 3,
+                    maxLines: null,
+                    onTapOutside:
+                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  ),
+                  const SizedBox(height: 16),
+                  DropdownButtonFormField<SnRealm>(
+                    value: currentRealm.value,
+                    decoration: InputDecoration(labelText: 'realm'.tr()),
+                    items: [
+                      DropdownMenuItem<SnRealm>(
+                        value: null,
+                        child: Text('none'.tr()),
+                      ),
+                      ...joinedRealms.maybeWhen(
+                        data:
+                            (realms) => realms.map(
+                              (realm) => DropdownMenuItem(
+                                value: realm,
+                                child: Text(realm.name),
+                              ),
+                            ),
+                        orElse: () => [],
+                      ),
+                    ],
+                    onChanged:
+                        joinedRealms.isLoading
+                            ? null
+                            : (SnRealm? value) {
+                              currentRealm.value = value;
+                            },
+                  ),
+                  const SizedBox(height: 16),
+                  Card(
+                    margin: EdgeInsets.zero,
+                    child: Column(
+                      children: [
+                        CheckboxListTile(
+                          secondary: const Icon(Symbols.public),
+                          title: Text('publicChat').tr(),
+                          subtitle: Text('publicChatDescription').tr(),
+                          value: isPublic.value,
+                          onChanged: (value) {
+                            isPublic.value = value ?? true;
+                          },
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                        ),
+                        CheckboxListTile(
+                          secondary: const Icon(Symbols.travel_explore),
+                          title: Text('communityChat').tr(),
+                          subtitle: Text('communityChatDescription').tr(),
+                          value: isCommunity.value,
+                          onChanged: (value) {
+                            isCommunity.value = value ?? false;
+                          },
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                  Align(
+                    alignment: Alignment.centerRight,
+                    child: TextButton.icon(
+                      onPressed: submitting.value ? null : performAction,
+                      label: const Text('Save'),
+                      icon: const Icon(Symbols.save),
+                    ),
+                  ),
+                ],
+              ).padding(all: 24),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/chat/public_room_preview.dart

@@ -0,0 +1,221 @@
+import "package:flutter/material.dart";
+import "package:flutter_hooks/flutter_hooks.dart";
+import "package:gap/gap.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
+import "package:island/database/message.dart";
+import "package:island/screens/chat/chat.dart";
+import "package:island/widgets/content/cloud_files.dart";
+import "package:super_sliver_list/super_sliver_list.dart";
+import "package:easy_localization/easy_localization.dart";
+import "package:go_router/go_router.dart";
+import "package:material_symbols_icons/symbols.dart";
+import "package:styled_widget/styled_widget.dart";
+import "package:island/models/chat.dart";
+import "package:island/widgets/alert.dart";
+import "package:island/widgets/app_scaffold.dart";
+import "package:island/widgets/chat/message_item.dart";
+import "package:island/widgets/response.dart";
+import "package:island/pods/network.dart";
+import "package:island/services/responsive.dart";
+import "package:island/pods/chat/messages_notifier.dart";
+
+class PublicRoomPreview extends HookConsumerWidget {
+  final String id;
+  final SnChatRoom room;
+
+  const PublicRoomPreview({super.key, required this.id, required this.room});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final messages = ref.watch(messagesNotifierProvider(id));
+    final messagesNotifier = ref.read(messagesNotifierProvider(id).notifier);
+    final scrollController = useScrollController();
+
+    final listController = useMemoized(() => ListController(), []);
+
+    var isLoading = false;
+
+    // Add scroll listener for pagination
+    useEffect(() {
+      void onScroll() {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          if (isLoading) return;
+          isLoading = true;
+          messagesNotifier.loadMore().then((_) => isLoading = false);
+        }
+      }
+
+      scrollController.addListener(onScroll);
+      return () => scrollController.removeListener(onScroll);
+    }, [scrollController]);
+
+    Widget chatMessageListWidget(List<LocalChatMessage> messageList) =>
+        SuperListView.builder(
+          listController: listController,
+          padding: EdgeInsets.symmetric(vertical: 16),
+          controller: scrollController,
+          reverse: true, // Show newest messages at the bottom
+          itemCount: messageList.length,
+          findChildIndexCallback: (key) {
+            final valueKey = key as ValueKey;
+            final messageId = valueKey.value as String;
+            return messageList.indexWhere((m) => m.id == messageId);
+          },
+          extentEstimation: (_, _) => 40,
+          itemBuilder: (context, index) {
+            final message = messageList[index];
+            final nextMessage =
+                index < messageList.length - 1 ? messageList[index + 1] : null;
+            final isLastInGroup =
+                nextMessage == null ||
+                nextMessage.senderId != message.senderId ||
+                nextMessage.createdAt
+                        .difference(message.createdAt)
+                        .inMinutes
+                        .abs() >
+                    3;
+
+            return MessageItem(
+              message: message,
+              isCurrentUser: false, // User is not a member, so not current user
+              onAction: null, // No actions allowed in preview mode
+              onJump: (_) {}, // No jump functionality in preview
+              progress: null,
+              showAvatar: isLastInGroup,
+            );
+          },
+        );
+
+    final compactHeader = isWideScreen(context);
+
+    Widget comfortHeaderWidget() => Column(
+      spacing: 4,
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        SizedBox(
+          height: 26,
+          width: 26,
+          child:
+              (room.type == 1 && room.picture?.id == null)
+                  ? SplitAvatarWidget(
+                    filesId:
+                        room.members!
+                            .map((e) => e.account.profile.picture?.id)
+                            .toList(),
+                  )
+                  : room.picture?.id != null
+                  ? ProfilePictureWidget(
+                    fileId: room.picture?.id,
+                    fallbackIcon: Symbols.chat,
+                  )
+                  : CircleAvatar(
+                    child: Text(
+                      room.name![0].toUpperCase(),
+                      style: const TextStyle(fontSize: 12),
+                    ),
+                  ),
+        ),
+        Text(
+          (room.type == 1 && room.name == null)
+              ? room.members!.map((e) => e.account.nick).join(', ')
+              : room.name!,
+        ).fontSize(15),
+      ],
+    );
+
+    Widget compactHeaderWidget() => Row(
+      spacing: 8,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        SizedBox(
+          height: 26,
+          width: 26,
+          child:
+              (room.type == 1 && room.picture?.id == null)
+                  ? SplitAvatarWidget(
+                    filesId:
+                        room.members!
+                            .map((e) => e.account.profile.picture?.id)
+                            .toList(),
+                  )
+                  : room.picture?.id != null
+                  ? ProfilePictureWidget(
+                    fileId: room.picture?.id,
+                    fallbackIcon: Symbols.chat,
+                  )
+                  : CircleAvatar(
+                    child: Text(
+                      room.name![0].toUpperCase(),
+                      style: const TextStyle(fontSize: 12),
+                    ),
+                  ),
+        ),
+        Text(
+          (room.type == 1 && room.name == null)
+              ? room.members!.map((e) => e.account.nick).join(', ')
+              : room.name!,
+        ).fontSize(19),
+      ],
+    );
+
+    return AppScaffold(
+      appBar: AppBar(
+        leading: !compactHeader ? const Center(child: PageBackButton()) : null,
+        automaticallyImplyLeading: false,
+        toolbarHeight: compactHeader ? null : 64,
+        title: compactHeader ? compactHeaderWidget() : comfortHeaderWidget(),
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.more_vert),
+            onPressed: () {
+              context.pushNamed('chatDetail', pathParameters: {'id': id});
+            },
+          ),
+          const Gap(8),
+        ],
+      ),
+      body: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Expanded(
+            child: messages.when(
+              data:
+                  (messageList) =>
+                      messageList.isEmpty
+                          ? Center(child: Text('No messages yet'.tr()))
+                          : chatMessageListWidget(messageList),
+              loading: () => const Center(child: CircularProgressIndicator()),
+              error:
+                  (error, _) => ResponseErrorWidget(
+                    error: error,
+                    onRetry: () => messagesNotifier.loadInitial(),
+                  ),
+            ),
+          ),
+          // Join button at the bottom for public rooms
+          Container(
+            padding: const EdgeInsets.all(16),
+            child: FilledButton.tonalIcon(
+              onPressed: () async {
+                try {
+                  showLoadingModal(context);
+                  final apiClient = ref.read(apiClientProvider);
+                  await apiClient.post('/sphere/chat/${room.id}/members/me');
+                  ref.invalidate(chatroomIdentityProvider(id));
+                } catch (err) {
+                  showErrorAlert(err);
+                } finally {
+                  if (context.mounted) hideLoadingModal(context);
+                }
+              },
+              label: Text('chatJoin').tr(),
+              icon: const Icon(Icons.add),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/chat/room_detail.dart

@@ -21,6 +21,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:island/pods/database.dart';
+import 'package:island/screens/chat/search_messages.dart';
 
 part 'room_detail.freezed.dart';
 part 'room_detail.g.dart';
@@ -401,11 +402,17 @@ class ChatDetailScreen extends HookConsumerWidget {
                                           ),
                                         ),
                                   ),
-                                  onTap: () {
+                                  onTap: () async {
-                                    context.pushNamed(
+                                    final result = await context.pushNamed(
                                       'searchMessages',
                                       pathParameters: {'id': id},
                                     );
+                                    if (result is SearchMessagesResult) {
+                                      // Navigate back to room screen with message to jump to
+                                      if (context.mounted) {
+                                        context.pop(result.messageId);
+                                      }
+                                    }
                                   },
                                 ),
                               ],

lib/screens/chat/search_messages.dart

@@ -1,13 +1,20 @@
 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:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/screens/chat/room.dart';
+import 'package:island/pods/chat/messages_notifier.dart';
 import 'package:island/widgets/app_scaffold.dart';
-import 'package:island/widgets/chat/message_item.dart';
+import 'package:island/widgets/chat/message_list_tile.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:super_sliver_list/super_sliver_list.dart';
 
+// Class to represent the result when popping from search messages
+class SearchMessagesResult {
+  final String messageId;
+  const SearchMessagesResult(this.messageId);
+}
+
 class SearchMessagesScreen extends HookConsumerWidget {
   final String roomId;
 
@@ -112,24 +119,24 @@ class SearchMessagesScreen extends HookConsumerWidget {
                           ? Center(child: Text('noMessagesFound'.tr()))
                           : SuperListView.builder(
                             padding: const EdgeInsets.symmetric(vertical: 16),
-                            reverse: true, // Show newest messages at the bottom
+                            reverse: false, // Show newest messages at the top
                             itemCount: messageList.length,
                             itemBuilder: (context, index) {
                               final message = messageList[index];
-                              // Simplified MessageItem for search results, no grouping logic
+                              return MessageListTile(
-                              return MessageItem(
                                 message: message,
-                                isCurrentUser:
+                                onJump: (messageId) {
-                                    false, // Or determine based on actual user
+                                  // Return the search result and pop back to room detail
-                                onAction: null,
+                                  context.pop(SearchMessagesResult(messageId));
-                                onJump: (_) {},
+                                },
-                                progress: null,
-                                showAvatar: true,
                               );
                             },
                           ),
               loading: () => const Center(child: CircularProgressIndicator()),
-              error: (error, _) => Center(child: Text('errorGeneric'.tr(args: [error.toString()]))),
+              error:
+                  (error, _) => Center(
+                    child: Text('errorGeneric'.tr(args: [error.toString()])),
+                  ),
             ),
           ),
         ],

lib/screens/creators/hub.dart

@@ -9,7 +9,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/post.dart';
 import 'package:island/models/publisher.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/screens/creators/publishers.dart';
+import 'package:island/screens/creators/publishers_form.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/utils/text.dart';
 import 'package:island/widgets/account/account_picker.dart';

lib/screens/creators/publishers_form.dart

@@ -10,21 +10,19 @@ import 'package:image_picker/image_picker.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/publisher.dart';
 import 'package:island/models/realm.dart';
-import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/realm/realms.dart';
 import 'package:island/services/file.dart';
-import 'package:island/services/responsive.dart';
+import 'package:island/services/file_uploader.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/realm/realm_selection_dropdown.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-part 'publishers.g.dart';
+part 'publishers_form.g.dart';
 
 @riverpod
 Future<List<SnPublisher>> publishersManaged(Ref ref) async {
@@ -78,6 +76,7 @@ class EditPublisherScreen extends HookConsumerWidget {
       result = await cropImage(
         context,
         image: result,
+        replacePath: true,
         allowedAspectRatios: [
           if (position == 'background')
             CropAspectRatio(height: 7, width: 16)
@@ -94,19 +93,13 @@ class EditPublisherScreen extends HookConsumerWidget {
 
       submitting.value = true;
       try {
-        final baseUrl = ref.watch(serverUrlProvider);
-        final token = await getToken(ref.watch(tokenProvider));
-        if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await FileUploader.createCloudFile(
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,
               ),
-              atk: token,
+              client: ref.read(apiClientProvider),
-              baseUrl: baseUrl,
-              filename: result.name,
-              mimetype: result.mimeType ?? 'image/jpeg',
             ).future;
         if (cloudFile == null) {
           throw ArgumentError('Failed to upload the file...');
@@ -190,22 +183,9 @@ class EditPublisherScreen extends HookConsumerWidget {
         leading: const PageBackButton(),
       ),
       body: SingleChildScrollView(
-        padding: getTabbedPadding(context, bottom: 16),
+        padding: EdgeInsets.only(bottom: 16),
         child: Column(
           children: [
-            RealmSelectionDropdown(
-              value: currentRealm.value,
-              realms: joinedRealms.when(
-                data: (realms) => realms,
-                loading: () => [],
-                error: (_, _) => [],
-              ),
-              onChanged: (SnRealm? value) {
-                currentRealm.value = value;
-              },
-              isLoading: joinedRealms.isLoading,
-              error: joinedRealms.error?.toString(),
-            ),
             AspectRatio(
               aspectRatio: 16 / 7,
               child: Stack(
@@ -279,6 +259,32 @@ class EditPublisherScreen extends HookConsumerWidget {
                       onTapOutside:
                           (_) => FocusManager.instance.primaryFocus?.unfocus(),
                     ),
+                    DropdownButtonFormField<SnRealm>(
+                      value: currentRealm.value,
+                      decoration: InputDecoration(labelText: 'realm'.tr()),
+                      items: [
+                        DropdownMenuItem<SnRealm>(
+                          value: null,
+                          child: Text('individual'.tr()),
+                        ),
+                        ...joinedRealms.maybeWhen(
+                          data:
+                              (realms) => realms.map(
+                                (realm) => DropdownMenuItem(
+                                  value: realm,
+                                  child: Text(realm.name),
+                                ),
+                              ),
+                          orElse: () => [],
+                        ),
+                      ],
+                      onChanged:
+                          joinedRealms.isLoading
+                              ? null
+                              : (SnRealm? value) {
+                                currentRealm.value = value;
+                              },
+                    ),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [

lib/screens/creators/publishers_form.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'publishers.dart';
+part of 'publishers_form.dart';
 
 // **************************************************************************
 // RiverpodGenerator

lib/screens/developers/edit_app.dart

@@ -6,10 +6,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/models/custom_app.dart';
 import 'package:island/models/file.dart';
-import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/screens/developers/apps.dart';
 import 'package:island/services/file.dart';
+import 'package:island/services/file_uploader.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
@@ -137,19 +137,13 @@ class EditAppScreen extends HookConsumerWidget {
 
       submitting.value = true;
       try {
-        final baseUrl = ref.watch(serverUrlProvider);
-        final token = await getToken(ref.watch(tokenProvider));
-        if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await FileUploader.createCloudFile(
+              client: ref.read(apiClientProvider),
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,
               ),
-              atk: token,
-              baseUrl: baseUrl,
-              filename: result.name,
-              mimetype: result.mimeType ?? 'image/jpeg',
             ).future;
         if (cloudFile == null) {
           throw ArgumentError('Failed to upload the file...');

lib/screens/developers/edit_bot.dart

@@ -7,9 +7,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/models/bot.dart';
 import 'package:island/models/file.dart';
-import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/services/file.dart';
+import 'package:island/services/file_uploader.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
@@ -123,19 +123,13 @@ class EditBotScreen extends HookConsumerWidget {
 
       submitting.value = true;
       try {
-        final baseUrl = ref.watch(serverUrlProvider);
-        final token = await getToken(ref.watch(tokenProvider));
-        if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await FileUploader.createCloudFile(
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,
               ),
-              atk: token,
+              client: ref.read(apiClientProvider),
-              baseUrl: baseUrl,
-              filename: result.name,
-              mimetype: result.mimeType ?? 'image/jpeg',
             ).future;
         if (cloudFile == null) {
           throw ArgumentError('Failed to upload the file...');

lib/screens/developers/hub.dart

@@ -8,7 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/developer.dart';
 import 'package:island/models/publisher.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/screens/creators/publishers.dart';
+import 'package:island/screens/creators/publishers_form.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';

lib/screens/explore.dart

@@ -13,13 +13,13 @@ import 'package:island/pods/event_calendar.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
-import 'package:island/widgets/account/fortune_graph.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/models/post.dart';
 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/screens/tabs.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';
@@ -42,6 +42,7 @@ Widget notificationIndicatorWidget(
     shape: const RoundedRectangleBorder(
       borderRadius: BorderRadius.all(Radius.circular(8)),
     ),
+    minTileHeight: 48,
     leading: const Icon(Symbols.notifications),
     title: Row(
       children: [
@@ -51,7 +52,6 @@ Widget notificationIndicatorWidget(
       ],
     ),
     trailing: const Icon(Symbols.chevron_right),
-    minTileHeight: 40,
     contentPadding: EdgeInsets.only(left: 16, right: 15),
     onTap: () {
       GoRouter.of(context).pushNamed('notifications');
@@ -99,10 +99,6 @@ class ExploreScreen extends HookConsumerWidget {
     final events = ref.watch(eventCalendarProvider(query.value));
 
     final selectedDay = useState(now);
-    // Function to handle day selection for synchronizing between widgets
-    void onDaySelected(DateTime day) {
-      selectedDay.value = day;
-    }
 
     final user = ref.watch(userInfoProvider);
 
@@ -110,251 +106,143 @@ class ExploreScreen extends HookConsumerWidget {
       notificationUnreadCountNotifierProvider,
     );
 
-    return AppScaffold(
+    final isWide = isWideScreen(context);
-      isNoBackground: false,
+
-      appBar: AppBar(
+    final filterBar = Card(
-        toolbarHeight: 0,
+      margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
-        bottom: PreferredSize(
+      child: Row(
-          preferredSize: const Size.fromHeight(48),
+        children: [
-          child: Row(
+          Expanded(
-                children: [
+            child: TabBar(
-                  Expanded(
+              controller: tabController,
-                    child: TabBar(
+              tabAlignment: TabAlignment.start,
-                      controller: tabController,
+              isScrollable: true,
-                      tabAlignment: TabAlignment.start,
+              dividerColor: Colors.transparent,
-                      isScrollable: true,
+              tabs: [
-                      dividerColor: Colors.transparent,
+                Tab(
-                      tabs: [
+                  icon: Tooltip(
-                        Tab(
+                    message: 'explore'.tr(),
-                          icon: Tooltip(
+                    child: Icon(Symbols.explore),
-                            message: 'explore'.tr(),
+                  ),
-                            child: Icon(
+                ),
-                              Symbols.explore,
+                Tab(
-                              color:
+                  icon: Tooltip(
-                                  Theme.of(
+                    message: 'exploreFilterSubscriptions'.tr(),
-                                    context,
+                    child: Icon(Symbols.subscriptions),
-                                  ).appBarTheme.foregroundColor!,
+                  ),
-                            ),
+                ),
-                          ),
+                Tab(
-                        ),
+                  icon: Tooltip(
-                        Tab(
+                    message: 'exploreFilterFriends'.tr(),
-                          icon: Tooltip(
+                    child: Icon(Symbols.people),
-                            message: 'exploreFilterSubscriptions'.tr(),
+                  ),
-                            child: Icon(
+                ),
-                              Symbols.subscriptions,
+              ],
-                              color:
+            ),
-                                  Theme.of(
+          ),
-                                    context,
+          IconButton(
-                                  ).appBarTheme.foregroundColor!,
+            onPressed: () {
-                            ),
+              context.pushNamed('articles');
-                          ),
+            },
-                        ),
+            icon: Icon(Symbols.auto_stories),
-                        Tab(
+            tooltip: 'webArticlesStand'.tr(),
-                          icon: Tooltip(
+          ),
-                            message: 'exploreFilterFriends'.tr(),
+          PopupMenuButton(
-                            child: Icon(
+            itemBuilder:
-                              Symbols.people,
+                (context) => [
-                              color:
+                  PopupMenuItem(
-                                  Theme.of(
+                    child: Row(
-                                    context,
+                      children: [
-                                  ).appBarTheme.foregroundColor!,
+                        const Icon(Symbols.category),
-                            ),
+                        const Gap(12),
-                          ),
+                        Text('categories').tr(),
-                        ),
                       ],
                     ),
-                  ),
+                    onTap: () {
-                  IconButton(
+                      context.pushNamed('postCategories');
-                    onPressed: () {
-                      context.pushNamed('articles');
                     },
-                    icon: Icon(
-                      Symbols.auto_stories,
-                      color: Theme.of(context).appBarTheme.foregroundColor!,
-                    ),
-                    tooltip: 'webArticlesStand'.tr(),
                   ),
-                  PopupMenuButton(
+                  PopupMenuItem(
-                    itemBuilder:
+                    child: Row(
-                        (context) => [
+                      children: [
-                          PopupMenuItem(
+                        const Icon(Symbols.label),
-                            child: Row(
+                        const Gap(12),
-                              children: [
+                        Text('tags').tr(),
-                                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: Theme.of(context).appBarTheme.foregroundColor!,
                     ),
-                    tooltip: 'search'.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),
-              .padding(horizontal: 8)
+            tooltip: 'search'.tr(),
-              .border(
+          ),
-                bottom: 1 / MediaQuery.of(context).devicePixelRatio,
+        ],
-                color: Theme.of(context).dividerColor,
+      ).padding(horizontal: 8),
+    );
+
+    return AppScaffold(
+      isNoBackground: false,
+      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
-      floatingActionButton: InkWell(
+              ? _buildWideBody(
-        onLongPress: () {
+                context,
-          context.pushNamed('postCompose', queryParameters: {'type': '1'}).then(
+                ref,
-            (value) {
+                filterBar,
-              if (value != null) {
+                user,
-                activitiesNotifier.forceRefresh();
+                notificationCount,
-              }
+                query,
-            },
+                events,
-          );
+                selectedDay,
-        },
+                currentFilter.value,
-        child: FloatingActionButton(
+              )
-          heroTag: Key("explore-page-fab"),
+              : _buildNarrowBody(context, ref, filterBar, currentFilter.value),
-          onPressed: () {
-            context.pushNamed('postCompose').then((value) {
-              if (value != null) {
-                activitiesNotifier.forceRefresh();
-              }
-            });
-          },
-          child: const Icon(Symbols.edit),
-        ),
-      ),
-      floatingActionButtonLocation: TabbedFabLocation(context),
-      body: Builder(
-        builder: (context) {
-          final isWide = isWideScreen(context);
-
-          final bodyView = _buildActivityList(
-            context,
-            ref,
-            currentFilter.value,
-          );
-
-          if (isWide) {
-            return Row(
-              children: [
-                Flexible(flex: 3, child: bodyView.padding(left: 8)),
-                if (user.value != null)
-                  Flexible(
-                    flex: 2,
-                    child: Align(
-                      alignment: Alignment.topCenter,
-                      child: SingleChildScrollView(
-                        child: Column(
-                          children: [
-                            CheckInWidget(
-                              margin: EdgeInsets.only(
-                                left: 8,
-                                right: 12,
-                                top: 16,
-                              ),
-                              onChecked: () {
-                                ref.invalidate(
-                                  eventCalendarProvider(query.value),
-                                );
-                              },
-                            ),
-                            if (notificationCount.value != null &&
-                                notificationCount.value! > 0)
-                              notificationIndicatorWidget(
-                                context,
-                                count: notificationCount.value ?? 0,
-                                margin: EdgeInsets.only(
-                                  left: 8,
-                                  right: 12,
-                                  top: 8,
-                                ),
-                              ),
-                            PostFeaturedList().padding(
-                              left: 8,
-                              right: 12,
-                              top: 8,
-                            ),
-                            FortuneGraphWidget(
-                              margin: EdgeInsets.only(
-                                left: 8,
-                                right: 12,
-                                top: 8,
-                              ),
-                              events: events,
-                              constrainWidth: true,
-                              onPointSelected: onDaySelected,
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  )
-                else
-                  Flexible(
-                    flex: 2,
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          'Welcome to\nthe Solar Network',
-                          style: Theme.of(context).textTheme.titleLarge,
-                        ).bold(),
-                        const Gap(2),
-                        Text(
-                          'Login to explore more!',
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                      ],
-                    ).padding(horizontal: 36, vertical: 16),
-                  ),
-              ],
-            );
-          }
-
-          return bodyView;
-        },
-      ),
     );
   }
 
@@ -369,23 +257,167 @@ class ExploreScreen extends HookConsumerWidget {
 
     final isWide = isWideScreen(context);
 
-    return ExtendedRefreshIndicator(
+    return PagingHelperSliverView(
-      onRefresh: () => Future.sync(activitiesNotifier.forceRefresh),
+      provider: activityListNotifierProvider(filter),
-      child: PagingHelperView(
+      futureRefreshable: activityListNotifierProvider(filter).future,
-        provider: activityListNotifierProvider(filter),
+      notifierRefreshable: activityListNotifierProvider(filter).notifier,
-        futureRefreshable: activityListNotifierProvider(filter).future,
+      contentBuilder:
-        notifierRefreshable: activityListNotifierProvider(filter).notifier,
+          (data, widgetCount, endItemView) => _ActivityListView(
-        contentBuilder:
+            data: data,
-            (data, widgetCount, endItemView) => Center(
+            widgetCount: widgetCount,
-              child: _ActivityListView(
+            endItemView: endItemView,
-                data: data,
+            activitiesNotifier: activitiesNotifier,
-                widgetCount: widgetCount,
+            isWide: isWide,
-                endItemView: endItemView,
+          ),
-                activitiesNotifier: activitiesNotifier,
+    );
-                contentOnly: isWide || filter != null,
+  }
+
+  Widget _buildWideBody(
+    BuildContext context,
+    WidgetRef ref,
+    Widget filterBar,
+    AsyncValue<dynamic> user,
+    AsyncValue<int?> notificationCount,
+    ValueNotifier<EventCalendarQuery> query,
+    AsyncValue<List<dynamic>> events,
+    ValueNotifier<DateTime> selectedDay,
+    String? currentFilter,
+  ) {
+    final bodyView = _buildActivityList(context, ref, currentFilter);
+
+    final activitiesNotifier = ref.watch(
+      activityListNotifierProvider(currentFilter).notifier,
+    );
+
+    return Row(
+      spacing: 12,
+      children: [
+        Flexible(
+          flex: 3,
+          child: ExtendedRefreshIndicator(
+            onRefresh: () => Future.sync(activitiesNotifier.forceRefresh),
+            child: CustomScrollView(
+              slivers: [
+                const SliverGap(12),
+                SliverToBoxAdapter(child: filterBar),
+                const SliverGap(8),
+                bodyView,
+              ],
+            ),
+          ),
+        ),
+        if (user.value != null)
+          Flexible(
+            flex: 2,
+            child: Align(
+              alignment: Alignment.topCenter,
+              child: SingleChildScrollView(
+                child: Column(
+                  spacing: 8,
+                  children: [
+                    CheckInWidget(
+                      margin: EdgeInsets.only(top: 12),
+                      onChecked: () {
+                        ref.invalidate(eventCalendarProvider(query.value));
+                      },
+                    ),
+                    if (notificationCount.value != null &&
+                        notificationCount.value! > 0)
+                      notificationIndicatorWidget(
+                        context,
+                        count: notificationCount.value ?? 0,
+                        margin: EdgeInsets.zero,
+                      ),
+                    PostFeaturedList(),
+                    PostComposeCard(
+                      onSubmit: (post) {
+                        activitiesNotifier.forceRefresh();
+                      },
+                    ),
+                  ],
+                ),
               ),
             ),
-      ),
+          )
+        else
+          Flexible(
+            flex: 2,
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  'Welcome to\nthe Solar Network',
+                  style: Theme.of(context).textTheme.titleLarge,
+                ).bold(),
+                const Gap(2),
+                Text(
+                  'Login to explore more!',
+                  style: Theme.of(context).textTheme.bodyLarge,
+                ),
+              ],
+            ).padding(horizontal: 36, vertical: 16),
+          ),
+      ],
+    ).padding(horizontal: 12);
+  }
+
+  Widget _buildNarrowBody(
+    BuildContext context,
+    WidgetRef ref,
+    Widget filterBar,
+    String? currentFilter,
+  ) {
+    final user = ref.watch(userInfoProvider);
+    final notificationCount = ref.watch(
+      notificationUnreadCountNotifierProvider,
+    );
+
+    final activitiesNotifier = ref.watch(
+      activityListNotifierProvider(currentFilter).notifier,
+    );
+
+    final bodyView = _buildActivityList(context, ref, currentFilter);
+
+    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(),
+                    ),
+                  ),
+                  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),
+          ),
+        ),
+      ],
     );
   }
 }
@@ -464,7 +496,7 @@ class _DiscoveryActivityItem extends StatelessWidget {
     };
 
     return Card(
-      margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      margin: EdgeInsets.zero,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -505,92 +537,60 @@ class _ActivityListView extends HookConsumerWidget {
   final CursorPagingData<SnActivity> data;
   final int widgetCount;
   final Widget endItemView;
-  final bool contentOnly;
   final ActivityListNotifier activitiesNotifier;
+  final bool isWide;
 
   const _ActivityListView({
     required this.data,
     required this.widgetCount,
     required this.endItemView,
     required this.activitiesNotifier,
-    this.contentOnly = false,
+    required this.isWide,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final user = ref.watch(userInfoProvider);
+    return SliverList.separated(
+      itemCount: widgetCount,
+      separatorBuilder: (_, _) => const Gap(8),
+      itemBuilder: (context, index) {
+        if (index == widgetCount - 1) {
+          return endItemView;
+        }
 
-    final notificationCount = ref.watch(
+        final item = data.items[index];
-      notificationUnreadCountNotifierProvider,
+        if (item.data == null) {
-    );
+          return const SizedBox.shrink();
+        }
+        Widget itemWidget;
 
-    return CustomScrollView(
+        switch (item.type) {
-      slivers: [
+          case 'posts.new':
-        SliverGap(12),
+          case 'posts.new.replies':
-        if (user.value != null && !contentOnly)
+            itemWidget = PostActionableItem(
-          SliverToBoxAdapter(
+              borderRadius: 8,
-            child: CheckInWidget(
+              item: SnPost.fromJson(item.data!),
-              margin: EdgeInsets.only(left: 8, right: 8, bottom: 4),
+              onRefresh: () {
-            ),
+                activitiesNotifier.forceRefresh();
-          ),
+              },
-        if (!contentOnly)
+              onUpdate: (post) {
-          SliverToBoxAdapter(
+                activitiesNotifier.updateOne(
-            child: PostFeaturedList().padding(horizontal: 8, bottom: 4, top: 4),
+                  index,
-          ),
+                  item.copyWith(data: post.toJson()),
-        if (!contentOnly && (notificationCount.value ?? 0) > 0)
-          SliverToBoxAdapter(
-            child: notificationIndicatorWidget(
-              context,
-              count: notificationCount.value ?? 0,
-              margin: EdgeInsets.only(left: 8, right: 8, top: 4, bottom: 4),
-            ),
-          ),
-        SliverList.builder(
-          itemCount: widgetCount,
-          itemBuilder: (context, index) {
-            if (index == widgetCount - 1) {
-              return endItemView;
-            }
-
-            final item = data.items[index];
-            if (item.data == null) {
-              return const SizedBox.shrink();
-            }
-            Widget itemWidget;
-
-            switch (item.type) {
-              case 'posts.new':
-              case 'posts.new.replies':
-                itemWidget = PostActionableItem(
-                  borderRadius: 8,
-                  item: SnPost.fromJson(item.data!),
-                  onRefresh: () {
-                    activitiesNotifier.forceRefresh();
-                  },
-                  onUpdate: (post) {
-                    activitiesNotifier.updateOne(
-                      index,
-                      item.copyWith(data: post.toJson()),
-                    );
-                  },
                 );
-                itemWidget = Card(
+              },
-                  margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+            );
-                  child: itemWidget,
+            itemWidget = Card(margin: EdgeInsets.zero, child: itemWidget);
-                );
+            break;
-                break;
+          case 'discovery':
-              case 'discovery':
+            itemWidget = _DiscoveryActivityItem(data: item.data!);
-                itemWidget = _DiscoveryActivityItem(data: item.data!);
+            break;
-                break;
+          default:
-              default:
+            itemWidget = const Placeholder();
-                itemWidget = const Placeholder();
+        }
-            }
 
-            return itemWidget;
+        return itemWidget;
-          },
+      },
-        ),
-        SliverGap(getTabbedPadding(context).bottom),
-      ],
     );
   }
 }

lib/screens/files/file_list.dart

@@ -0,0 +1,556 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/file_pool.dart';
+import 'package:island/utils/format.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/file_info_sheet.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+part 'file_list.g.dart';
+
+@riverpod
+class CloudFileListNotifier extends _$CloudFileListNotifier
+    with CursorPagingNotifierMixin<SnCloudFile> {
+  String? _poolId;
+  bool _includeRecycled = false;
+
+  void setFilters(String? poolId, bool includeRecycled) {
+    _poolId = poolId;
+    _includeRecycled = includeRecycled;
+    ref.invalidateSelf();
+  }
+
+  @override
+  Future<CursorPagingData<SnCloudFile>> build() => fetch(cursor: null);
+
+  @override
+  Future<CursorPagingData<SnCloudFile>> fetch({required String? cursor}) async {
+    final client = ref.read(apiClientProvider);
+    final offset = cursor == null ? 0 : int.parse(cursor);
+    final take = 20;
+
+    final queryParameters = <String, dynamic>{'offset': offset, 'take': take};
+
+    // Add filter parameters
+    if (_poolId != null) {
+      queryParameters['pool'] = _poolId!;
+    }
+    if (_includeRecycled) {
+      queryParameters['recycled'] = 'true';
+    }
+
+    final response = await client.get(
+      '/drive/files/me',
+      queryParameters: queryParameters,
+    );
+
+    final List<SnCloudFile> items =
+        (response.data as List)
+            .map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
+            .toList();
+    final total = int.parse(response.headers.value('X-Total') ?? '0');
+
+    final hasMore = offset + items.length < total;
+    final nextCursor = hasMore ? (offset + items.length).toString() : null;
+
+    return CursorPagingData(
+      items: items,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
+@riverpod
+Future<Map<String, dynamic>?> billingUsage(Ref ref) async {
+  final client = ref.read(apiClientProvider);
+  final response = await client.get('/drive/billing/usage');
+  return response.data;
+}
+
+@riverpod
+Future<Map<String, dynamic>?> billingQuota(Ref ref) async {
+  final client = ref.read(apiClientProvider);
+  final response = await client.get('/drive/billing/quota');
+  return response.data;
+}
+
+class FileListScreen extends HookConsumerWidget {
+  const FileListScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    // Filter state
+    final selectedPool = useState<String?>(null);
+    final includeRecycled = useState(false);
+
+    final usageAsync = ref.watch(billingUsageProvider);
+    final quotaAsync = ref.watch(billingQuotaProvider);
+
+    // Update notifier filters when state changes
+    useEffect(() {
+      final notifier = ref.read(cloudFileListNotifierProvider.notifier);
+      notifier.setFilters(selectedPool.value, includeRecycled.value);
+      return null;
+    }, [selectedPool.value, includeRecycled.value]);
+
+    return AppScaffold(
+      appBar: AppBar(title: Text('Files'), leading: const PageBackButton()),
+      body: usageAsync.when(
+        data:
+            (usage) => quotaAsync.when(
+              data:
+                  (quota) => _buildQuotaUI(
+                    usage,
+                    quota,
+                    ref,
+                    selectedPool,
+                    includeRecycled,
+                  ),
+              loading: () => const Center(child: CircularProgressIndicator()),
+              error: (e, _) => Center(child: Text('Error loading quota')),
+            ),
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (e, _) => Center(child: Text('Error loading usage')),
+      ),
+    );
+  }
+
+  Widget _buildQuotaUI(
+    Map<String, dynamic>? usage,
+    Map<String, dynamic>? quota,
+    WidgetRef ref,
+    ValueNotifier<String?> selectedPool,
+    ValueNotifier<bool> includeRecycled,
+  ) {
+    if (usage == null) return const SizedBox.shrink();
+    return CustomScrollView(
+      slivers: [
+        const SliverGap(8),
+        SliverToBoxAdapter(
+          child: Column(
+            children: [
+              Row(
+                children: [
+                  Expanded(
+                    child: _buildStatCard(
+                      'All Uploads',
+                      '${((usage['total_usage_bytes'] as num) / (1024 * 1024 * 1024)).toStringAsFixed(3)} GiB',
+                    ),
+                  ),
+                  Expanded(
+                    child: _buildStatCard(
+                      'All Files',
+                      '${usage['total_file_count']}',
+                    ),
+                  ),
+                ],
+              ),
+              Row(
+                children: [
+                  Expanded(
+                    child: _buildStatCard(
+                      'Quota',
+                      '${usage['total_quota']} MiB',
+                    ),
+                  ),
+                  Expanded(
+                    child: _buildStatCard(
+                      'Used Quota',
+                      '${((usage['used_quota'] as num) / (usage['total_quota'] as num) * 100).toStringAsFixed(2)}%',
+                      progress:
+                          (usage['used_quota'] as num) /
+                          (usage['total_quota'] as num),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ).padding(horizontal: 8),
+        ),
+        SliverToBoxAdapter(
+          child: Row(
+            children: [
+              Expanded(
+                child: Card(
+                  child: Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: Column(
+                      children: [
+                        const Text('Pool Usage'),
+                        SizedBox(
+                          height: 200,
+                          child: PieChart(_buildPoolChartData(usage)),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+              Expanded(
+                child: Card(
+                  child: Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: Column(
+                      children: [
+                        const Text('Verbose Quota'),
+                        SizedBox(
+                          height: 200,
+                          child: PieChart(_buildQuotaChartData(quota)),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ).padding(horizontal: 8),
+        ),
+        const SliverGap(8),
+        SliverToBoxAdapter(
+          child: _buildFilters(ref, selectedPool, includeRecycled),
+        ),
+        const SliverGap(8),
+        PagingHelperSliverView(
+          provider: cloudFileListNotifierProvider,
+          futureRefreshable: cloudFileListNotifierProvider.future,
+          notifierRefreshable: cloudFileListNotifierProvider.notifier,
+          contentBuilder:
+              (data, widgetCount, endItemView) => SliverList.builder(
+                itemCount: widgetCount,
+                itemBuilder: (context, index) {
+                  if (index == widgetCount - 1) {
+                    return endItemView;
+                  }
+
+                  final item = data.items[index];
+                  final itemType = item.mimeType?.split('/').firstOrNull;
+                  return ListTile(
+                    leading: ClipRRect(
+                      borderRadius: const BorderRadius.all(Radius.circular(8)),
+                      child: SizedBox(
+                        height: 48,
+                        width: 48,
+                        child: switch (itemType) {
+                          'image' => CloudImageWidget(file: item),
+                          'audio' =>
+                            const Icon(Symbols.audio_file, fill: 1).center(),
+                          'video' =>
+                            const Icon(Symbols.video_file, fill: 1).center(),
+                          _ =>
+                            const Icon(Symbols.body_system, fill: 1).center(),
+                        },
+                      ),
+                    ),
+                    title:
+                        item.name.isEmpty
+                            ? Text('untitled').tr().italic()
+                            : Text(
+                              item.name,
+                              maxLines: 1,
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                    subtitle: Text(formatFileSize(item.size)),
+                    onTap: () {
+                      showModalBottomSheet(
+                        useRootNavigator: true,
+                        context: context,
+                        isScrollControlled: true,
+                        builder: (context) => FileInfoSheet(item: item),
+                      );
+                    },
+                    trailing: IconButton(
+                      icon: const Icon(Symbols.delete),
+                      onPressed: () async {
+                        final confirmed = await showConfirmAlert(
+                          'confirmDeleteFile'.tr(),
+                          'deleteFile'.tr(),
+                        );
+                        if (!confirmed) return;
+
+                        if (context.mounted) showLoadingModal(context);
+                        try {
+                          final client = ref.read(apiClientProvider);
+                          await client.delete('/drive/files/${item.id}');
+                          ref.invalidate(cloudFileListNotifierProvider);
+                        } catch (e) {
+                          showSnackBar('failedToDeleteFile'.tr());
+                        } finally {
+                          if (context.mounted) hideLoadingModal(context);
+                        }
+                      },
+                    ),
+                  );
+                },
+              ),
+        ),
+      ],
+    );
+  }
+
+  PieChartData _buildPoolChartData(Map<String, dynamic> usage) {
+    final pools = usage['pool_usages'] as List<dynamic>;
+    final colors = [
+      Colors.blue,
+      Colors.green,
+      Colors.orange,
+      Colors.red,
+      Colors.purple,
+    ];
+    return PieChartData(
+      sections:
+          pools.asMap().entries.map((entry) {
+            final pool = entry.value as Map<String, dynamic>;
+            final title = pool['pool_name'] as String;
+            final truncatedTitle =
+                title.length > 8 ? '${title.substring(0, 8)}...' : title;
+            return PieChartSectionData(
+              value: (pool['usage_bytes'] as num).toDouble(),
+              title: truncatedTitle,
+              color: colors[entry.key % colors.length],
+              radius: 60,
+              titleStyle: const TextStyle(
+                fontSize: 12,
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+              ),
+            );
+          }).toList(),
+    );
+  }
+
+  PieChartData _buildQuotaChartData(Map<String, dynamic>? quota) {
+    if (quota == null) return PieChartData(sections: []);
+    return PieChartData(
+      sections: [
+        PieChartSectionData(
+          value: (quota['based_quota'] as num).toDouble(),
+          title: 'Base',
+          color: Colors.green,
+          radius: 60,
+          titleStyle: const TextStyle(
+            fontSize: 12,
+            color: Colors.white,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        PieChartSectionData(
+          value: (quota['extra_quota'] as num).toDouble(),
+          title: 'Extra',
+          color: Colors.orange,
+          radius: 60,
+          titleStyle: const TextStyle(
+            fontSize: 12,
+            color: Colors.white,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildFilters(
+    WidgetRef ref,
+    ValueNotifier<String?> selectedPool,
+    ValueNotifier<bool> includeRecycled,
+  ) {
+    final poolsAsync = ref.watch(poolsProvider);
+
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'filters'.tr(),
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            ),
+            const Gap(16),
+            LayoutBuilder(
+              builder: (context, constraints) {
+                final isWide = constraints.maxWidth > 600;
+                return isWide
+                    ? Row(
+                      children: [
+                        Expanded(
+                          flex: 2,
+                          child: poolsAsync.when(
+                            data:
+                                (pools) => DropdownButtonFormField<String?>(
+                                  value: selectedPool.value,
+                                  decoration: InputDecoration(
+                                    labelText: 'Pool',
+                                    border: const OutlineInputBorder(),
+                                  ),
+                                  items: [
+                                    DropdownMenuItem<String?>(
+                                      value: null,
+                                      child: Text('allPools'.tr()),
+                                    ),
+                                    ...pools.map(
+                                      (pool) => DropdownMenuItem<String?>(
+                                        value: pool.id,
+                                        child: Text(pool.name),
+                                      ),
+                                    ),
+                                  ],
+                                  onChanged:
+                                      (value) => selectedPool.value = value,
+                                ),
+                            loading: () => const CircularProgressIndicator(),
+                            error: (e, _) => const Text('Error loading pools'),
+                          ),
+                        ),
+                        const Gap(8),
+                        Expanded(
+                          child: Row(
+                            children: [
+                              Text('includeRecycled'.tr()),
+                              const Gap(8),
+                              Switch(
+                                value: includeRecycled.value,
+                                onChanged:
+                                    (value) => includeRecycled.value = value,
+                                padding: EdgeInsets.zero,
+                              ),
+                            ],
+                          ),
+                        ),
+                        const Gap(16),
+                        IconButton(
+                          icon: const Icon(Symbols.delete_sweep),
+                          tooltip: 'deleteRecycledFiles'.tr(),
+                          onPressed:
+                              includeRecycled.value
+                                  ? () => _deleteRecycledFiles(ref)
+                                  : null,
+                        ),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        poolsAsync.when(
+                          data:
+                              (pools) => DropdownButtonFormField<String?>(
+                                value: selectedPool.value,
+                                decoration: const InputDecoration(
+                                  labelText: 'Pool',
+                                  border: OutlineInputBorder(),
+                                ),
+                                items: [
+                                  DropdownMenuItem<String?>(
+                                    value: null,
+                                    child: Text('allPools'.tr()),
+                                  ),
+                                  ...pools.map(
+                                    (pool) => DropdownMenuItem<String?>(
+                                      value: pool.id,
+                                      child: Text(pool.name),
+                                    ),
+                                  ),
+                                ],
+                                onChanged:
+                                    (value) => selectedPool.value = value,
+                              ),
+                          loading: () => const CircularProgressIndicator(),
+                          error: (e, _) => const Text('Error loading pools'),
+                        ),
+                        const Gap(16),
+                        Row(
+                          children: [
+                            Text('includeRecycled'.tr()),
+                            const Gap(8),
+                            Switch(
+                              value: includeRecycled.value,
+                              onChanged:
+                                  (value) => includeRecycled.value = value,
+                            ),
+                            const Spacer(),
+                            IconButton(
+                              icon: const Icon(Symbols.delete_sweep),
+                              tooltip: 'deleteRecycledFiles'.tr(),
+                              onPressed:
+                                  includeRecycled.value
+                                      ? () => _deleteRecycledFiles(ref)
+                                      : null,
+                            ),
+                          ],
+                        ),
+                      ],
+                    );
+              },
+            ),
+          ],
+        ),
+      ),
+    ).padding(horizontal: 8);
+  }
+
+  Future<void> _deleteRecycledFiles(WidgetRef ref) async {
+    final confirmed = await showConfirmAlert(
+      'confirmDeleteRecycledFiles'.tr(),
+      'deleteRecycledFiles'.tr(),
+    );
+    if (!confirmed) return;
+
+    if (ref.context.mounted) showLoadingModal(ref.context);
+    try {
+      final client = ref.read(apiClientProvider);
+      await client.delete('/drive/files/recycled');
+      ref.invalidate(cloudFileListNotifierProvider);
+      showSnackBar('recycledFilesDeleted'.tr());
+    } catch (e) {
+      showSnackBar('failedToDeleteRecycledFiles'.tr());
+    } finally {
+      if (ref.context.mounted) hideLoadingModal(ref.context);
+    }
+  }
+
+  Widget _buildStatCard(String label, String value, {double? progress}) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Text(label, style: const TextStyle(fontSize: 14)),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  value,
+                  style: const TextStyle(
+                    fontSize: 24,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                if (progress != null) ...[
+                  const SizedBox(height: 8),
+                  SizedBox(
+                    width: 28,
+                    height: 28,
+                    child: CircularProgressIndicator(value: progress),
+                  ),
+                ],
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/files/file_list.g.dart

@@ -0,0 +1,69 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'file_list.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$billingUsageHash() => r'58d8bc774868d60781574c85d6b25869a79c57aa';
+
+/// See also [billingUsage].
+@ProviderFor(billingUsage)
+final billingUsageProvider =
+    AutoDisposeFutureProvider<Map<String, dynamic>?>.internal(
+      billingUsage,
+      name: r'billingUsageProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$billingUsageHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef BillingUsageRef = AutoDisposeFutureProviderRef<Map<String, dynamic>?>;
+String _$billingQuotaHash() => r'4ec5d728e439015800abb2d0d673b5a7329cc654';
+
+/// See also [billingQuota].
+@ProviderFor(billingQuota)
+final billingQuotaProvider =
+    AutoDisposeFutureProvider<Map<String, dynamic>?>.internal(
+      billingQuota,
+      name: r'billingQuotaProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$billingQuotaHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef BillingQuotaRef = AutoDisposeFutureProviderRef<Map<String, dynamic>?>;
+String _$cloudFileListNotifierHash() =>
+    r'22c45a8ea23147a3835ba870ad2f0bb833f853ea';
+
+/// See also [CloudFileListNotifier].
+@ProviderFor(CloudFileListNotifier)
+final cloudFileListNotifierProvider = AutoDisposeAsyncNotifierProvider<
+  CloudFileListNotifier,
+  CursorPagingData<SnCloudFile>
+>.internal(
+  CloudFileListNotifier.new,
+  name: r'cloudFileListNotifierProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$cloudFileListNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$CloudFileListNotifier =
+    AutoDisposeAsyncNotifier<CursorPagingData<SnCloudFile>>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/screens/notification.dart

@@ -39,7 +39,7 @@ class NotificationUnreadCountNotifier
 
     try {
       final client = ref.read(apiClientProvider);
-      final response = await client.get('/pusher/notifications/count');
+      final response = await client.get('/ring/notifications/count');
       return (response.data as num).toInt();
     } catch (_) {
       return 0;
@@ -89,7 +89,7 @@ class NotificationListNotifier extends _$NotificationListNotifier
     final queryParams = {'offset': offset, 'take': _pageSize};
 
     final response = await client.get(
-      '/pusher/notifications',
+      '/ring/notifications',
       queryParameters: queryParams,
     );
     final total = int.parse(response.headers.value('X-Total') ?? '0');
@@ -121,7 +121,7 @@ class NotificationScreen extends HookConsumerWidget {
     Future<void> markAllRead() async {
       showLoadingModal(context);
       final apiClient = ref.watch(apiClientProvider);
-      await apiClient.post('/pusher/notifications/all/read');
+      await apiClient.post('/ring/notifications/all/read');
       if (!context.mounted) return;
       hideLoadingModal(context);
       ref.invalidate(notificationListNotifierProvider);