🎉 Launch 3.3.0+146

🐛 Fix build on web
💄 Optimzations
2025-11-17 01:33:34 +08:00 · 2025-11-17 01:26:34 +08:00 · 2025-11-17 01:23:27 +08:00 · 2025-11-17 01:20:49 +08:00 · 2025-11-16 23:58:36 +08:00 · 2025-11-16 23:54:50 +08:00
169 changed files with 19462 additions and 8101 deletions
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -43,6 +43,16 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>

+            <!-- App protocol -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Accepts URIs that begin with YOUR_SCHEME://YOUR_HOST -->
+                <data android:scheme="solian" />
+            </intent-filter>
+
            <!-- Deeplinking -->
            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
--- a/assets/i18n/en-US.json
+++ b/assets/i18n/en-US.json
@@ -136,6 +136,7 @@
    "reactionNegative": "Negative",
    "reactionNeutral": "Neutral",
    "customReaction": "Custom Reaction",
+    "customReactionHint": "Custom Reaction allow you to use user uploaded stickers as the symbol of the reaction for the post. Exclusive for Stellar Program members.",
    "customReactions": "Custom Reactions",
    "stickerPlaceholder": "Sticker Placeholder",
    "reactionAttitude": "Reaction Attitude",
@@ -162,6 +163,8 @@
    "accountConnectionProviderGithub": "GitHub",
    "accountConnectionProviderDiscord": "Discord",
    "accountConnectionProviderAfdian": "Afdian",
+    "accountConnectionProviderSpotify": "Spotify",
+    "accountConnectionProviderSteam": "Steam",
    "checkIn": "Check In",
    "checkInNone": "Not checked-in yet",
    "checkInNoneHint": "Get your fortune tips and daily rewards by checking in.",
@@ -469,6 +472,7 @@
    "pronouns": "Pronouns",
    "location": "Location",
    "timeZone": "Time Zone",
+    "timezoneNotFound": "Time zone not found",
    "birthday": "Birthday",
    "selectADate": "Select a date",
    "checkInResultT0": "Worst",
@@ -1084,6 +1088,7 @@
    "levelingStage10": "Immortal",
    "levelingStage11": "Divine",
    "levelingStage12": "Transcendent",
+    "uploadTasks": "Upload Tasks",
    "uploadAttachment": "Upload Attachment",
    "attachmentPreview": "Attachment Preview",
    "selectPool": "Select Pool",
@@ -1298,9 +1303,38 @@
    "thoughtInputHint": "Ask sn-chan anything...",
    "thoughtNewConversation": "Start New Conversation",
    "thoughtParseError": "Failed to parse AI response",
-    "thoughtFunctionCall": "Function Call",
+    "thoughtFunctionCall": "Use {}",
+    "thoughtFunctionCallBegin": "Calling tool {}",
+    "thoughtFunctionCallFinish": "{} responded",
    "aiThought": "AI Thought",
    "aiThoughtTitle": "Let sn-chan think",
    "postReferenceUnavailable": "Referenced post is unavailable",
-    "fabLocation": "FAB Location"
+    "fabLocation": "FAB Location",
+    "activities": "Activities",
+    "presenceTypeGaming": "Playing",
+    "presenceTypeMusic": "Listening to Music",
+    "presenceTypeWorkout": "Working out",
+    "articleCompose": "Compose Article",
+    "backToHub": "Back to Hub",
+    "advancedFilters": "Advanced Filters",
+    "searchPosts": "Search Posts",
+    "sortBy": "Sort by",
+    "fromDate": "From Date",
+    "toDate": "To Date",
+    "popularity": "Popularity",
+    "descendingOrder": "Descending Order",
+    "selectDate": "Select Date",
+    "pinnedPosts": "Pinned Posts",
+    "thoughtUnpaidHint": "Thinking unavaiable due to unpaid orders",
+    "more": "More",
+    "collapse": "Collapse",
+    "pollConfirmDiscard": "Are you sure you want to leave? All the poll data you're editing will not be saved.",
+    "discard": "Discard",
+    "fund": "Fund",
+    "fundsRecent": "Recent Funds",
+    "fundCreateNew": "Create New",
+    "fundCreateNewHint": "Create a new fund for your message. Select recipients and amount.",
+    "amountOfSplits": "Amount of Splits",
+    "enterNumberOfSplits": "Enter Splits Amount",
+    "orCreateWith": "Or\ncreate with"
 }
--- a/assets/i18n/zh-CN.json
+++ b/assets/i18n/zh-CN.json
@@ -158,11 +158,11 @@
    "checkIn": "签到",
    "checkInNone": "尚未签到",
    "checkInNoneHint": "通过签到获取您的财富提示和每日奖励。",
-    "checkInResultLevel0": "最差运气",
-    "checkInResultLevel1": "坏运气",
-    "checkInResultLevel2": "一个普通的日常",
-    "checkInResultLevel3": "好运",
-    "checkInResultLevel4": "最佳运气",
+    "checkInResultLevel0": "大凶",
+    "checkInResultLevel1": "凶",
+    "checkInResultLevel2": "中平",
+    "checkInResultLevel3": "吉",
+    "checkInResultLevel4": "大吉",
    "checkInActivityTitle": "{} 在 {} 签到并获得了 {}",
    "eventCalander": "活动日历",
    "eventCalanderEmpty": "该日无活动。",
@@ -251,10 +251,10 @@
    "translatorBadgeName": "翻译者",
    "translatorBadgeDescription": "协助将 Solar Network 翻译成不同语言",
    "wallet": "钱包",
-    "walletCurrencyPoints": "新太阳点",
+    "walletCurrencyPoints": "源能点",
    "walletCurrencyShortPoints": "NSP",
-    "walletCurrencyGolds": "太阳币",
-    "walletCurrencyShortGolds": "TSD",
+    "walletCurrencyGolds": "星辰碎片",
+    "walletCurrencyShortGolds": "SHD",
    "retry": "重试",
    "creatorHubUnselectedHint": "选择/创建一个发布者以开始使用。",
    "relationships": "关系",
@@ -344,7 +344,7 @@
    "accountSettingsHelpContent": "此页面允许您管理您的帐户安全性、隐私和其他设置。如果您需要帮助，请联系管理员。",
    "unauthorized": "未授权",
    "unauthorizedHint": "您未登录或会话已过期，请重新登录。",
-    "publisherBelongsTo": "属于",
+    "publisherBelongsTo": "属于 {}",
    "postContent": "内容",
    "postSettings": "设置",
    "postPublisherUnselected": "未指定发布者",
@@ -1090,5 +1090,6 @@
    "thoughtNewConversation": "开始新对话",
    "thoughtParseError": "解析 AI 响应失败",
    "aiThought": "寻思",
-    "aiThoughtTitle": "让 SN 酱寻思寻思"
+    "aiThoughtTitle": "让 SN 酱寻思寻思",
+    "thoughtUnpaidHint": "寻思因为有未支付的订单而被禁用"
 }
--- a/assets/icons/icon-tray.png
+++ b/assets/icons/icon-tray.png
--- a/assets/images/oidc/spotify.png
+++ b/assets/images/oidc/spotify.png
--- a/assets/images/oidc/steam.svg
+++ b/assets/images/oidc/steam.svg
@@ -0,0 +1 @@
+<svg width="2471" height="2500" viewBox="0 0 256 259" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M127.779 0C60.42 0 5.24 52.412 0 119.014l68.724 28.674a35.812 35.812 0 0 1 20.426-6.366c.682 0 1.356.019 2.02.056l30.566-44.71v-.626c0-26.903 21.69-48.796 48.353-48.796 26.662 0 48.352 21.893 48.352 48.796 0 26.902-21.69 48.804-48.352 48.804-.37 0-.73-.009-1.098-.018l-43.593 31.377c.028.582.046 1.163.046 1.735 0 20.204-16.283 36.636-36.294 36.636-17.566 0-32.263-12.658-35.584-29.412L4.41 164.654c15.223 54.313 64.673 94.132 123.369 94.132 70.818 0 128.221-57.938 128.221-129.393C256 57.93 198.597 0 127.779 0zM80.352 196.332l-15.749-6.568c2.787 5.867 7.621 10.775 14.033 13.47 13.857 5.83 29.836-.803 35.612-14.799a27.555 27.555 0 0 0 .046-21.035c-2.768-6.79-7.999-12.086-14.706-14.909-6.67-2.795-13.811-2.694-20.085-.304l16.275 6.79c10.222 4.3 15.056 16.145 10.794 26.46-4.253 10.314-15.998 15.195-26.22 10.895zm121.957-100.29c0-17.925-14.457-32.52-32.217-32.52-17.769 0-32.226 14.595-32.226 32.52 0 17.926 14.457 32.512 32.226 32.512 17.76 0 32.217-14.586 32.217-32.512zm-56.37-.055c0-13.488 10.84-24.42 24.2-24.42 13.368 0 24.208 10.932 24.208 24.42 0 13.488-10.84 24.421-24.209 24.421-13.359 0-24.2-10.933-24.2-24.42z" fill="#1A1918"/></svg>
--- a/devtools_options.yaml
+++ b/devtools_options.yaml
@@ -1,3 +1,6 @@
 description: This file stores settings for Dart & Flutter DevTools.
 documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
 extensions:
+  - drift: true
+  - provider: true
+  - shared_preferences: true
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,7 +1,5 @@
 PODS:
  - Alamofire (5.10.2)
-  - app_links (6.4.1):
-    - Flutter
  - connectivity_plus (0.0.1):
    - Flutter
  - croppy (0.0.1):
@@ -52,18 +50,18 @@ PODS:
  - Firebase/Messaging (12.4.0):
    - Firebase/CoreOnly
    - FirebaseMessaging (~> 12.4.0)
-  - firebase_analytics (12.0.3):
+  - firebase_analytics (12.0.4):
    - firebase_core
    - FirebaseAnalytics (= 12.4.0)
    - Flutter
-  - firebase_core (4.2.0):
+  - firebase_core (4.2.1):
    - Firebase/CoreOnly (= 12.4.0)
    - Flutter
-  - firebase_crashlytics (5.0.3):
+  - firebase_crashlytics (5.0.4):
    - Firebase/Crashlytics (= 12.4.0)
    - firebase_core
    - Flutter
-  - firebase_messaging (16.0.3):
+  - firebase_messaging (16.0.4):
    - Firebase/Messaging (= 12.4.0)
    - firebase_core
    - Flutter
@@ -265,6 +263,8 @@ PODS:
  - PromisesObjC (2.4.0)
  - PromisesSwift (2.4.0):
    - PromisesObjC (= 2.4.0)
+  - protocol_handler_ios (0.0.1):
+    - Flutter
  - receive_sharing_intent (1.8.1):
    - Flutter
  - record_ios (1.1.0):
@@ -323,7 +323,6 @@ PODS:

 DEPENDENCIES:
  - Alamofire
-  - app_links (from `.symlinks/plugins/app_links/ios`)
  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - croppy (from `.symlinks/plugins/croppy/ios`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
@@ -358,6 +357,7 @@ DEPENDENCIES:
  - pasteboard (from `.symlinks/plugins/pasteboard/ios`)
  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
  - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
+  - protocol_handler_ios (from `.symlinks/plugins/protocol_handler_ios/ios`)
  - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
  - record_ios (from `.symlinks/plugins/record_ios/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
@@ -404,8 +404,6 @@ SPEC REPOS:
    - WebRTC-SDK

 EXTERNAL SOURCES:
-  app_links:
-    :path: ".symlinks/plugins/app_links/ios"
  connectivity_plus:
    :path: ".symlinks/plugins/connectivity_plus/ios"
  croppy:
@@ -470,6 +468,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/path_provider_foundation/darwin"
  pointer_interceptor_ios:
    :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
+  protocol_handler_ios:
+    :path: ".symlinks/plugins/protocol_handler_ios/ios"
  receive_sharing_intent:
    :path: ".symlinks/plugins/receive_sharing_intent/ios"
  record_ios:
@@ -497,7 +497,6 @@ EXTERNAL SOURCES:

 SPEC CHECKSUMS:
  Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
-  app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
  croppy: 979e8ddc254f4642bffe7d52dc7193354b27ba30
  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
@@ -506,10 +505,10 @@ SPEC CHECKSUMS:
  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
  Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
-  firebase_analytics: 1d024068b1d4707d5ba7a42a12976ddf3316d835
-  firebase_core: 744984dbbed8b3036abf34f0b98d80f130a7e464
-  firebase_crashlytics: f3a9a4338ab99b67042f64e9e22e1bf349cb44ed
-  firebase_messaging: 82c70650c426a0a14873e1acdb9ec2b443c4e8b4
+  firebase_analytics: 67fbdd9f3c04e55048024f3da21cfc36f05e56cf
+  firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594
+  firebase_crashlytics: 83c7467d7534975a4d779af43bd226d0a4616464
+  firebase_messaging: c17a29984eafce4b2997fe078bb0a9e0b06f5dde
  FirebaseAnalytics: 0fc2b20091f0ddd21bf73397cf8f0eb5346dc24f
  FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
  FirebaseCoreExtension: 7e1f7118ee970e001a8013719fb90950ee5e0018
@@ -553,6 +552,7 @@ SPEC CHECKSUMS:
  pointer_interceptor_ios: da06a662d5bfd329602b45b2ab41bc0fb5fdb0f0
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
+  protocol_handler_ios: 59f23ee71f3ec602d67902ca7f669a80957888d5
  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
  record_ios: f75fa1d57f840012775c0e93a38a7f3ceea1a374
  SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 77;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,108 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>AppGroupId</key>
-	<string>$(CUSTOM_GROUP_ID)</string>
-	<key>BUNDLE_ID</key>
-	<string>dev.solsynth.solian</string>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Solian</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>solian</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<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>
-	<key>CLIENT_ID</key>
-	<string>961776991058-stt7et4qvn3cpscl4r61gl1hnlatqkig.apps.googleusercontent.com</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSCalendarsUsageDescription</key>
-	<string>Grant access to Calander help us to shows Solar Calander with your own events.</string>
-	<key>NSCameraUsageDescription</key>
-	<string>Grant access to Camera will allow Solian take photo or video for your post.</string>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Allow the Solar Network verify your ownership of the logged in account and continue your action quickly.</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>Grant access to Microphone will allow Solian record audio for your post.</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Grant access to Photo Library will allow Solian download photo to album for you.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Grant access to Photo Library will allow Solian upload photo or video for your post.</string>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>INStartCallIntent</string>
-		<string>INSendMessageIntent</string>
-	</array>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.961776991058-stt7et4qvn3cpscl4r61gl1hnlatqkig</string>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>fetch</string>
-		<string>audio</string>
-		<string>remote-notification</string>
-		<string>voip</string>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIStatusBarHidden</key>
-	<false/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>WKCompanionAppBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-	</array>
-</dict>
-</plist>
+	<dict>
+		<key>AppGroupId</key>
+		<string>$(CUSTOM_GROUP_ID)</string>
+		<key>BUNDLE_ID</key>
+		<string>dev.solsynth.solian</string>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true />
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Solian</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>solian</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>ShareMedia-$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+				</array>
+			</dict>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLName</key>
+				<string></string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>solian</string>
+				</array>
+			</dict>
+		</array>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>CLIENT_ID</key>
+		<string>961776991058-stt7et4qvn3cpscl4r61gl1hnlatqkig.apps.googleusercontent.com</string>
+		<key>ITSAppUsesNonExemptEncryption</key>
+		<false />
+		<key>LSRequiresIPhoneOS</key>
+		<true />
+		<key>NSCalendarsUsageDescription</key>
+		<string>Grant access to Calander help us to shows Solar Calander with your own events.</string>
+		<key>NSCameraUsageDescription</key>
+		<string>Grant access to Camera will allow Solian take photo or video for your post.</string>
+		<key>NSFaceIDUsageDescription</key>
+		<string>Allow the Solar Network verify your ownership of the logged in account and continue
+			your action quickly.</string>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>Grant access to Microphone will allow Solian record audio for your post.</string>
+		<key>NSPhotoLibraryAddUsageDescription</key>
+		<string>Grant access to Photo Library will allow Solian download photo to album for you.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Grant access to Photo Library will allow Solian upload photo or video for your post.</string>
+		<key>NSUserActivityTypes</key>
+		<array>
+			<string>INStartCallIntent</string>
+			<string>INSendMessageIntent</string>
+		</array>
+		<key>PLIST_VERSION</key>
+		<string>1</string>
+		<key>REVERSED_CLIENT_ID</key>
+		<string>com.googleusercontent.apps.961776991058-stt7et4qvn3cpscl4r61gl1hnlatqkig</string>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true />
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>fetch</string>
+			<string>audio</string>
+			<string>remote-notification</string>
+			<string>voip</string>
+		</array>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UIStatusBarHidden</key>
+		<false />
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+			<string>UIInterfaceOrientationPortrait</string>
+		</array>
+		<key>WKCompanionAppBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		</array>
+	</dict>
+</plist>
--- a/App/ContentView.swift
+++ b/App/ContentView.swift
@@ -48,3 +48,11 @@ struct ContentView: View {
        }
    }
 }
+
+// --- Placeholder Implementations for Preview ---
+
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentView()
+    }
+}
--- a/ios/SolianNotificationService/NotificationService.swift
+++ b/ios/SolianNotificationService/NotificationService.swift
@@ -9,6 +9,7 @@ import UserNotifications
 import Intents
 import Kingfisher
 import UniformTypeIdentifiers
+import KingfisherWebP

 enum ParseNotificationPayloadError: Error {
    case missingMetadata(String)
@@ -24,6 +25,11 @@ class NotificationService: UNNotificationServiceExtension {
        _ request: UNNotificationRequest,
        withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void
    ) {
+        KingfisherManager.shared.defaultOptions += [
+          .processor(WebPProcessor.default),
+          .cacheSerializer(WebPSerializer.default)
+        ]
+        
        self.contentHandler = contentHandler
        guard let bestAttemptContent = request.content.mutableCopy() as? UNMutableNotificationContent else {
            contentHandler(request.content)
@@ -64,40 +70,12 @@ class NotificationService: UNNotificationServiceExtension {

        let handle = INPersonHandle(value: "\(metaCopy["user_id"] ?? "")", type: .unknown)

-        if let pfpUrl = pfpUrl, let url = URL(string: pfpUrl) {
-            let targetSize = 512
-            let scaleProcessor = ResizingImageProcessor(referenceSize: CGSize(width: targetSize, height: targetSize), mode: .aspectFit)
-
-            KingfisherManager.shared.retrieveImage(with: url, options: [.processor(scaleProcessor)], completionHandler: { result in
-                var image: Data?
-                switch result {
-                case .success(let value):
-                    image = value.image.pngData()
-                case .failure(let error):
-                    print("Unable to get pfp url: \(error)")
-                }
-
-                let sender = INPerson(
-                    personHandle: handle,
-                    nameComponents: PersonNameComponents(nickname: "\(metaCopy["sender_name"] ?? "")"),
-                    displayName: content.title,
-                    image: image == nil ? nil : INImage(imageData: image!),
-                    contactIdentifier: nil,
-                    customIdentifier: nil
-                )
-
-                let intent = self.createMessageIntent(with: sender, meta: metaCopy, body: content.body)
-                self.donateInteraction(for: intent)
-
-                content.categoryIdentifier = "CHAT_MESSAGE"
-                self.contentHandler?(content)
-            })
-        } else {
+        let completeNotificationProcessing: (Data?) -> Void = { imageData in
            let sender = INPerson(
                personHandle: handle,
                nameComponents: PersonNameComponents(nickname: "\(metaCopy["sender_name"] ?? "")"),
                displayName: content.title,
-                image: nil,
+                image: imageData == nil ? nil : INImage(imageData: imageData!),
                contactIdentifier: nil,
                customIdentifier: nil
            )
@@ -105,8 +83,37 @@ class NotificationService: UNNotificationServiceExtension {
            let intent = self.createMessageIntent(with: sender, meta: metaCopy, body: content.body)
            self.donateInteraction(for: intent)

-            content.categoryIdentifier = "CHAT_MESSAGE"
-            self.contentHandler?(content)
+            if let updatedContent = try? request.content.updating(from: intent) {
+                if let mutableContent = updatedContent.mutableCopy() as? UNMutableNotificationContent {
+                    mutableContent.categoryIdentifier = "CHAT_MESSAGE"
+                    self.contentHandler?(mutableContent)
+                } else {
+                    self.contentHandler?(updatedContent)
+                }
+            } else {
+                content.categoryIdentifier = "CHAT_MESSAGE"
+                self.contentHandler?(content)
+            }
+        }
+
+        if let pfpUrl = pfpUrl, let url = URL(string: pfpUrl) {
+            let targetSize = 512
+            let scaleProcessor = ResizingImageProcessor(referenceSize: CGSize(width: targetSize, height: targetSize), mode: .aspectFit)
+
+            KingfisherManager.shared.retrieveImage(with: url, options: [
+                .processor(scaleProcessor)
+            ], completionHandler: { result in
+                var image: Data?
+                switch result {
+                case .success(let value):
+                    image = value.image.pngData()
+                case .failure(let error):
+                    print("Unable to get pfp url: \(error)")
+                }
+                completeNotificationProcessing(image)
+            })
+        } else {
+            completeNotificationProcessing(nil)
        }
    }
    
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -30,6 +30,7 @@ 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';
+import 'package:protocol_handler/protocol_handler.dart';

@pragma('vm:entry-point')
 Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
@@ -50,8 +51,16 @@ void main() async {
    GoRouter.optionURLReflectsImperativeAPIs = true;
  }

+  if (!kIsWeb && (Platform.isLinux || Platform.isMacOS || Platform.isWindows)) {
+    talker.info("[SplashScreen] Initializing desktop window manager...");
+    await protocolHandler.register('myprotocol');
+    talker.info("[SplashScreen] Desktop window manager is ready!");
+  }
+
  try {
    await EasyLocalization.ensureInitialized();
+    // Disable logs
+    EasyLocalization.logger.enableBuildModes = [];

    if (kIsWeb || !Platform.isLinux) {
      await Firebase.initializeApp(
--- a/lib/models/account.dart
+++ b/lib/models/account.dart
@@ -1,4 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/activity.dart';
 import 'package:island/models/auth.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/wallet.dart';
@@ -263,3 +264,15 @@ sealed class SnSocialCreditRecord with _$SnSocialCreditRecord {
  factory SnSocialCreditRecord.fromJson(Map<String, dynamic> json) =>
      _$SnSocialCreditRecordFromJson(json);
 }
+
+@freezed
+sealed class SnFriendOverviewItem with _$SnFriendOverviewItem {
+  const factory SnFriendOverviewItem({
+    required SnAccount account,
+    required SnAccountStatus status,
+    required List<SnPresenceActivity> activities,
+  }) = _SnFriendOverviewItem;
+
+  factory SnFriendOverviewItem.fromJson(Map<String, dynamic> json) =>
+      _$SnFriendOverviewItemFromJson(json);
+}
--- a/lib/models/account.freezed.dart
+++ b/lib/models/account.freezed.dart
@@ -3912,4 +3912,309 @@ as DateTime?,

 }

+
+/// @nodoc
+mixin _$SnFriendOverviewItem {
+
+ SnAccount get account; SnAccountStatus get status; List<SnPresenceActivity> get activities;
+/// Create a copy of SnFriendOverviewItem
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnFriendOverviewItemCopyWith<SnFriendOverviewItem> get copyWith => _$SnFriendOverviewItemCopyWithImpl<SnFriendOverviewItem>(this as SnFriendOverviewItem, _$identity);
+
+  /// Serializes this SnFriendOverviewItem to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnFriendOverviewItem&&(identical(other.account, account) || other.account == account)&&(identical(other.status, status) || other.status == status)&&const DeepCollectionEquality().equals(other.activities, activities));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,account,status,const DeepCollectionEquality().hash(activities));
+
+@override
+String toString() {
+  return 'SnFriendOverviewItem(account: $account, status: $status, activities: $activities)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnFriendOverviewItemCopyWith<$Res>  {
+  factory $SnFriendOverviewItemCopyWith(SnFriendOverviewItem value, $Res Function(SnFriendOverviewItem) _then) = _$SnFriendOverviewItemCopyWithImpl;
+@useResult
+$Res call({
+ SnAccount account, SnAccountStatus status, List<SnPresenceActivity> activities
+});
+
+
+$SnAccountCopyWith<$Res> get account;$SnAccountStatusCopyWith<$Res> get status;
+
+}
+/// @nodoc
+class _$SnFriendOverviewItemCopyWithImpl<$Res>
+    implements $SnFriendOverviewItemCopyWith<$Res> {
+  _$SnFriendOverviewItemCopyWithImpl(this._self, this._then);
+
+  final SnFriendOverviewItem _self;
+  final $Res Function(SnFriendOverviewItem) _then;
+
+/// Create a copy of SnFriendOverviewItem
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? account = null,Object? status = null,Object? activities = null,}) {
+  return _then(_self.copyWith(
+account: null == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as SnAccountStatus,activities: null == activities ? _self.activities : activities // ignore: cast_nullable_to_non_nullable
+as List<SnPresenceActivity>,
+  ));
+}
+/// Create a copy of SnFriendOverviewItem
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res> get account {
+  
+  return $SnAccountCopyWith<$Res>(_self.account, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}/// Create a copy of SnFriendOverviewItem
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountStatusCopyWith<$Res> get status {
+  
+  return $SnAccountStatusCopyWith<$Res>(_self.status, (value) {
+    return _then(_self.copyWith(status: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [SnFriendOverviewItem].
+extension SnFriendOverviewItemPatterns on SnFriendOverviewItem {
+/// 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( _SnFriendOverviewItem value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnFriendOverviewItem() 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( _SnFriendOverviewItem value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnFriendOverviewItem():
+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( _SnFriendOverviewItem value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnFriendOverviewItem() 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( SnAccount account,  SnAccountStatus status,  List<SnPresenceActivity> activities)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnFriendOverviewItem() when $default != null:
+return $default(_that.account,_that.status,_that.activities);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( SnAccount account,  SnAccountStatus status,  List<SnPresenceActivity> activities)  $default,) {final _that = this;
+switch (_that) {
+case _SnFriendOverviewItem():
+return $default(_that.account,_that.status,_that.activities);}
+}
+/// 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( SnAccount account,  SnAccountStatus status,  List<SnPresenceActivity> activities)?  $default,) {final _that = this;
+switch (_that) {
+case _SnFriendOverviewItem() when $default != null:
+return $default(_that.account,_that.status,_that.activities);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnFriendOverviewItem implements SnFriendOverviewItem {
+  const _SnFriendOverviewItem({required this.account, required this.status, required final  List<SnPresenceActivity> activities}): _activities = activities;
+  factory _SnFriendOverviewItem.fromJson(Map<String, dynamic> json) => _$SnFriendOverviewItemFromJson(json);
+
+@override final  SnAccount account;
+@override final  SnAccountStatus status;
+ final  List<SnPresenceActivity> _activities;
+@override List<SnPresenceActivity> get activities {
+  if (_activities is EqualUnmodifiableListView) return _activities;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_activities);
+}
+
+
+/// Create a copy of SnFriendOverviewItem
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnFriendOverviewItemCopyWith<_SnFriendOverviewItem> get copyWith => __$SnFriendOverviewItemCopyWithImpl<_SnFriendOverviewItem>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnFriendOverviewItemToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnFriendOverviewItem&&(identical(other.account, account) || other.account == account)&&(identical(other.status, status) || other.status == status)&&const DeepCollectionEquality().equals(other._activities, _activities));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,account,status,const DeepCollectionEquality().hash(_activities));
+
+@override
+String toString() {
+  return 'SnFriendOverviewItem(account: $account, status: $status, activities: $activities)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnFriendOverviewItemCopyWith<$Res> implements $SnFriendOverviewItemCopyWith<$Res> {
+  factory _$SnFriendOverviewItemCopyWith(_SnFriendOverviewItem value, $Res Function(_SnFriendOverviewItem) _then) = __$SnFriendOverviewItemCopyWithImpl;
+@override @useResult
+$Res call({
+ SnAccount account, SnAccountStatus status, List<SnPresenceActivity> activities
+});
+
+
+@override $SnAccountCopyWith<$Res> get account;@override $SnAccountStatusCopyWith<$Res> get status;
+
+}
+/// @nodoc
+class __$SnFriendOverviewItemCopyWithImpl<$Res>
+    implements _$SnFriendOverviewItemCopyWith<$Res> {
+  __$SnFriendOverviewItemCopyWithImpl(this._self, this._then);
+
+  final _SnFriendOverviewItem _self;
+  final $Res Function(_SnFriendOverviewItem) _then;
+
+/// Create a copy of SnFriendOverviewItem
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? account = null,Object? status = null,Object? activities = null,}) {
+  return _then(_SnFriendOverviewItem(
+account: null == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as SnAccountStatus,activities: null == activities ? _self._activities : activities // ignore: cast_nullable_to_non_nullable
+as List<SnPresenceActivity>,
+  ));
+}
+
+/// Create a copy of SnFriendOverviewItem
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res> get account {
+  
+  return $SnAccountCopyWith<$Res>(_self.account, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}/// Create a copy of SnFriendOverviewItem
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountStatusCopyWith<$Res> get status {
+  
+  return $SnAccountStatusCopyWith<$Res>(_self.status, (value) {
+    return _then(_self.copyWith(status: value));
+  });
+}
+}
+
 // dart format on
--- a/lib/models/account.g.dart
+++ b/lib/models/account.g.dart
@@ -449,3 +449,22 @@ Map<String, dynamic> _$SnSocialCreditRecordToJson(
  'updated_at': instance.updatedAt.toIso8601String(),
  'deleted_at': instance.deletedAt?.toIso8601String(),
 };
+
+_SnFriendOverviewItem _$SnFriendOverviewItemFromJson(
+  Map<String, dynamic> json,
+) => _SnFriendOverviewItem(
+  account: SnAccount.fromJson(json['account'] as Map<String, dynamic>),
+  status: SnAccountStatus.fromJson(json['status'] as Map<String, dynamic>),
+  activities:
+      (json['activities'] as List<dynamic>)
+          .map((e) => SnPresenceActivity.fromJson(e as Map<String, dynamic>))
+          .toList(),
+);
+
+Map<String, dynamic> _$SnFriendOverviewItemToJson(
+  _SnFriendOverviewItem instance,
+) => <String, dynamic>{
+  'account': instance.account.toJson(),
+  'status': instance.status.toJson(),
+  'activities': instance.activities.map((e) => e.toJson()).toList(),
+};
--- a/lib/models/activity.dart
+++ b/lib/models/activity.dart
@@ -19,8 +19,8 @@ sealed class SnNotableDay with _$SnNotableDay {
 }

@freezed
-sealed class SnActivity with _$SnActivity {
-  const factory SnActivity({
+sealed class SnTimelineEvent with _$SnTimelineEvent {
+  const factory SnTimelineEvent({
    required String id,
    required String type,
    required String resourceIdentifier,
@@ -28,10 +28,10 @@ sealed class SnActivity with _$SnActivity {
    required DateTime createdAt,
    required DateTime updatedAt,
    required DateTime? deletedAt,
-  }) = _SnActivity;
+  }) = _SnTimelineEvent;

-  factory SnActivity.fromJson(Map<String, dynamic> json) =>
-      _$SnActivityFromJson(json);
+  factory SnTimelineEvent.fromJson(Map<String, dynamic> json) =>
+      _$SnTimelineEventFromJson(json);
 }

@freezed
@@ -74,3 +74,29 @@ sealed class SnEventCalendarEntry with _$SnEventCalendarEntry {
  factory SnEventCalendarEntry.fromJson(Map<String, dynamic> json) =>
      _$SnEventCalendarEntryFromJson(json);
 }
+
+@freezed
+sealed class SnPresenceActivity with _$SnPresenceActivity {
+  const factory SnPresenceActivity({
+    required String id,
+    required int type,
+    required String? manualId,
+    required String? title,
+    required String? subtitle,
+    required String? caption,
+    required String? titleUrl,
+    required String? subtitleUrl,
+    required String? smallImage,
+    required String? largeImage,
+    required Map<String, dynamic>? meta,
+    required int leaseMinutes,
+    required DateTime leaseExpiresAt,
+    required String accountId,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnPresenceActivity;
+
+  factory SnPresenceActivity.fromJson(Map<String, dynamic> json) =>
+      _$SnPresenceActivityFromJson(json);
+}
--- a/lib/models/activity.freezed.dart
+++ b/lib/models/activity.freezed.dart
@@ -288,22 +288,22 @@ as List<int>,


 /// @nodoc
-mixin _$SnActivity {
+mixin _$SnTimelineEvent {

 String get id; String get type; String get resourceIdentifier; dynamic get data; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
-/// Create a copy of SnActivity
+/// Create a copy of SnTimelineEvent
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@pragma('vm:prefer-inline')
-$SnActivityCopyWith<SnActivity> get copyWith => _$SnActivityCopyWithImpl<SnActivity>(this as SnActivity, _$identity);
+$SnTimelineEventCopyWith<SnTimelineEvent> get copyWith => _$SnTimelineEventCopyWithImpl<SnTimelineEvent>(this as SnTimelineEvent, _$identity);

-  /// Serializes this SnActivity to a JSON map.
+  /// Serializes this SnTimelineEvent to a JSON map.
  Map<String, dynamic> toJson();


@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnActivity&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&const DeepCollectionEquality().equals(other.data, data)&&(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 SnTimelineEvent&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&const DeepCollectionEquality().equals(other.data, data)&&(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)
@@ -312,15 +312,15 @@ int get hashCode => Object.hash(runtimeType,id,type,resourceIdentifier,const Dee

@override
 String toString() {
-  return 'SnActivity(id: $id, type: $type, resourceIdentifier: $resourceIdentifier, data: $data, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnTimelineEvent(id: $id, type: $type, resourceIdentifier: $resourceIdentifier, data: $data, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }


 }

 /// @nodoc
-abstract mixin class $SnActivityCopyWith<$Res>  {
-  factory $SnActivityCopyWith(SnActivity value, $Res Function(SnActivity) _then) = _$SnActivityCopyWithImpl;
+abstract mixin class $SnTimelineEventCopyWith<$Res>  {
+  factory $SnTimelineEventCopyWith(SnTimelineEvent value, $Res Function(SnTimelineEvent) _then) = _$SnTimelineEventCopyWithImpl;
@useResult
 $Res call({
 String id, String type, String resourceIdentifier, dynamic data, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
@@ -331,14 +331,14 @@ $Res call({

 }
 /// @nodoc
-class _$SnActivityCopyWithImpl<$Res>
-    implements $SnActivityCopyWith<$Res> {
-  _$SnActivityCopyWithImpl(this._self, this._then);
+class _$SnTimelineEventCopyWithImpl<$Res>
+    implements $SnTimelineEventCopyWith<$Res> {
+  _$SnTimelineEventCopyWithImpl(this._self, this._then);

-  final SnActivity _self;
-  final $Res Function(SnActivity) _then;
+  final SnTimelineEvent _self;
+  final $Res Function(SnTimelineEvent) _then;

-/// Create a copy of SnActivity
+/// Create a copy of SnTimelineEvent
 /// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? resourceIdentifier = null,Object? data = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_self.copyWith(
@@ -356,8 +356,8 @@ as DateTime?,
 }


-/// Adds pattern-matching-related methods to [SnActivity].
-extension SnActivityPatterns on SnActivity {
+/// Adds pattern-matching-related methods to [SnTimelineEvent].
+extension SnTimelineEventPatterns on SnTimelineEvent {
 /// A variant of `map` that fallback to returning `orElse`.
 ///
 /// It is equivalent to doing:
@@ -370,10 +370,10 @@ extension SnActivityPatterns on SnActivity {
 /// }
 /// ```

-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnActivity value)?  $default,{required TResult orElse(),}){
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnTimelineEvent value)?  $default,{required TResult orElse(),}){
 final _that = this;
 switch (_that) {
-case _SnActivity() when $default != null:
+case _SnTimelineEvent() when $default != null:
 return $default(_that);case _:
  return orElse();

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

-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnActivity value)  $default,){
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnTimelineEvent value)  $default,){
 final _that = this;
 switch (_that) {
-case _SnActivity():
+case _SnTimelineEvent():
 return $default(_that);}
 }
 /// A variant of `map` that fallback to returning `null`.
@@ -410,10 +410,10 @@ return $default(_that);}
 /// }
 /// ```

-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnActivity value)?  $default,){
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnTimelineEvent value)?  $default,){
 final _that = this;
 switch (_that) {
-case _SnActivity() when $default != null:
+case _SnTimelineEvent() when $default != null:
 return $default(_that);case _:
  return null;

@@ -433,7 +433,7 @@ return $default(_that);case _:

@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String type,  String resourceIdentifier,  dynamic data,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
-case _SnActivity() when $default != null:
+case _SnTimelineEvent() when $default != null:
 return $default(_that.id,_that.type,_that.resourceIdentifier,_that.data,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
  return orElse();

@@ -454,7 +454,7 @@ return $default(_that.id,_that.type,_that.resourceIdentifier,_that.data,_that.cr

@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String type,  String resourceIdentifier,  dynamic data,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
-case _SnActivity():
+case _SnTimelineEvent():
 return $default(_that.id,_that.type,_that.resourceIdentifier,_that.data,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
@@ -471,7 +471,7 @@ return $default(_that.id,_that.type,_that.resourceIdentifier,_that.data,_that.cr

@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String type,  String resourceIdentifier,  dynamic data,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
-case _SnActivity() when $default != null:
+case _SnTimelineEvent() when $default != null:
 return $default(_that.id,_that.type,_that.resourceIdentifier,_that.data,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
  return null;

@@ -483,9 +483,9 @@ return $default(_that.id,_that.type,_that.resourceIdentifier,_that.data,_that.cr
 /// @nodoc
@JsonSerializable()

-class _SnActivity implements SnActivity {
-  const _SnActivity({required this.id, required this.type, required this.resourceIdentifier, required this.data, required this.createdAt, required this.updatedAt, required this.deletedAt});
-  factory _SnActivity.fromJson(Map<String, dynamic> json) => _$SnActivityFromJson(json);
+class _SnTimelineEvent implements SnTimelineEvent {
+  const _SnTimelineEvent({required this.id, required this.type, required this.resourceIdentifier, required this.data, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  factory _SnTimelineEvent.fromJson(Map<String, dynamic> json) => _$SnTimelineEventFromJson(json);

@override final  String id;
@override final  String type;
@@ -495,20 +495,20 @@ class _SnActivity implements SnActivity {
@override final  DateTime updatedAt;
@override final  DateTime? deletedAt;

-/// Create a copy of SnActivity
+/// Create a copy of SnTimelineEvent
 /// with the given fields replaced by the non-null parameter values.
@override @JsonKey(includeFromJson: false, includeToJson: false)
@pragma('vm:prefer-inline')
-_$SnActivityCopyWith<_SnActivity> get copyWith => __$SnActivityCopyWithImpl<_SnActivity>(this, _$identity);
+_$SnTimelineEventCopyWith<_SnTimelineEvent> get copyWith => __$SnTimelineEventCopyWithImpl<_SnTimelineEvent>(this, _$identity);

@override
 Map<String, dynamic> toJson() {
-  return _$SnActivityToJson(this, );
+  return _$SnTimelineEventToJson(this, );
 }

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnActivity&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&const DeepCollectionEquality().equals(other.data, data)&&(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 _SnTimelineEvent&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&const DeepCollectionEquality().equals(other.data, data)&&(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)
@@ -517,15 +517,15 @@ int get hashCode => Object.hash(runtimeType,id,type,resourceIdentifier,const Dee

@override
 String toString() {
-  return 'SnActivity(id: $id, type: $type, resourceIdentifier: $resourceIdentifier, data: $data, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnTimelineEvent(id: $id, type: $type, resourceIdentifier: $resourceIdentifier, data: $data, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }


 }

 /// @nodoc
-abstract mixin class _$SnActivityCopyWith<$Res> implements $SnActivityCopyWith<$Res> {
-  factory _$SnActivityCopyWith(_SnActivity value, $Res Function(_SnActivity) _then) = __$SnActivityCopyWithImpl;
+abstract mixin class _$SnTimelineEventCopyWith<$Res> implements $SnTimelineEventCopyWith<$Res> {
+  factory _$SnTimelineEventCopyWith(_SnTimelineEvent value, $Res Function(_SnTimelineEvent) _then) = __$SnTimelineEventCopyWithImpl;
@override @useResult
 $Res call({
 String id, String type, String resourceIdentifier, dynamic data, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
@@ -536,17 +536,17 @@ $Res call({

 }
 /// @nodoc
-class __$SnActivityCopyWithImpl<$Res>
-    implements _$SnActivityCopyWith<$Res> {
-  __$SnActivityCopyWithImpl(this._self, this._then);
+class __$SnTimelineEventCopyWithImpl<$Res>
+    implements _$SnTimelineEventCopyWith<$Res> {
+  __$SnTimelineEventCopyWithImpl(this._self, this._then);

-  final _SnActivity _self;
-  final $Res Function(_SnActivity) _then;
+  final _SnTimelineEvent _self;
+  final $Res Function(_SnTimelineEvent) _then;

-/// Create a copy of SnActivity
+/// Create a copy of SnTimelineEvent
 /// with the given fields replaced by the non-null parameter values.
@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? resourceIdentifier = null,Object? data = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
-  return _then(_SnActivity(
+  return _then(_SnTimelineEvent(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as String,resourceIdentifier: null == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
@@ -1425,4 +1425,317 @@ $SnCheckInResultCopyWith<$Res>? get checkInResult {
 }
 }

+
+/// @nodoc
+mixin _$SnPresenceActivity {
+
+ String get id; int get type; String? get manualId; String? get title; String? get subtitle; String? get caption; String? get titleUrl; String? get subtitleUrl; String? get smallImage; String? get largeImage; Map<String, dynamic>? get meta; int get leaseMinutes; DateTime get leaseExpiresAt; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnPresenceActivity
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnPresenceActivityCopyWith<SnPresenceActivity> get copyWith => _$SnPresenceActivityCopyWithImpl<SnPresenceActivity>(this as SnPresenceActivity, _$identity);
+
+  /// Serializes this SnPresenceActivity to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPresenceActivity&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.manualId, manualId) || other.manualId == manualId)&&(identical(other.title, title) || other.title == title)&&(identical(other.subtitle, subtitle) || other.subtitle == subtitle)&&(identical(other.caption, caption) || other.caption == caption)&&(identical(other.titleUrl, titleUrl) || other.titleUrl == titleUrl)&&(identical(other.subtitleUrl, subtitleUrl) || other.subtitleUrl == subtitleUrl)&&(identical(other.smallImage, smallImage) || other.smallImage == smallImage)&&(identical(other.largeImage, largeImage) || other.largeImage == largeImage)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.leaseMinutes, leaseMinutes) || other.leaseMinutes == leaseMinutes)&&(identical(other.leaseExpiresAt, leaseExpiresAt) || other.leaseExpiresAt == leaseExpiresAt)&&(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,type,manualId,title,subtitle,caption,titleUrl,subtitleUrl,smallImage,largeImage,const DeepCollectionEquality().hash(meta),leaseMinutes,leaseExpiresAt,accountId,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnPresenceActivity(id: $id, type: $type, manualId: $manualId, title: $title, subtitle: $subtitle, caption: $caption, titleUrl: $titleUrl, subtitleUrl: $subtitleUrl, smallImage: $smallImage, largeImage: $largeImage, meta: $meta, leaseMinutes: $leaseMinutes, leaseExpiresAt: $leaseExpiresAt, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnPresenceActivityCopyWith<$Res>  {
+  factory $SnPresenceActivityCopyWith(SnPresenceActivity value, $Res Function(SnPresenceActivity) _then) = _$SnPresenceActivityCopyWithImpl;
+@useResult
+$Res call({
+ String id, int type, String? manualId, String? title, String? subtitle, String? caption, String? titleUrl, String? subtitleUrl, String? smallImage, String? largeImage, Map<String, dynamic>? meta, int leaseMinutes, DateTime leaseExpiresAt, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnPresenceActivityCopyWithImpl<$Res>
+    implements $SnPresenceActivityCopyWith<$Res> {
+  _$SnPresenceActivityCopyWithImpl(this._self, this._then);
+
+  final SnPresenceActivity _self;
+  final $Res Function(SnPresenceActivity) _then;
+
+/// Create a copy of SnPresenceActivity
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? manualId = freezed,Object? title = freezed,Object? subtitle = freezed,Object? caption = freezed,Object? titleUrl = freezed,Object? subtitleUrl = freezed,Object? smallImage = freezed,Object? largeImage = freezed,Object? meta = freezed,Object? leaseMinutes = null,Object? leaseExpiresAt = null,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,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as int,manualId: freezed == manualId ? _self.manualId : manualId // ignore: cast_nullable_to_non_nullable
+as String?,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String?,subtitle: freezed == subtitle ? _self.subtitle : subtitle // ignore: cast_nullable_to_non_nullable
+as String?,caption: freezed == caption ? _self.caption : caption // ignore: cast_nullable_to_non_nullable
+as String?,titleUrl: freezed == titleUrl ? _self.titleUrl : titleUrl // ignore: cast_nullable_to_non_nullable
+as String?,subtitleUrl: freezed == subtitleUrl ? _self.subtitleUrl : subtitleUrl // ignore: cast_nullable_to_non_nullable
+as String?,smallImage: freezed == smallImage ? _self.smallImage : smallImage // ignore: cast_nullable_to_non_nullable
+as String?,largeImage: freezed == largeImage ? _self.largeImage : largeImage // ignore: cast_nullable_to_non_nullable
+as String?,meta: freezed == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,leaseMinutes: null == leaseMinutes ? _self.leaseMinutes : leaseMinutes // ignore: cast_nullable_to_non_nullable
+as int,leaseExpiresAt: null == leaseExpiresAt ? _self.leaseExpiresAt : leaseExpiresAt // 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
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnPresenceActivity].
+extension SnPresenceActivityPatterns on SnPresenceActivity {
+/// 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( _SnPresenceActivity value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnPresenceActivity() 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( _SnPresenceActivity value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnPresenceActivity():
+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( _SnPresenceActivity value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnPresenceActivity() 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,  int type,  String? manualId,  String? title,  String? subtitle,  String? caption,  String? titleUrl,  String? subtitleUrl,  String? smallImage,  String? largeImage,  Map<String, dynamic>? meta,  int leaseMinutes,  DateTime leaseExpiresAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnPresenceActivity() when $default != null:
+return $default(_that.id,_that.type,_that.manualId,_that.title,_that.subtitle,_that.caption,_that.titleUrl,_that.subtitleUrl,_that.smallImage,_that.largeImage,_that.meta,_that.leaseMinutes,_that.leaseExpiresAt,_that.accountId,_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,  int type,  String? manualId,  String? title,  String? subtitle,  String? caption,  String? titleUrl,  String? subtitleUrl,  String? smallImage,  String? largeImage,  Map<String, dynamic>? meta,  int leaseMinutes,  DateTime leaseExpiresAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnPresenceActivity():
+return $default(_that.id,_that.type,_that.manualId,_that.title,_that.subtitle,_that.caption,_that.titleUrl,_that.subtitleUrl,_that.smallImage,_that.largeImage,_that.meta,_that.leaseMinutes,_that.leaseExpiresAt,_that.accountId,_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,  int type,  String? manualId,  String? title,  String? subtitle,  String? caption,  String? titleUrl,  String? subtitleUrl,  String? smallImage,  String? largeImage,  Map<String, dynamic>? meta,  int leaseMinutes,  DateTime leaseExpiresAt,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnPresenceActivity() when $default != null:
+return $default(_that.id,_that.type,_that.manualId,_that.title,_that.subtitle,_that.caption,_that.titleUrl,_that.subtitleUrl,_that.smallImage,_that.largeImage,_that.meta,_that.leaseMinutes,_that.leaseExpiresAt,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnPresenceActivity implements SnPresenceActivity {
+  const _SnPresenceActivity({required this.id, required this.type, required this.manualId, required this.title, required this.subtitle, required this.caption, required this.titleUrl, required this.subtitleUrl, required this.smallImage, required this.largeImage, required final  Map<String, dynamic>? meta, required this.leaseMinutes, required this.leaseExpiresAt, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt}): _meta = meta;
+  factory _SnPresenceActivity.fromJson(Map<String, dynamic> json) => _$SnPresenceActivityFromJson(json);
+
+@override final  String id;
+@override final  int type;
+@override final  String? manualId;
+@override final  String? title;
+@override final  String? subtitle;
+@override final  String? caption;
+@override final  String? titleUrl;
+@override final  String? subtitleUrl;
+@override final  String? smallImage;
+@override final  String? largeImage;
+ 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  int leaseMinutes;
+@override final  DateTime leaseExpiresAt;
+@override final  String accountId;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnPresenceActivity
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnPresenceActivityCopyWith<_SnPresenceActivity> get copyWith => __$SnPresenceActivityCopyWithImpl<_SnPresenceActivity>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnPresenceActivityToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPresenceActivity&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.manualId, manualId) || other.manualId == manualId)&&(identical(other.title, title) || other.title == title)&&(identical(other.subtitle, subtitle) || other.subtitle == subtitle)&&(identical(other.caption, caption) || other.caption == caption)&&(identical(other.titleUrl, titleUrl) || other.titleUrl == titleUrl)&&(identical(other.subtitleUrl, subtitleUrl) || other.subtitleUrl == subtitleUrl)&&(identical(other.smallImage, smallImage) || other.smallImage == smallImage)&&(identical(other.largeImage, largeImage) || other.largeImage == largeImage)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.leaseMinutes, leaseMinutes) || other.leaseMinutes == leaseMinutes)&&(identical(other.leaseExpiresAt, leaseExpiresAt) || other.leaseExpiresAt == leaseExpiresAt)&&(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,type,manualId,title,subtitle,caption,titleUrl,subtitleUrl,smallImage,largeImage,const DeepCollectionEquality().hash(_meta),leaseMinutes,leaseExpiresAt,accountId,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnPresenceActivity(id: $id, type: $type, manualId: $manualId, title: $title, subtitle: $subtitle, caption: $caption, titleUrl: $titleUrl, subtitleUrl: $subtitleUrl, smallImage: $smallImage, largeImage: $largeImage, meta: $meta, leaseMinutes: $leaseMinutes, leaseExpiresAt: $leaseExpiresAt, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnPresenceActivityCopyWith<$Res> implements $SnPresenceActivityCopyWith<$Res> {
+  factory _$SnPresenceActivityCopyWith(_SnPresenceActivity value, $Res Function(_SnPresenceActivity) _then) = __$SnPresenceActivityCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, int type, String? manualId, String? title, String? subtitle, String? caption, String? titleUrl, String? subtitleUrl, String? smallImage, String? largeImage, Map<String, dynamic>? meta, int leaseMinutes, DateTime leaseExpiresAt, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnPresenceActivityCopyWithImpl<$Res>
+    implements _$SnPresenceActivityCopyWith<$Res> {
+  __$SnPresenceActivityCopyWithImpl(this._self, this._then);
+
+  final _SnPresenceActivity _self;
+  final $Res Function(_SnPresenceActivity) _then;
+
+/// Create a copy of SnPresenceActivity
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? manualId = freezed,Object? title = freezed,Object? subtitle = freezed,Object? caption = freezed,Object? titleUrl = freezed,Object? subtitleUrl = freezed,Object? smallImage = freezed,Object? largeImage = freezed,Object? meta = freezed,Object? leaseMinutes = null,Object? leaseExpiresAt = null,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+  return _then(_SnPresenceActivity(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as int,manualId: freezed == manualId ? _self.manualId : manualId // ignore: cast_nullable_to_non_nullable
+as String?,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String?,subtitle: freezed == subtitle ? _self.subtitle : subtitle // ignore: cast_nullable_to_non_nullable
+as String?,caption: freezed == caption ? _self.caption : caption // ignore: cast_nullable_to_non_nullable
+as String?,titleUrl: freezed == titleUrl ? _self.titleUrl : titleUrl // ignore: cast_nullable_to_non_nullable
+as String?,subtitleUrl: freezed == subtitleUrl ? _self.subtitleUrl : subtitleUrl // ignore: cast_nullable_to_non_nullable
+as String?,smallImage: freezed == smallImage ? _self.smallImage : smallImage // ignore: cast_nullable_to_non_nullable
+as String?,largeImage: freezed == largeImage ? _self.largeImage : largeImage // ignore: cast_nullable_to_non_nullable
+as String?,meta: freezed == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,leaseMinutes: null == leaseMinutes ? _self.leaseMinutes : leaseMinutes // ignore: cast_nullable_to_non_nullable
+as int,leaseExpiresAt: null == leaseExpiresAt ? _self.leaseExpiresAt : leaseExpiresAt // 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
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+
+}
+
 // dart format on
--- a/lib/models/activity.g.dart
+++ b/lib/models/activity.g.dart
@@ -27,20 +27,21 @@ Map<String, dynamic> _$SnNotableDayToJson(_SnNotableDay instance) =>
      'holidays': instance.holidays,
    };

-_SnActivity _$SnActivityFromJson(Map<String, dynamic> json) => _SnActivity(
-  id: json['id'] as String,
-  type: json['type'] as String,
-  resourceIdentifier: json['resource_identifier'] as String,
-  data: json['data'],
-  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),
-);
+_SnTimelineEvent _$SnTimelineEventFromJson(Map<String, dynamic> json) =>
+    _SnTimelineEvent(
+      id: json['id'] as String,
+      type: json['type'] as String,
+      resourceIdentifier: json['resource_identifier'] as String,
+      data: json['data'],
+      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> _$SnActivityToJson(_SnActivity instance) =>
+Map<String, dynamic> _$SnTimelineEventToJson(_SnTimelineEvent instance) =>
    <String, dynamic>{
      'id': instance.id,
      'type': instance.type,
@@ -121,3 +122,48 @@ Map<String, dynamic> _$SnEventCalendarEntryToJson(
  'check_in_result': instance.checkInResult?.toJson(),
  'statuses': instance.statuses.map((e) => e.toJson()).toList(),
 };
+
+_SnPresenceActivity _$SnPresenceActivityFromJson(Map<String, dynamic> json) =>
+    _SnPresenceActivity(
+      id: json['id'] as String,
+      type: (json['type'] as num).toInt(),
+      manualId: json['manual_id'] as String?,
+      title: json['title'] as String?,
+      subtitle: json['subtitle'] as String?,
+      caption: json['caption'] as String?,
+      titleUrl: json['title_url'] as String?,
+      subtitleUrl: json['subtitle_url'] as String?,
+      smallImage: json['small_image'] as String?,
+      largeImage: json['large_image'] as String?,
+      meta: json['meta'] as Map<String, dynamic>?,
+      leaseMinutes: (json['lease_minutes'] as num).toInt(),
+      leaseExpiresAt: DateTime.parse(json['lease_expires_at'] as String),
+      accountId: json['account_id'] as String,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      deletedAt:
+          json['deleted_at'] == null
+              ? null
+              : DateTime.parse(json['deleted_at'] as String),
+    );
+
+Map<String, dynamic> _$SnPresenceActivityToJson(_SnPresenceActivity instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'type': instance.type,
+      'manual_id': instance.manualId,
+      'title': instance.title,
+      'subtitle': instance.subtitle,
+      'caption': instance.caption,
+      'title_url': instance.titleUrl,
+      'subtitle_url': instance.subtitleUrl,
+      'small_image': instance.smallImage,
+      'large_image': instance.largeImage,
+      'meta': instance.meta,
+      'lease_minutes': instance.leaseMinutes,
+      'lease_expires_at': instance.leaseExpiresAt.toIso8601String(),
+      'account_id': instance.accountId,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };
--- a/lib/models/drive_task.dart
+++ b/lib/models/drive_task.dart
@@ -0,0 +1,57 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/file.dart';
+
+part 'drive_task.freezed.dart';
+part 'drive_task.g.dart';
+
+enum DriveTaskStatus {
+  pending,
+  inProgress,
+  paused,
+  completed,
+  failed,
+  expired,
+  cancelled,
+}
+
+@freezed
+sealed class DriveTask with _$DriveTask {
+  const DriveTask._();
+
+  const factory DriveTask({
+    required String id,
+    required String taskId,
+    required String fileName,
+    required String contentType,
+    required int fileSize,
+    required int uploadedBytes,
+    required int totalChunks,
+    required int uploadedChunks,
+    required DriveTaskStatus status,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required String type, // Task type (e.g., 'FileUpload')
+    double? transmissionProgress, // Local file upload progress (0.0-1.0)
+    String? errorMessage,
+    String? statusMessage,
+    SnCloudFile? result,
+    String? poolId,
+    String? bundleId,
+    String? encryptPassword,
+    String? expiredAt,
+  }) = _DriveTask;
+
+  factory DriveTask.fromJson(Map<String, dynamic> json) =>
+      _$DriveTaskFromJson(json);
+
+  double get progress => totalChunks > 0 ? uploadedChunks / totalChunks : 0.0;
+
+  Duration get estimatedTimeRemaining {
+    if (uploadedBytes == 0 || fileSize == 0) return Duration.zero;
+    final remainingBytes = fileSize - uploadedBytes;
+    final uploadRate =
+        uploadedBytes / createdAt.difference(DateTime.now()).inSeconds.abs();
+    if (uploadRate == 0) return Duration.zero;
+    return Duration(seconds: (remainingBytes / uploadRate).round());
+  }
+}
--- a/lib/models/drive_task.freezed.dart
+++ b/lib/models/drive_task.freezed.dart
@@ -0,0 +1,356 @@
+// 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 'drive_task.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$DriveTask {
+
+ String get id; String get taskId; String get fileName; String get contentType; int get fileSize; int get uploadedBytes; int get totalChunks; int get uploadedChunks; DriveTaskStatus get status; DateTime get createdAt; DateTime get updatedAt; String get type;// Task type (e.g., 'FileUpload')
+ double? get transmissionProgress;// Local file upload progress (0.0-1.0)
+ String? get errorMessage; String? get statusMessage; SnCloudFile? get result; String? get poolId; String? get bundleId; String? get encryptPassword; String? get expiredAt;
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$DriveTaskCopyWith<DriveTask> get copyWith => _$DriveTaskCopyWithImpl<DriveTask>(this as DriveTask, _$identity);
+
+  /// Serializes this DriveTask to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is DriveTask&&(identical(other.id, id) || other.id == id)&&(identical(other.taskId, taskId) || other.taskId == taskId)&&(identical(other.fileName, fileName) || other.fileName == fileName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.fileSize, fileSize) || other.fileSize == fileSize)&&(identical(other.uploadedBytes, uploadedBytes) || other.uploadedBytes == uploadedBytes)&&(identical(other.totalChunks, totalChunks) || other.totalChunks == totalChunks)&&(identical(other.uploadedChunks, uploadedChunks) || other.uploadedChunks == uploadedChunks)&&(identical(other.status, status) || other.status == status)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.type, type) || other.type == type)&&(identical(other.transmissionProgress, transmissionProgress) || other.transmissionProgress == transmissionProgress)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.statusMessage, statusMessage) || other.statusMessage == statusMessage)&&(identical(other.result, result) || other.result == result)&&(identical(other.poolId, poolId) || other.poolId == poolId)&&(identical(other.bundleId, bundleId) || other.bundleId == bundleId)&&(identical(other.encryptPassword, encryptPassword) || other.encryptPassword == encryptPassword)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hashAll([runtimeType,id,taskId,fileName,contentType,fileSize,uploadedBytes,totalChunks,uploadedChunks,status,createdAt,updatedAt,type,transmissionProgress,errorMessage,statusMessage,result,poolId,bundleId,encryptPassword,expiredAt]);
+
+@override
+String toString() {
+  return 'DriveTask(id: $id, taskId: $taskId, fileName: $fileName, contentType: $contentType, fileSize: $fileSize, uploadedBytes: $uploadedBytes, totalChunks: $totalChunks, uploadedChunks: $uploadedChunks, status: $status, createdAt: $createdAt, updatedAt: $updatedAt, type: $type, transmissionProgress: $transmissionProgress, errorMessage: $errorMessage, statusMessage: $statusMessage, result: $result, poolId: $poolId, bundleId: $bundleId, encryptPassword: $encryptPassword, expiredAt: $expiredAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $DriveTaskCopyWith<$Res>  {
+  factory $DriveTaskCopyWith(DriveTask value, $Res Function(DriveTask) _then) = _$DriveTaskCopyWithImpl;
+@useResult
+$Res call({
+ String id, String taskId, String fileName, String contentType, int fileSize, int uploadedBytes, int totalChunks, int uploadedChunks, DriveTaskStatus status, DateTime createdAt, DateTime updatedAt, String type, double? transmissionProgress, String? errorMessage, String? statusMessage, SnCloudFile? result, String? poolId, String? bundleId, String? encryptPassword, String? expiredAt
+});
+
+
+$SnCloudFileCopyWith<$Res>? get result;
+
+}
+/// @nodoc
+class _$DriveTaskCopyWithImpl<$Res>
+    implements $DriveTaskCopyWith<$Res> {
+  _$DriveTaskCopyWithImpl(this._self, this._then);
+
+  final DriveTask _self;
+  final $Res Function(DriveTask) _then;
+
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? taskId = null,Object? fileName = null,Object? contentType = null,Object? fileSize = null,Object? uploadedBytes = null,Object? totalChunks = null,Object? uploadedChunks = null,Object? status = null,Object? createdAt = null,Object? updatedAt = null,Object? type = null,Object? transmissionProgress = freezed,Object? errorMessage = freezed,Object? statusMessage = freezed,Object? result = freezed,Object? poolId = freezed,Object? bundleId = freezed,Object? encryptPassword = freezed,Object? expiredAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,taskId: null == taskId ? _self.taskId : taskId // ignore: cast_nullable_to_non_nullable
+as String,fileName: null == fileName ? _self.fileName : fileName // ignore: cast_nullable_to_non_nullable
+as String,contentType: null == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String,fileSize: null == fileSize ? _self.fileSize : fileSize // ignore: cast_nullable_to_non_nullable
+as int,uploadedBytes: null == uploadedBytes ? _self.uploadedBytes : uploadedBytes // ignore: cast_nullable_to_non_nullable
+as int,totalChunks: null == totalChunks ? _self.totalChunks : totalChunks // ignore: cast_nullable_to_non_nullable
+as int,uploadedChunks: null == uploadedChunks ? _self.uploadedChunks : uploadedChunks // ignore: cast_nullable_to_non_nullable
+as int,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as DriveTaskStatus,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,transmissionProgress: freezed == transmissionProgress ? _self.transmissionProgress : transmissionProgress // ignore: cast_nullable_to_non_nullable
+as double?,errorMessage: freezed == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String?,statusMessage: freezed == statusMessage ? _self.statusMessage : statusMessage // ignore: cast_nullable_to_non_nullable
+as String?,result: freezed == result ? _self.result : result // ignore: cast_nullable_to_non_nullable
+as SnCloudFile?,poolId: freezed == poolId ? _self.poolId : poolId // ignore: cast_nullable_to_non_nullable
+as String?,bundleId: freezed == bundleId ? _self.bundleId : bundleId // ignore: cast_nullable_to_non_nullable
+as String?,encryptPassword: freezed == encryptPassword ? _self.encryptPassword : encryptPassword // ignore: cast_nullable_to_non_nullable
+as String?,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res>? get result {
+    if (_self.result == null) {
+    return null;
+  }
+
+  return $SnCloudFileCopyWith<$Res>(_self.result!, (value) {
+    return _then(_self.copyWith(result: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [DriveTask].
+extension DriveTaskPatterns on DriveTask {
+/// 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( _DriveTask value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _DriveTask() 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( _DriveTask value)  $default,){
+final _that = this;
+switch (_that) {
+case _DriveTask():
+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( _DriveTask value)?  $default,){
+final _that = this;
+switch (_that) {
+case _DriveTask() 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 taskId,  String fileName,  String contentType,  int fileSize,  int uploadedBytes,  int totalChunks,  int uploadedChunks,  DriveTaskStatus status,  DateTime createdAt,  DateTime updatedAt,  String type,  double? transmissionProgress,  String? errorMessage,  String? statusMessage,  SnCloudFile? result,  String? poolId,  String? bundleId,  String? encryptPassword,  String? expiredAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _DriveTask() when $default != null:
+return $default(_that.id,_that.taskId,_that.fileName,_that.contentType,_that.fileSize,_that.uploadedBytes,_that.totalChunks,_that.uploadedChunks,_that.status,_that.createdAt,_that.updatedAt,_that.type,_that.transmissionProgress,_that.errorMessage,_that.statusMessage,_that.result,_that.poolId,_that.bundleId,_that.encryptPassword,_that.expiredAt);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 taskId,  String fileName,  String contentType,  int fileSize,  int uploadedBytes,  int totalChunks,  int uploadedChunks,  DriveTaskStatus status,  DateTime createdAt,  DateTime updatedAt,  String type,  double? transmissionProgress,  String? errorMessage,  String? statusMessage,  SnCloudFile? result,  String? poolId,  String? bundleId,  String? encryptPassword,  String? expiredAt)  $default,) {final _that = this;
+switch (_that) {
+case _DriveTask():
+return $default(_that.id,_that.taskId,_that.fileName,_that.contentType,_that.fileSize,_that.uploadedBytes,_that.totalChunks,_that.uploadedChunks,_that.status,_that.createdAt,_that.updatedAt,_that.type,_that.transmissionProgress,_that.errorMessage,_that.statusMessage,_that.result,_that.poolId,_that.bundleId,_that.encryptPassword,_that.expiredAt);}
+}
+/// 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 taskId,  String fileName,  String contentType,  int fileSize,  int uploadedBytes,  int totalChunks,  int uploadedChunks,  DriveTaskStatus status,  DateTime createdAt,  DateTime updatedAt,  String type,  double? transmissionProgress,  String? errorMessage,  String? statusMessage,  SnCloudFile? result,  String? poolId,  String? bundleId,  String? encryptPassword,  String? expiredAt)?  $default,) {final _that = this;
+switch (_that) {
+case _DriveTask() when $default != null:
+return $default(_that.id,_that.taskId,_that.fileName,_that.contentType,_that.fileSize,_that.uploadedBytes,_that.totalChunks,_that.uploadedChunks,_that.status,_that.createdAt,_that.updatedAt,_that.type,_that.transmissionProgress,_that.errorMessage,_that.statusMessage,_that.result,_that.poolId,_that.bundleId,_that.encryptPassword,_that.expiredAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _DriveTask extends DriveTask {
+  const _DriveTask({required this.id, required this.taskId, required this.fileName, required this.contentType, required this.fileSize, required this.uploadedBytes, required this.totalChunks, required this.uploadedChunks, required this.status, required this.createdAt, required this.updatedAt, required this.type, this.transmissionProgress, this.errorMessage, this.statusMessage, this.result, this.poolId, this.bundleId, this.encryptPassword, this.expiredAt}): super._();
+  factory _DriveTask.fromJson(Map<String, dynamic> json) => _$DriveTaskFromJson(json);
+
+@override final  String id;
+@override final  String taskId;
+@override final  String fileName;
+@override final  String contentType;
+@override final  int fileSize;
+@override final  int uploadedBytes;
+@override final  int totalChunks;
+@override final  int uploadedChunks;
+@override final  DriveTaskStatus status;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+@override final  String type;
+// Task type (e.g., 'FileUpload')
+@override final  double? transmissionProgress;
+// Local file upload progress (0.0-1.0)
+@override final  String? errorMessage;
+@override final  String? statusMessage;
+@override final  SnCloudFile? result;
+@override final  String? poolId;
+@override final  String? bundleId;
+@override final  String? encryptPassword;
+@override final  String? expiredAt;
+
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$DriveTaskCopyWith<_DriveTask> get copyWith => __$DriveTaskCopyWithImpl<_DriveTask>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$DriveTaskToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _DriveTask&&(identical(other.id, id) || other.id == id)&&(identical(other.taskId, taskId) || other.taskId == taskId)&&(identical(other.fileName, fileName) || other.fileName == fileName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.fileSize, fileSize) || other.fileSize == fileSize)&&(identical(other.uploadedBytes, uploadedBytes) || other.uploadedBytes == uploadedBytes)&&(identical(other.totalChunks, totalChunks) || other.totalChunks == totalChunks)&&(identical(other.uploadedChunks, uploadedChunks) || other.uploadedChunks == uploadedChunks)&&(identical(other.status, status) || other.status == status)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.type, type) || other.type == type)&&(identical(other.transmissionProgress, transmissionProgress) || other.transmissionProgress == transmissionProgress)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.statusMessage, statusMessage) || other.statusMessage == statusMessage)&&(identical(other.result, result) || other.result == result)&&(identical(other.poolId, poolId) || other.poolId == poolId)&&(identical(other.bundleId, bundleId) || other.bundleId == bundleId)&&(identical(other.encryptPassword, encryptPassword) || other.encryptPassword == encryptPassword)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hashAll([runtimeType,id,taskId,fileName,contentType,fileSize,uploadedBytes,totalChunks,uploadedChunks,status,createdAt,updatedAt,type,transmissionProgress,errorMessage,statusMessage,result,poolId,bundleId,encryptPassword,expiredAt]);
+
+@override
+String toString() {
+  return 'DriveTask(id: $id, taskId: $taskId, fileName: $fileName, contentType: $contentType, fileSize: $fileSize, uploadedBytes: $uploadedBytes, totalChunks: $totalChunks, uploadedChunks: $uploadedChunks, status: $status, createdAt: $createdAt, updatedAt: $updatedAt, type: $type, transmissionProgress: $transmissionProgress, errorMessage: $errorMessage, statusMessage: $statusMessage, result: $result, poolId: $poolId, bundleId: $bundleId, encryptPassword: $encryptPassword, expiredAt: $expiredAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$DriveTaskCopyWith<$Res> implements $DriveTaskCopyWith<$Res> {
+  factory _$DriveTaskCopyWith(_DriveTask value, $Res Function(_DriveTask) _then) = __$DriveTaskCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String taskId, String fileName, String contentType, int fileSize, int uploadedBytes, int totalChunks, int uploadedChunks, DriveTaskStatus status, DateTime createdAt, DateTime updatedAt, String type, double? transmissionProgress, String? errorMessage, String? statusMessage, SnCloudFile? result, String? poolId, String? bundleId, String? encryptPassword, String? expiredAt
+});
+
+
+@override $SnCloudFileCopyWith<$Res>? get result;
+
+}
+/// @nodoc
+class __$DriveTaskCopyWithImpl<$Res>
+    implements _$DriveTaskCopyWith<$Res> {
+  __$DriveTaskCopyWithImpl(this._self, this._then);
+
+  final _DriveTask _self;
+  final $Res Function(_DriveTask) _then;
+
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? taskId = null,Object? fileName = null,Object? contentType = null,Object? fileSize = null,Object? uploadedBytes = null,Object? totalChunks = null,Object? uploadedChunks = null,Object? status = null,Object? createdAt = null,Object? updatedAt = null,Object? type = null,Object? transmissionProgress = freezed,Object? errorMessage = freezed,Object? statusMessage = freezed,Object? result = freezed,Object? poolId = freezed,Object? bundleId = freezed,Object? encryptPassword = freezed,Object? expiredAt = freezed,}) {
+  return _then(_DriveTask(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,taskId: null == taskId ? _self.taskId : taskId // ignore: cast_nullable_to_non_nullable
+as String,fileName: null == fileName ? _self.fileName : fileName // ignore: cast_nullable_to_non_nullable
+as String,contentType: null == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String,fileSize: null == fileSize ? _self.fileSize : fileSize // ignore: cast_nullable_to_non_nullable
+as int,uploadedBytes: null == uploadedBytes ? _self.uploadedBytes : uploadedBytes // ignore: cast_nullable_to_non_nullable
+as int,totalChunks: null == totalChunks ? _self.totalChunks : totalChunks // ignore: cast_nullable_to_non_nullable
+as int,uploadedChunks: null == uploadedChunks ? _self.uploadedChunks : uploadedChunks // ignore: cast_nullable_to_non_nullable
+as int,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as DriveTaskStatus,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,transmissionProgress: freezed == transmissionProgress ? _self.transmissionProgress : transmissionProgress // ignore: cast_nullable_to_non_nullable
+as double?,errorMessage: freezed == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String?,statusMessage: freezed == statusMessage ? _self.statusMessage : statusMessage // ignore: cast_nullable_to_non_nullable
+as String?,result: freezed == result ? _self.result : result // ignore: cast_nullable_to_non_nullable
+as SnCloudFile?,poolId: freezed == poolId ? _self.poolId : poolId // ignore: cast_nullable_to_non_nullable
+as String?,bundleId: freezed == bundleId ? _self.bundleId : bundleId // ignore: cast_nullable_to_non_nullable
+as String?,encryptPassword: freezed == encryptPassword ? _self.encryptPassword : encryptPassword // ignore: cast_nullable_to_non_nullable
+as String?,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res>? get result {
+    if (_self.result == null) {
+    return null;
+  }
+
+  return $SnCloudFileCopyWith<$Res>(_self.result!, (value) {
+    return _then(_self.copyWith(result: value));
+  });
+}
+}
+
+// dart format on
--- a/lib/models/drive_task.g.dart
+++ b/lib/models/drive_task.g.dart
@@ -0,0 +1,67 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'drive_task.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_DriveTask _$DriveTaskFromJson(Map<String, dynamic> json) => _DriveTask(
+  id: json['id'] as String,
+  taskId: json['task_id'] as String,
+  fileName: json['file_name'] as String,
+  contentType: json['content_type'] as String,
+  fileSize: (json['file_size'] as num).toInt(),
+  uploadedBytes: (json['uploaded_bytes'] as num).toInt(),
+  totalChunks: (json['total_chunks'] as num).toInt(),
+  uploadedChunks: (json['uploaded_chunks'] as num).toInt(),
+  status: $enumDecode(_$DriveTaskStatusEnumMap, json['status']),
+  createdAt: DateTime.parse(json['created_at'] as String),
+  updatedAt: DateTime.parse(json['updated_at'] as String),
+  type: json['type'] as String,
+  transmissionProgress: (json['transmission_progress'] as num?)?.toDouble(),
+  errorMessage: json['error_message'] as String?,
+  statusMessage: json['status_message'] as String?,
+  result:
+      json['result'] == null
+          ? null
+          : SnCloudFile.fromJson(json['result'] as Map<String, dynamic>),
+  poolId: json['pool_id'] as String?,
+  bundleId: json['bundle_id'] as String?,
+  encryptPassword: json['encrypt_password'] as String?,
+  expiredAt: json['expired_at'] as String?,
+);
+
+Map<String, dynamic> _$DriveTaskToJson(_DriveTask instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'task_id': instance.taskId,
+      'file_name': instance.fileName,
+      'content_type': instance.contentType,
+      'file_size': instance.fileSize,
+      'uploaded_bytes': instance.uploadedBytes,
+      'total_chunks': instance.totalChunks,
+      'uploaded_chunks': instance.uploadedChunks,
+      'status': _$DriveTaskStatusEnumMap[instance.status]!,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'type': instance.type,
+      'transmission_progress': instance.transmissionProgress,
+      'error_message': instance.errorMessage,
+      'status_message': instance.statusMessage,
+      'result': instance.result?.toJson(),
+      'pool_id': instance.poolId,
+      'bundle_id': instance.bundleId,
+      'encrypt_password': instance.encryptPassword,
+      'expired_at': instance.expiredAt,
+    };
+
+const _$DriveTaskStatusEnumMap = {
+  DriveTaskStatus.pending: 'pending',
+  DriveTaskStatus.inProgress: 'inProgress',
+  DriveTaskStatus.paused: 'paused',
+  DriveTaskStatus.completed: 'completed',
+  DriveTaskStatus.failed: 'failed',
+  DriveTaskStatus.expired: 'expired',
+  DriveTaskStatus.cancelled: 'cancelled',
+};
--- a/lib/models/file.dart
+++ b/lib/models/file.dart
@@ -60,3 +60,19 @@ sealed class SnCloudFile with _$SnCloudFile {
  factory SnCloudFile.fromJson(Map<String, dynamic> json) =>
      _$SnCloudFileFromJson(json);
 }
+
+@freezed
+sealed class SnCloudFileIndex with _$SnCloudFileIndex {
+  const factory SnCloudFileIndex({
+    required String id,
+    required String path,
+    required String fileId,
+    required SnCloudFile file,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnCloudFileIndex;
+
+  factory SnCloudFileIndex.fromJson(Map<String, dynamic> json) =>
+      _$SnCloudFileIndexFromJson(json);
+}
--- a/lib/models/file.freezed.dart
+++ b/lib/models/file.freezed.dart
@@ -622,4 +622,297 @@ $SnFilePoolCopyWith<$Res>? get pool {
 }
 }

+
+/// @nodoc
+mixin _$SnCloudFileIndex {
+
+ String get id; String get path; String get fileId; SnCloudFile get file; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnCloudFileIndexCopyWith<SnCloudFileIndex> get copyWith => _$SnCloudFileIndexCopyWithImpl<SnCloudFileIndex>(this as SnCloudFileIndex, _$identity);
+
+  /// Serializes this SnCloudFileIndex to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnCloudFileIndex&&(identical(other.id, id) || other.id == id)&&(identical(other.path, path) || other.path == path)&&(identical(other.fileId, fileId) || other.fileId == fileId)&&(identical(other.file, file) || other.file == file)&&(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,path,fileId,file,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnCloudFileIndex(id: $id, path: $path, fileId: $fileId, file: $file, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnCloudFileIndexCopyWith<$Res>  {
+  factory $SnCloudFileIndexCopyWith(SnCloudFileIndex value, $Res Function(SnCloudFileIndex) _then) = _$SnCloudFileIndexCopyWithImpl;
+@useResult
+$Res call({
+ String id, String path, String fileId, SnCloudFile file, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+$SnCloudFileCopyWith<$Res> get file;
+
+}
+/// @nodoc
+class _$SnCloudFileIndexCopyWithImpl<$Res>
+    implements $SnCloudFileIndexCopyWith<$Res> {
+  _$SnCloudFileIndexCopyWithImpl(this._self, this._then);
+
+  final SnCloudFileIndex _self;
+  final $Res Function(SnCloudFileIndex) _then;
+
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? path = null,Object? fileId = null,Object? file = 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,path: null == path ? _self.path : path // ignore: cast_nullable_to_non_nullable
+as String,fileId: null == fileId ? _self.fileId : fileId // ignore: cast_nullable_to_non_nullable
+as String,file: null == file ? _self.file : file // ignore: cast_nullable_to_non_nullable
+as SnCloudFile,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res> get file {
+  
+  return $SnCloudFileCopyWith<$Res>(_self.file, (value) {
+    return _then(_self.copyWith(file: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [SnCloudFileIndex].
+extension SnCloudFileIndexPatterns on SnCloudFileIndex {
+/// 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( _SnCloudFileIndex value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnCloudFileIndex() 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( _SnCloudFileIndex value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnCloudFileIndex():
+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( _SnCloudFileIndex value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnCloudFileIndex() 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 path,  String fileId,  SnCloudFile file,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnCloudFileIndex() when $default != null:
+return $default(_that.id,_that.path,_that.fileId,_that.file,_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 path,  String fileId,  SnCloudFile file,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnCloudFileIndex():
+return $default(_that.id,_that.path,_that.fileId,_that.file,_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 path,  String fileId,  SnCloudFile file,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnCloudFileIndex() when $default != null:
+return $default(_that.id,_that.path,_that.fileId,_that.file,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnCloudFileIndex implements SnCloudFileIndex {
+  const _SnCloudFileIndex({required this.id, required this.path, required this.fileId, required this.file, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  factory _SnCloudFileIndex.fromJson(Map<String, dynamic> json) => _$SnCloudFileIndexFromJson(json);
+
+@override final  String id;
+@override final  String path;
+@override final  String fileId;
+@override final  SnCloudFile file;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnCloudFileIndexCopyWith<_SnCloudFileIndex> get copyWith => __$SnCloudFileIndexCopyWithImpl<_SnCloudFileIndex>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnCloudFileIndexToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnCloudFileIndex&&(identical(other.id, id) || other.id == id)&&(identical(other.path, path) || other.path == path)&&(identical(other.fileId, fileId) || other.fileId == fileId)&&(identical(other.file, file) || other.file == file)&&(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,path,fileId,file,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnCloudFileIndex(id: $id, path: $path, fileId: $fileId, file: $file, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnCloudFileIndexCopyWith<$Res> implements $SnCloudFileIndexCopyWith<$Res> {
+  factory _$SnCloudFileIndexCopyWith(_SnCloudFileIndex value, $Res Function(_SnCloudFileIndex) _then) = __$SnCloudFileIndexCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String path, String fileId, SnCloudFile file, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+@override $SnCloudFileCopyWith<$Res> get file;
+
+}
+/// @nodoc
+class __$SnCloudFileIndexCopyWithImpl<$Res>
+    implements _$SnCloudFileIndexCopyWith<$Res> {
+  __$SnCloudFileIndexCopyWithImpl(this._self, this._then);
+
+  final _SnCloudFileIndex _self;
+  final $Res Function(_SnCloudFileIndex) _then;
+
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? path = null,Object? fileId = null,Object? file = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+  return _then(_SnCloudFileIndex(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,path: null == path ? _self.path : path // ignore: cast_nullable_to_non_nullable
+as String,fileId: null == fileId ? _self.fileId : fileId // ignore: cast_nullable_to_non_nullable
+as String,file: null == file ? _self.file : file // ignore: cast_nullable_to_non_nullable
+as SnCloudFile,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res> get file {
+  
+  return $SnCloudFileCopyWith<$Res>(_self.file, (value) {
+    return _then(_self.copyWith(file: value));
+  });
+}
+}
+
 // dart format on
--- a/lib/models/file.g.dart
+++ b/lib/models/file.g.dart
@@ -78,3 +78,28 @@ Map<String, dynamic> _$SnCloudFileToJson(_SnCloudFile instance) =>
      'updated_at': instance.updatedAt.toIso8601String(),
      'deleted_at': instance.deletedAt?.toIso8601String(),
    };
+
+_SnCloudFileIndex _$SnCloudFileIndexFromJson(Map<String, dynamic> json) =>
+    _SnCloudFileIndex(
+      id: json['id'] as String,
+      path: json['path'] as String,
+      fileId: json['file_id'] as String,
+      file: SnCloudFile.fromJson(json['file'] 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> _$SnCloudFileIndexToJson(_SnCloudFileIndex instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'path': instance.path,
+      'file_id': instance.fileId,
+      'file': instance.file.toJson(),
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };
--- a/lib/models/file_list_item.dart
+++ b/lib/models/file_list_item.dart
@@ -0,0 +1,12 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/file.dart';
+
+part 'file_list_item.freezed.dart';
+
+@freezed
+sealed class FileListItem with _$FileListItem {
+  const factory FileListItem.file(SnCloudFileIndex fileIndex) = FileItem;
+  const factory FileListItem.folder(String folderName) = FolderItem;
+  const factory FileListItem.unindexedFile(SnCloudFile file) =
+      UnindexedFileItem;
+}
--- a/lib/models/file_list_item.freezed.dart
+++ b/lib/models/file_list_item.freezed.dart
@@ -0,0 +1,396 @@
+// 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_list_item.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+/// @nodoc
+mixin _$FileListItem {
+
+
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is FileListItem);
+}
+
+
+@override
+int get hashCode => runtimeType.hashCode;
+
+@override
+String toString() {
+  return 'FileListItem()';
+}
+
+
+}
+
+/// @nodoc
+class $FileListItemCopyWith<$Res>  {
+$FileListItemCopyWith(FileListItem _, $Res Function(FileListItem) __);
+}
+
+
+/// Adds pattern-matching-related methods to [FileListItem].
+extension FileListItemPatterns on FileListItem {
+/// 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( FileItem value)?  file,TResult Function( FolderItem value)?  folder,TResult Function( UnindexedFileItem value)?  unindexedFile,required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case FileItem() when file != null:
+return file(_that);case FolderItem() when folder != null:
+return folder(_that);case UnindexedFileItem() when unindexedFile != null:
+return unindexedFile(_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?>({required TResult Function( FileItem value)  file,required TResult Function( FolderItem value)  folder,required TResult Function( UnindexedFileItem value)  unindexedFile,}){
+final _that = this;
+switch (_that) {
+case FileItem():
+return file(_that);case FolderItem():
+return folder(_that);case UnindexedFileItem():
+return unindexedFile(_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( FileItem value)?  file,TResult? Function( FolderItem value)?  folder,TResult? Function( UnindexedFileItem value)?  unindexedFile,}){
+final _that = this;
+switch (_that) {
+case FileItem() when file != null:
+return file(_that);case FolderItem() when folder != null:
+return folder(_that);case UnindexedFileItem() when unindexedFile != null:
+return unindexedFile(_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( SnCloudFileIndex fileIndex)?  file,TResult Function( String folderName)?  folder,TResult Function( SnCloudFile file)?  unindexedFile,required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case FileItem() when file != null:
+return file(_that.fileIndex);case FolderItem() when folder != null:
+return folder(_that.folderName);case UnindexedFileItem() when unindexedFile != null:
+return unindexedFile(_that.file);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?>({required TResult Function( SnCloudFileIndex fileIndex)  file,required TResult Function( String folderName)  folder,required TResult Function( SnCloudFile file)  unindexedFile,}) {final _that = this;
+switch (_that) {
+case FileItem():
+return file(_that.fileIndex);case FolderItem():
+return folder(_that.folderName);case UnindexedFileItem():
+return unindexedFile(_that.file);}
+}
+/// 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( SnCloudFileIndex fileIndex)?  file,TResult? Function( String folderName)?  folder,TResult? Function( SnCloudFile file)?  unindexedFile,}) {final _that = this;
+switch (_that) {
+case FileItem() when file != null:
+return file(_that.fileIndex);case FolderItem() when folder != null:
+return folder(_that.folderName);case UnindexedFileItem() when unindexedFile != null:
+return unindexedFile(_that.file);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class FileItem implements FileListItem {
+  const FileItem(this.fileIndex);
+  
+
+ final  SnCloudFileIndex fileIndex;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$FileItemCopyWith<FileItem> get copyWith => _$FileItemCopyWithImpl<FileItem>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is FileItem&&(identical(other.fileIndex, fileIndex) || other.fileIndex == fileIndex));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,fileIndex);
+
+@override
+String toString() {
+  return 'FileListItem.file(fileIndex: $fileIndex)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $FileItemCopyWith<$Res> implements $FileListItemCopyWith<$Res> {
+  factory $FileItemCopyWith(FileItem value, $Res Function(FileItem) _then) = _$FileItemCopyWithImpl;
+@useResult
+$Res call({
+ SnCloudFileIndex fileIndex
+});
+
+
+$SnCloudFileIndexCopyWith<$Res> get fileIndex;
+
+}
+/// @nodoc
+class _$FileItemCopyWithImpl<$Res>
+    implements $FileItemCopyWith<$Res> {
+  _$FileItemCopyWithImpl(this._self, this._then);
+
+  final FileItem _self;
+  final $Res Function(FileItem) _then;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') $Res call({Object? fileIndex = null,}) {
+  return _then(FileItem(
+null == fileIndex ? _self.fileIndex : fileIndex // ignore: cast_nullable_to_non_nullable
+as SnCloudFileIndex,
+  ));
+}
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileIndexCopyWith<$Res> get fileIndex {
+  
+  return $SnCloudFileIndexCopyWith<$Res>(_self.fileIndex, (value) {
+    return _then(_self.copyWith(fileIndex: value));
+  });
+}
+}
+
+/// @nodoc
+
+
+class FolderItem implements FileListItem {
+  const FolderItem(this.folderName);
+  
+
+ final  String folderName;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$FolderItemCopyWith<FolderItem> get copyWith => _$FolderItemCopyWithImpl<FolderItem>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is FolderItem&&(identical(other.folderName, folderName) || other.folderName == folderName));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,folderName);
+
+@override
+String toString() {
+  return 'FileListItem.folder(folderName: $folderName)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $FolderItemCopyWith<$Res> implements $FileListItemCopyWith<$Res> {
+  factory $FolderItemCopyWith(FolderItem value, $Res Function(FolderItem) _then) = _$FolderItemCopyWithImpl;
+@useResult
+$Res call({
+ String folderName
+});
+
+
+
+
+}
+/// @nodoc
+class _$FolderItemCopyWithImpl<$Res>
+    implements $FolderItemCopyWith<$Res> {
+  _$FolderItemCopyWithImpl(this._self, this._then);
+
+  final FolderItem _self;
+  final $Res Function(FolderItem) _then;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') $Res call({Object? folderName = null,}) {
+  return _then(FolderItem(
+null == folderName ? _self.folderName : folderName // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+
+}
+
+/// @nodoc
+
+
+class UnindexedFileItem implements FileListItem {
+  const UnindexedFileItem(this.file);
+  
+
+ final  SnCloudFile file;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$UnindexedFileItemCopyWith<UnindexedFileItem> get copyWith => _$UnindexedFileItemCopyWithImpl<UnindexedFileItem>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is UnindexedFileItem&&(identical(other.file, file) || other.file == file));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,file);
+
+@override
+String toString() {
+  return 'FileListItem.unindexedFile(file: $file)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $UnindexedFileItemCopyWith<$Res> implements $FileListItemCopyWith<$Res> {
+  factory $UnindexedFileItemCopyWith(UnindexedFileItem value, $Res Function(UnindexedFileItem) _then) = _$UnindexedFileItemCopyWithImpl;
+@useResult
+$Res call({
+ SnCloudFile file
+});
+
+
+$SnCloudFileCopyWith<$Res> get file;
+
+}
+/// @nodoc
+class _$UnindexedFileItemCopyWithImpl<$Res>
+    implements $UnindexedFileItemCopyWith<$Res> {
+  _$UnindexedFileItemCopyWithImpl(this._self, this._then);
+
+  final UnindexedFileItem _self;
+  final $Res Function(UnindexedFileItem) _then;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') $Res call({Object? file = null,}) {
+  return _then(UnindexedFileItem(
+null == file ? _self.file : file // ignore: cast_nullable_to_non_nullable
+as SnCloudFile,
+  ));
+}
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res> get file {
+  
+  return $SnCloudFileCopyWith<$Res>(_self.file, (value) {
+    return _then(_self.copyWith(file: value));
+  });
+}
+}
+
+// dart format on
--- a/lib/models/folder.dart
+++ b/lib/models/folder.dart
@@ -0,0 +1,19 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'folder.freezed.dart';
+part 'folder.g.dart';
+
+@freezed
+sealed class SnCloudFolder with _$SnCloudFolder {
+  const factory SnCloudFolder({
+    required String id,
+    required String name,
+    required String? parentFolderId,
+    required String accountId,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+  }) = _SnCloudFolder;
+
+  factory SnCloudFolder.fromJson(Map<String, dynamic> json) =>
+      _$SnCloudFolderFromJson(json);
+}
--- a/lib/models/folder.freezed.dart
+++ b/lib/models/folder.freezed.dart
@@ -0,0 +1,286 @@
+// 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 'folder.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnCloudFolder {
+
+ String get id; String get name; String? get parentFolderId; String get accountId; DateTime get createdAt; DateTime get updatedAt;
+/// Create a copy of SnCloudFolder
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnCloudFolderCopyWith<SnCloudFolder> get copyWith => _$SnCloudFolderCopyWithImpl<SnCloudFolder>(this as SnCloudFolder, _$identity);
+
+  /// Serializes this SnCloudFolder to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnCloudFolder&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.parentFolderId, parentFolderId) || other.parentFolderId == parentFolderId)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,name,parentFolderId,accountId,createdAt,updatedAt);
+
+@override
+String toString() {
+  return 'SnCloudFolder(id: $id, name: $name, parentFolderId: $parentFolderId, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnCloudFolderCopyWith<$Res>  {
+  factory $SnCloudFolderCopyWith(SnCloudFolder value, $Res Function(SnCloudFolder) _then) = _$SnCloudFolderCopyWithImpl;
+@useResult
+$Res call({
+ String id, String name, String? parentFolderId, String accountId, DateTime createdAt, DateTime updatedAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnCloudFolderCopyWithImpl<$Res>
+    implements $SnCloudFolderCopyWith<$Res> {
+  _$SnCloudFolderCopyWithImpl(this._self, this._then);
+
+  final SnCloudFolder _self;
+  final $Res Function(SnCloudFolder) _then;
+
+/// Create a copy of SnCloudFolder
+/// 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? parentFolderId = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,}) {
+  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,parentFolderId: freezed == parentFolderId ? _self.parentFolderId : parentFolderId // ignore: cast_nullable_to_non_nullable
+as String?,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
+as DateTime,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnCloudFolder].
+extension SnCloudFolderPatterns on SnCloudFolder {
+/// 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( _SnCloudFolder value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnCloudFolder() 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( _SnCloudFolder value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnCloudFolder():
+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( _SnCloudFolder value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnCloudFolder() 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? parentFolderId,  String accountId,  DateTime createdAt,  DateTime updatedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnCloudFolder() when $default != null:
+return $default(_that.id,_that.name,_that.parentFolderId,_that.accountId,_that.createdAt,_that.updatedAt);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? parentFolderId,  String accountId,  DateTime createdAt,  DateTime updatedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnCloudFolder():
+return $default(_that.id,_that.name,_that.parentFolderId,_that.accountId,_that.createdAt,_that.updatedAt);}
+}
+/// 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? parentFolderId,  String accountId,  DateTime createdAt,  DateTime updatedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnCloudFolder() when $default != null:
+return $default(_that.id,_that.name,_that.parentFolderId,_that.accountId,_that.createdAt,_that.updatedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnCloudFolder implements SnCloudFolder {
+  const _SnCloudFolder({required this.id, required this.name, required this.parentFolderId, required this.accountId, required this.createdAt, required this.updatedAt});
+  factory _SnCloudFolder.fromJson(Map<String, dynamic> json) => _$SnCloudFolderFromJson(json);
+
+@override final  String id;
+@override final  String name;
+@override final  String? parentFolderId;
+@override final  String accountId;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+
+/// Create a copy of SnCloudFolder
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnCloudFolderCopyWith<_SnCloudFolder> get copyWith => __$SnCloudFolderCopyWithImpl<_SnCloudFolder>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnCloudFolderToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnCloudFolder&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.parentFolderId, parentFolderId) || other.parentFolderId == parentFolderId)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,name,parentFolderId,accountId,createdAt,updatedAt);
+
+@override
+String toString() {
+  return 'SnCloudFolder(id: $id, name: $name, parentFolderId: $parentFolderId, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnCloudFolderCopyWith<$Res> implements $SnCloudFolderCopyWith<$Res> {
+  factory _$SnCloudFolderCopyWith(_SnCloudFolder value, $Res Function(_SnCloudFolder) _then) = __$SnCloudFolderCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String name, String? parentFolderId, String accountId, DateTime createdAt, DateTime updatedAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnCloudFolderCopyWithImpl<$Res>
+    implements _$SnCloudFolderCopyWith<$Res> {
+  __$SnCloudFolderCopyWithImpl(this._self, this._then);
+
+  final _SnCloudFolder _self;
+  final $Res Function(_SnCloudFolder) _then;
+
+/// Create a copy of SnCloudFolder
+/// 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? parentFolderId = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,}) {
+  return _then(_SnCloudFolder(
+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,parentFolderId: freezed == parentFolderId ? _self.parentFolderId : parentFolderId // ignore: cast_nullable_to_non_nullable
+as String?,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
+as DateTime,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/lib/models/folder.g.dart
+++ b/lib/models/folder.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'folder.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnCloudFolder _$SnCloudFolderFromJson(Map<String, dynamic> json) =>
+    _SnCloudFolder(
+      id: json['id'] as String,
+      name: json['name'] as String,
+      parentFolderId: json['parent_folder_id'] as String?,
+      accountId: json['account_id'] as String,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+    );
+
+Map<String, dynamic> _$SnCloudFolderToJson(_SnCloudFolder instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'parent_folder_id': instance.parentFolderId,
+      'account_id': instance.accountId,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+    };
--- a/lib/models/poll.dart
+++ b/lib/models/poll.dart
@@ -8,7 +8,7 @@ part 'poll.g.dart';
@freezed
 sealed class SnPollWithStats with _$SnPollWithStats {
  const factory SnPollWithStats({
-    required Map<String, dynamic>? userAnswer,
+    required SnPollAnswer? userAnswer,
    @Default({}) Map<String, dynamic> stats,
    required String id,
    required List<SnPollQuestion> questions,
@@ -46,6 +46,18 @@ sealed class SnPoll with _$SnPoll {
  }) = _SnPoll;

  factory SnPoll.fromJson(Map<String, dynamic> json) => _$SnPollFromJson(json);
+
+  factory SnPoll.fromPollWithStats(SnPollWithStats pollWithStats) => SnPoll(
+    id: pollWithStats.id,
+    questions: pollWithStats.questions,
+    title: pollWithStats.title,
+    description: pollWithStats.description,
+    endedAt: pollWithStats.endedAt,
+    publisherId: pollWithStats.publisherId,
+    createdAt: pollWithStats.createdAt,
+    updatedAt: pollWithStats.updatedAt,
+    deletedAt: pollWithStats.deletedAt,
+  );
 }

@freezed
--- a/lib/models/poll.freezed.dart
+++ b/lib/models/poll.freezed.dart
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnPollWithStats {

- Map<String, dynamic>? get userAnswer; Map<String, dynamic> get stats; String get id; List<SnPollQuestion> get questions; String? get title; String? get description; DateTime? get endedAt; String get publisherId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ SnPollAnswer? get userAnswer; Map<String, dynamic> get stats; String get id; List<SnPollQuestion> get questions; String? get title; String? get description; DateTime? get endedAt; String get publisherId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnPollWithStats
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,12 +28,12 @@ $SnPollWithStatsCopyWith<SnPollWithStats> get copyWith => _$SnPollWithStatsCopyW

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPollWithStats&&const DeepCollectionEquality().equals(other.userAnswer, userAnswer)&&const DeepCollectionEquality().equals(other.stats, stats)&&(identical(other.id, id) || other.id == id)&&const DeepCollectionEquality().equals(other.questions, questions)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.endedAt, endedAt) || other.endedAt == endedAt)&&(identical(other.publisherId, publisherId) || other.publisherId == publisherId)&&(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 SnPollWithStats&&(identical(other.userAnswer, userAnswer) || other.userAnswer == userAnswer)&&const DeepCollectionEquality().equals(other.stats, stats)&&(identical(other.id, id) || other.id == id)&&const DeepCollectionEquality().equals(other.questions, questions)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.endedAt, endedAt) || other.endedAt == endedAt)&&(identical(other.publisherId, publisherId) || other.publisherId == publisherId)&&(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,const DeepCollectionEquality().hash(userAnswer),const DeepCollectionEquality().hash(stats),id,const DeepCollectionEquality().hash(questions),title,description,endedAt,publisherId,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,userAnswer,const DeepCollectionEquality().hash(stats),id,const DeepCollectionEquality().hash(questions),title,description,endedAt,publisherId,createdAt,updatedAt,deletedAt);

@override
 String toString() {
@@ -48,11 +48,11 @@ abstract mixin class $SnPollWithStatsCopyWith<$Res>  {
  factory $SnPollWithStatsCopyWith(SnPollWithStats value, $Res Function(SnPollWithStats) _then) = _$SnPollWithStatsCopyWithImpl;
@useResult
 $Res call({
- Map<String, dynamic>? userAnswer, Map<String, dynamic> stats, String id, List<SnPollQuestion> questions, String? title, String? description, DateTime? endedAt, String publisherId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ SnPollAnswer? userAnswer, Map<String, dynamic> stats, String id, List<SnPollQuestion> questions, String? title, String? description, DateTime? endedAt, String publisherId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });


-
+$SnPollAnswerCopyWith<$Res>? get userAnswer;

 }
 /// @nodoc
@@ -68,7 +68,7 @@ class _$SnPollWithStatsCopyWithImpl<$Res>
@pragma('vm:prefer-inline') @override $Res call({Object? userAnswer = freezed,Object? stats = null,Object? id = null,Object? questions = null,Object? title = freezed,Object? description = freezed,Object? endedAt = freezed,Object? publisherId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_self.copyWith(
 userAnswer: freezed == userAnswer ? _self.userAnswer : userAnswer // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>?,stats: null == stats ? _self.stats : stats // ignore: cast_nullable_to_non_nullable
+as SnPollAnswer?,stats: null == stats ? _self.stats : stats // ignore: cast_nullable_to_non_nullable
 as Map<String, dynamic>,id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,questions: null == questions ? _self.questions : questions // ignore: cast_nullable_to_non_nullable
 as List<SnPollQuestion>,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
@@ -81,7 +81,19 @@ as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ign
 as DateTime?,
  ));
 }
+/// Create a copy of SnPollWithStats
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnPollAnswerCopyWith<$Res>? get userAnswer {
+    if (_self.userAnswer == null) {
+    return null;
+  }

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


@@ -160,7 +172,7 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( Map<String, dynamic>? userAnswer,  Map<String, dynamic> stats,  String id,  List<SnPollQuestion> questions,  String? title,  String? description,  DateTime? endedAt,  String publisherId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( SnPollAnswer? userAnswer,  Map<String, dynamic> stats,  String id,  List<SnPollQuestion> questions,  String? title,  String? description,  DateTime? endedAt,  String publisherId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnPollWithStats() when $default != null:
 return $default(_that.userAnswer,_that.stats,_that.id,_that.questions,_that.title,_that.description,_that.endedAt,_that.publisherId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -181,7 +193,7 @@ return $default(_that.userAnswer,_that.stats,_that.id,_that.questions,_that.titl
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( Map<String, dynamic>? userAnswer,  Map<String, dynamic> stats,  String id,  List<SnPollQuestion> questions,  String? title,  String? description,  DateTime? endedAt,  String publisherId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( SnPollAnswer? userAnswer,  Map<String, dynamic> stats,  String id,  List<SnPollQuestion> questions,  String? title,  String? description,  DateTime? endedAt,  String publisherId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnPollWithStats():
 return $default(_that.userAnswer,_that.stats,_that.id,_that.questions,_that.title,_that.description,_that.endedAt,_that.publisherId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
@@ -198,7 +210,7 @@ return $default(_that.userAnswer,_that.stats,_that.id,_that.questions,_that.titl
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( Map<String, dynamic>? userAnswer,  Map<String, dynamic> stats,  String id,  List<SnPollQuestion> questions,  String? title,  String? description,  DateTime? endedAt,  String publisherId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( SnPollAnswer? userAnswer,  Map<String, dynamic> stats,  String id,  List<SnPollQuestion> questions,  String? title,  String? description,  DateTime? endedAt,  String publisherId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnPollWithStats() when $default != null:
 return $default(_that.userAnswer,_that.stats,_that.id,_that.questions,_that.title,_that.description,_that.endedAt,_that.publisherId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -213,18 +225,10 @@ return $default(_that.userAnswer,_that.stats,_that.id,_that.questions,_that.titl
@JsonSerializable()

 class _SnPollWithStats implements SnPollWithStats {
-  const _SnPollWithStats({required final  Map<String, dynamic>? userAnswer, final  Map<String, dynamic> stats = const {}, required this.id, required final  List<SnPollQuestion> questions, this.title, this.description, this.endedAt, required this.publisherId, required this.createdAt, required this.updatedAt, this.deletedAt}): _userAnswer = userAnswer,_stats = stats,_questions = questions;
+  const _SnPollWithStats({required this.userAnswer, final  Map<String, dynamic> stats = const {}, required this.id, required final  List<SnPollQuestion> questions, this.title, this.description, this.endedAt, required this.publisherId, required this.createdAt, required this.updatedAt, this.deletedAt}): _stats = stats,_questions = questions;
  factory _SnPollWithStats.fromJson(Map<String, dynamic> json) => _$SnPollWithStatsFromJson(json);

- final  Map<String, dynamic>? _userAnswer;
-@override Map<String, dynamic>? get userAnswer {
-  final value = _userAnswer;
-  if (value == null) return null;
-  if (_userAnswer is EqualUnmodifiableMapView) return _userAnswer;
-  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableMapView(value);
-}
-
+@override final  SnPollAnswer? userAnswer;
 final  Map<String, dynamic> _stats;
@override@JsonKey() Map<String, dynamic> get stats {
  if (_stats is EqualUnmodifiableMapView) return _stats;
@@ -261,12 +265,12 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPollWithStats&&const DeepCollectionEquality().equals(other._userAnswer, _userAnswer)&&const DeepCollectionEquality().equals(other._stats, _stats)&&(identical(other.id, id) || other.id == id)&&const DeepCollectionEquality().equals(other._questions, _questions)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.endedAt, endedAt) || other.endedAt == endedAt)&&(identical(other.publisherId, publisherId) || other.publisherId == publisherId)&&(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 _SnPollWithStats&&(identical(other.userAnswer, userAnswer) || other.userAnswer == userAnswer)&&const DeepCollectionEquality().equals(other._stats, _stats)&&(identical(other.id, id) || other.id == id)&&const DeepCollectionEquality().equals(other._questions, _questions)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.endedAt, endedAt) || other.endedAt == endedAt)&&(identical(other.publisherId, publisherId) || other.publisherId == publisherId)&&(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,const DeepCollectionEquality().hash(_userAnswer),const DeepCollectionEquality().hash(_stats),id,const DeepCollectionEquality().hash(_questions),title,description,endedAt,publisherId,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,userAnswer,const DeepCollectionEquality().hash(_stats),id,const DeepCollectionEquality().hash(_questions),title,description,endedAt,publisherId,createdAt,updatedAt,deletedAt);

@override
 String toString() {
@@ -281,11 +285,11 @@ abstract mixin class _$SnPollWithStatsCopyWith<$Res> implements $SnPollWithStats
  factory _$SnPollWithStatsCopyWith(_SnPollWithStats value, $Res Function(_SnPollWithStats) _then) = __$SnPollWithStatsCopyWithImpl;
@override @useResult
 $Res call({
- Map<String, dynamic>? userAnswer, Map<String, dynamic> stats, String id, List<SnPollQuestion> questions, String? title, String? description, DateTime? endedAt, String publisherId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ SnPollAnswer? userAnswer, Map<String, dynamic> stats, String id, List<SnPollQuestion> questions, String? title, String? description, DateTime? endedAt, String publisherId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });


-
+@override $SnPollAnswerCopyWith<$Res>? get userAnswer;

 }
 /// @nodoc
@@ -300,8 +304,8 @@ class __$SnPollWithStatsCopyWithImpl<$Res>
 /// with the given fields replaced by the non-null parameter values.
@override @pragma('vm:prefer-inline') $Res call({Object? userAnswer = freezed,Object? stats = null,Object? id = null,Object? questions = null,Object? title = freezed,Object? description = freezed,Object? endedAt = freezed,Object? publisherId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_SnPollWithStats(
-userAnswer: freezed == userAnswer ? _self._userAnswer : userAnswer // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>?,stats: null == stats ? _self._stats : stats // ignore: cast_nullable_to_non_nullable
+userAnswer: freezed == userAnswer ? _self.userAnswer : userAnswer // ignore: cast_nullable_to_non_nullable
+as SnPollAnswer?,stats: null == stats ? _self._stats : stats // ignore: cast_nullable_to_non_nullable
 as Map<String, dynamic>,id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,questions: null == questions ? _self._questions : questions // ignore: cast_nullable_to_non_nullable
 as List<SnPollQuestion>,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
@@ -315,7 +319,19 @@ as DateTime?,
  ));
 }

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

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


--- a/lib/models/poll.g.dart
+++ b/lib/models/poll.g.dart
@@ -8,7 +8,12 @@ part of 'poll.dart';

 _SnPollWithStats _$SnPollWithStatsFromJson(Map<String, dynamic> json) =>
    _SnPollWithStats(
-      userAnswer: json['user_answer'] as Map<String, dynamic>?,
+      userAnswer:
+          json['user_answer'] == null
+              ? null
+              : SnPollAnswer.fromJson(
+                json['user_answer'] as Map<String, dynamic>,
+              ),
      stats: json['stats'] as Map<String, dynamic>? ?? const {},
      id: json['id'] as String,
      questions:
@@ -32,7 +37,7 @@ _SnPollWithStats _$SnPollWithStatsFromJson(Map<String, dynamic> json) =>

 Map<String, dynamic> _$SnPollWithStatsToJson(_SnPollWithStats instance) =>
    <String, dynamic>{
-      'user_answer': instance.userAnswer,
+      'user_answer': instance.userAnswer?.toJson(),
      'stats': instance.stats,
      'id': instance.id,
      'questions': instance.questions.map((e) => e.toJson()).toList(),
--- a/lib/models/thought.dart
+++ b/lib/models/thought.dart
@@ -38,6 +38,31 @@ class ThinkingChunkTypeConverter
  int toJson(ThinkingChunkType object) => object.value;
 }

+enum ThinkingMessagePartType {
+  text(0),
+  functionCall(1),
+  functionResult(2);
+
+  const ThinkingMessagePartType(this.value);
+  final int value;
+
+  static ThinkingMessagePartType fromValue(int value) {
+    return values.firstWhere((e) => e.value == value, orElse: () => text);
+  }
+}
+
+class ThinkingMessagePartTypeConverter
+    implements JsonConverter<ThinkingMessagePartType, int> {
+  const ThinkingMessagePartTypeConverter();
+
+  @override
+  ThinkingMessagePartType fromJson(int json) =>
+      ThinkingMessagePartType.fromValue(json);
+
+  @override
+  int toJson(ThinkingMessagePartType object) => object.value;
+}
+
@freezed
 sealed class StreamThinkingRequest with _$StreamThinkingRequest {
  const factory StreamThinkingRequest({
@@ -46,6 +71,7 @@ sealed class StreamThinkingRequest with _$StreamThinkingRequest {
    @Default([]) List<String> accpetProposals,
    List<String>? attachedPosts,
    List<Map<String, dynamic>>? attachedMessages,
+    @JsonKey(name: 'service_id') String? serviceId,
  }) = _StreamThinkingRequest;

  factory StreamThinkingRequest.fromJson(Map<String, dynamic> json) =>
@@ -77,6 +103,43 @@ sealed class SnThinkingChunk with _$SnThinkingChunk {
      _$SnThinkingChunkFromJson(json);
 }

+@freezed
+sealed class SnFunctionCall with _$SnFunctionCall {
+  const factory SnFunctionCall({
+    required String id,
+    required String name,
+    required String arguments,
+  }) = _SnFunctionCall;
+
+  factory SnFunctionCall.fromJson(Map<String, dynamic> json) =>
+      _$SnFunctionCallFromJson(json);
+}
+
+@freezed
+sealed class SnFunctionResult with _$SnFunctionResult {
+  const factory SnFunctionResult({
+    required String callId,
+    required dynamic result,
+    required bool isError,
+  }) = _SnFunctionResult;
+
+  factory SnFunctionResult.fromJson(Map<String, dynamic> json) =>
+      _$SnFunctionResultFromJson(json);
+}
+
+@freezed
+sealed class SnThinkingMessagePart with _$SnThinkingMessagePart {
+  const factory SnThinkingMessagePart({
+    @ThinkingMessagePartTypeConverter() required ThinkingMessagePartType type,
+    String? text,
+    SnFunctionCall? functionCall,
+    SnFunctionResult? functionResult,
+  }) = _SnThinkingMessagePart;
+
+  factory SnThinkingMessagePart.fromJson(Map<String, dynamic> json) =>
+      _$SnThinkingMessagePartFromJson(json);
+}
+
@freezed
 sealed class SnThinkingSequence with _$SnThinkingSequence {
  const factory SnThinkingSequence({
@@ -98,9 +161,8 @@ sealed class SnThinkingSequence with _$SnThinkingSequence {
 sealed class SnThinkingThought with _$SnThinkingThought {
  const factory SnThinkingThought({
    required String id,
-    String? content,
+    @Default([]) List<SnThinkingMessagePart> parts,
    @Default([]) List<SnCloudFile> files,
-    @Default([]) List<SnThinkingChunk> chunks,
    @ThinkingThoughtRoleConverter() required ThinkingThoughtRole role,
    int? tokenCount,
    String? modelName,
@@ -114,3 +176,26 @@ sealed class SnThinkingThought with _$SnThinkingThought {
  factory SnThinkingThought.fromJson(Map<String, dynamic> json) =>
      _$SnThinkingThoughtFromJson(json);
 }
+
+@freezed
+sealed class ThoughtService with _$ThoughtService {
+  const factory ThoughtService({
+    @JsonKey(name: 'service_id') required String serviceId,
+    required double billingMultiplier,
+    required int perkLevel,
+  }) = _ThoughtService;
+
+  factory ThoughtService.fromJson(Map<String, dynamic> json) =>
+      _$ThoughtServiceFromJson(json);
+}
+
+@freezed
+sealed class ThoughtServicesResponse with _$ThoughtServicesResponse {
+  const factory ThoughtServicesResponse({
+    @JsonKey(name: 'default_service') required String defaultService,
+    required List<ThoughtService> services,
+  }) = _ThoughtServicesResponse;
+
+  factory ThoughtServicesResponse.fromJson(Map<String, dynamic> json) =>
+      _$ThoughtServicesResponseFromJson(json);
+}
--- a/lib/models/thought.freezed.dart
+++ b/lib/models/thought.freezed.dart
--- a/lib/models/thought.g.dart
+++ b/lib/models/thought.g.dart
@@ -24,6 +24,7 @@ _StreamThinkingRequest _$StreamThinkingRequestFromJson(
      (json['attached_messages'] as List<dynamic>?)
          ?.map((e) => e as Map<String, dynamic>)
          .toList(),
+  serviceId: json['service_id'] as String?,
 );

 Map<String, dynamic> _$StreamThinkingRequestToJson(
@@ -34,6 +35,7 @@ Map<String, dynamic> _$StreamThinkingRequestToJson(
  'accpet_proposals': instance.accpetProposals,
  'attached_posts': instance.attachedPosts,
  'attached_messages': instance.attachedMessages,
+  'service_id': instance.serviceId,
 };

 _SnThinkingChunk _$SnThinkingChunkFromJson(Map<String, dynamic> json) =>
@@ -50,6 +52,64 @@ Map<String, dynamic> _$SnThinkingChunkToJson(_SnThinkingChunk instance) =>
      'data': instance.data,
    };

+_SnFunctionCall _$SnFunctionCallFromJson(Map<String, dynamic> json) =>
+    _SnFunctionCall(
+      id: json['id'] as String,
+      name: json['name'] as String,
+      arguments: json['arguments'] as String,
+    );
+
+Map<String, dynamic> _$SnFunctionCallToJson(_SnFunctionCall instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'arguments': instance.arguments,
+    };
+
+_SnFunctionResult _$SnFunctionResultFromJson(Map<String, dynamic> json) =>
+    _SnFunctionResult(
+      callId: json['call_id'] as String,
+      result: json['result'],
+      isError: json['is_error'] as bool,
+    );
+
+Map<String, dynamic> _$SnFunctionResultToJson(_SnFunctionResult instance) =>
+    <String, dynamic>{
+      'call_id': instance.callId,
+      'result': instance.result,
+      'is_error': instance.isError,
+    };
+
+_SnThinkingMessagePart _$SnThinkingMessagePartFromJson(
+  Map<String, dynamic> json,
+) => _SnThinkingMessagePart(
+  type: const ThinkingMessagePartTypeConverter().fromJson(
+    (json['type'] as num).toInt(),
+  ),
+  text: json['text'] as String?,
+  functionCall:
+      json['function_call'] == null
+          ? null
+          : SnFunctionCall.fromJson(
+            json['function_call'] as Map<String, dynamic>,
+          ),
+  functionResult:
+      json['function_result'] == null
+          ? null
+          : SnFunctionResult.fromJson(
+            json['function_result'] as Map<String, dynamic>,
+          ),
+);
+
+Map<String, dynamic> _$SnThinkingMessagePartToJson(
+  _SnThinkingMessagePart instance,
+) => <String, dynamic>{
+  'type': const ThinkingMessagePartTypeConverter().toJson(instance.type),
+  'text': instance.text,
+  'function_call': instance.functionCall?.toJson(),
+  'function_result': instance.functionResult?.toJson(),
+};
+
 _SnThinkingSequence _$SnThinkingSequenceFromJson(Map<String, dynamic> json) =>
    _SnThinkingSequence(
      id: json['id'] as String,
@@ -80,17 +140,19 @@ Map<String, dynamic> _$SnThinkingSequenceToJson(_SnThinkingSequence instance) =>
 _SnThinkingThought _$SnThinkingThoughtFromJson(Map<String, dynamic> json) =>
    _SnThinkingThought(
      id: json['id'] as String,
-      content: json['content'] as String?,
+      parts:
+          (json['parts'] as List<dynamic>?)
+              ?.map(
+                (e) =>
+                    SnThinkingMessagePart.fromJson(e as Map<String, dynamic>),
+              )
+              .toList() ??
+          const [],
      files:
          (json['files'] as List<dynamic>?)
              ?.map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
              .toList() ??
          const [],
-      chunks:
-          (json['chunks'] as List<dynamic>?)
-              ?.map((e) => SnThinkingChunk.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
      role: const ThinkingThoughtRoleConverter().fromJson(
        (json['role'] as num).toInt(),
      ),
@@ -114,9 +176,8 @@ _SnThinkingThought _$SnThinkingThoughtFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$SnThinkingThoughtToJson(_SnThinkingThought instance) =>
    <String, dynamic>{
      'id': instance.id,
-      'content': instance.content,
+      'parts': instance.parts.map((e) => e.toJson()).toList(),
      'files': instance.files.map((e) => e.toJson()).toList(),
-      'chunks': instance.chunks.map((e) => e.toJson()).toList(),
      'role': const ThinkingThoughtRoleConverter().toJson(instance.role),
      'token_count': instance.tokenCount,
      'model_name': instance.modelName,
@@ -126,3 +187,34 @@ Map<String, dynamic> _$SnThinkingThoughtToJson(_SnThinkingThought instance) =>
      'updated_at': instance.updatedAt.toIso8601String(),
      'deleted_at': instance.deletedAt?.toIso8601String(),
    };
+
+_ThoughtService _$ThoughtServiceFromJson(Map<String, dynamic> json) =>
+    _ThoughtService(
+      serviceId: json['service_id'] as String,
+      billingMultiplier: (json['billing_multiplier'] as num).toDouble(),
+      perkLevel: (json['perk_level'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$ThoughtServiceToJson(_ThoughtService instance) =>
+    <String, dynamic>{
+      'service_id': instance.serviceId,
+      'billing_multiplier': instance.billingMultiplier,
+      'perk_level': instance.perkLevel,
+    };
+
+_ThoughtServicesResponse _$ThoughtServicesResponseFromJson(
+  Map<String, dynamic> json,
+) => _ThoughtServicesResponse(
+  defaultService: json['default_service'] as String,
+  services:
+      (json['services'] as List<dynamic>)
+          .map((e) => ThoughtService.fromJson(e as Map<String, dynamic>))
+          .toList(),
+);
+
+Map<String, dynamic> _$ThoughtServicesResponseToJson(
+  _ThoughtServicesResponse instance,
+) => <String, dynamic>{
+  'default_service': instance.defaultService,
+  'services': instance.services.map((e) => e.toJson()).toList(),
+};
--- a/lib/models/wallet.dart
+++ b/lib/models/wallet.dart
@@ -176,6 +176,8 @@ sealed class SnWalletFund with _$SnWalletFund {
    required String id,
    required String currency,
    required double totalAmount,
+    required double remainingAmount,
+    required int amountOfSplits,
    required int splitType, // 0: even, 1: random
    required int
    status, // 0: created, 1: partially claimed, 2: fully claimed, 3: expired
@@ -184,6 +186,7 @@ sealed class SnWalletFund with _$SnWalletFund {
    required SnAccount? creatorAccount,
    required DateTime expiredAt,
    required List<SnWalletFundRecipient> recipients,
+    required bool isOpen,
    required DateTime createdAt,
    required DateTime updatedAt,
    required DateTime? deletedAt,
--- a/lib/models/wallet.freezed.dart
+++ b/lib/models/wallet.freezed.dart
@@ -2553,9 +2553,9 @@ $SnWalletSubscriptionCopyWith<$Res>? get subscription {
 /// @nodoc
 mixin _$SnWalletFund {

- String get id; String get currency; double get totalAmount; int get splitType;// 0: even, 1: random
+ String get id; String get currency; double get totalAmount; double get remainingAmount; int get amountOfSplits; int get splitType;// 0: even, 1: random
 int get status;// 0: created, 1: partially claimed, 2: fully claimed, 3: expired
- String? get message; String get creatorAccountId; SnAccount? get creatorAccount; DateTime get expiredAt; List<SnWalletFundRecipient> get recipients; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String? get message; String get creatorAccountId; SnAccount? get creatorAccount; DateTime get expiredAt; List<SnWalletFundRecipient> get recipients; bool get isOpen; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnWalletFund
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -2568,16 +2568,16 @@ $SnWalletFundCopyWith<SnWalletFund> get copyWith => _$SnWalletFundCopyWithImpl<S

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnWalletFund&&(identical(other.id, id) || other.id == id)&&(identical(other.currency, currency) || other.currency == currency)&&(identical(other.totalAmount, totalAmount) || other.totalAmount == totalAmount)&&(identical(other.splitType, splitType) || other.splitType == splitType)&&(identical(other.status, status) || other.status == status)&&(identical(other.message, message) || other.message == message)&&(identical(other.creatorAccountId, creatorAccountId) || other.creatorAccountId == creatorAccountId)&&(identical(other.creatorAccount, creatorAccount) || other.creatorAccount == creatorAccount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&const DeepCollectionEquality().equals(other.recipients, recipients)&&(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 SnWalletFund&&(identical(other.id, id) || other.id == id)&&(identical(other.currency, currency) || other.currency == currency)&&(identical(other.totalAmount, totalAmount) || other.totalAmount == totalAmount)&&(identical(other.remainingAmount, remainingAmount) || other.remainingAmount == remainingAmount)&&(identical(other.amountOfSplits, amountOfSplits) || other.amountOfSplits == amountOfSplits)&&(identical(other.splitType, splitType) || other.splitType == splitType)&&(identical(other.status, status) || other.status == status)&&(identical(other.message, message) || other.message == message)&&(identical(other.creatorAccountId, creatorAccountId) || other.creatorAccountId == creatorAccountId)&&(identical(other.creatorAccount, creatorAccount) || other.creatorAccount == creatorAccount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&const DeepCollectionEquality().equals(other.recipients, recipients)&&(identical(other.isOpen, isOpen) || other.isOpen == isOpen)&&(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,currency,totalAmount,splitType,status,message,creatorAccountId,creatorAccount,expiredAt,const DeepCollectionEquality().hash(recipients),createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,currency,totalAmount,remainingAmount,amountOfSplits,splitType,status,message,creatorAccountId,creatorAccount,expiredAt,const DeepCollectionEquality().hash(recipients),isOpen,createdAt,updatedAt,deletedAt);

@override
 String toString() {
-  return 'SnWalletFund(id: $id, currency: $currency, totalAmount: $totalAmount, splitType: $splitType, status: $status, message: $message, creatorAccountId: $creatorAccountId, creatorAccount: $creatorAccount, expiredAt: $expiredAt, recipients: $recipients, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnWalletFund(id: $id, currency: $currency, totalAmount: $totalAmount, remainingAmount: $remainingAmount, amountOfSplits: $amountOfSplits, splitType: $splitType, status: $status, message: $message, creatorAccountId: $creatorAccountId, creatorAccount: $creatorAccount, expiredAt: $expiredAt, recipients: $recipients, isOpen: $isOpen, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }


@@ -2588,7 +2588,7 @@ abstract mixin class $SnWalletFundCopyWith<$Res>  {
  factory $SnWalletFundCopyWith(SnWalletFund value, $Res Function(SnWalletFund) _then) = _$SnWalletFundCopyWithImpl;
@useResult
 $Res call({
- String id, String currency, double totalAmount, int splitType, int status, String? message, String creatorAccountId, SnAccount? creatorAccount, DateTime expiredAt, List<SnWalletFundRecipient> recipients, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String currency, double totalAmount, double remainingAmount, int amountOfSplits, int splitType, int status, String? message, String creatorAccountId, SnAccount? creatorAccount, DateTime expiredAt, List<SnWalletFundRecipient> recipients, bool isOpen, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });


@@ -2605,19 +2605,22 @@ class _$SnWalletFundCopyWithImpl<$Res>

 /// Create a copy of SnWalletFund
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? currency = null,Object? totalAmount = null,Object? splitType = null,Object? status = null,Object? message = freezed,Object? creatorAccountId = null,Object? creatorAccount = freezed,Object? expiredAt = null,Object? recipients = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? currency = null,Object? totalAmount = null,Object? remainingAmount = null,Object? amountOfSplits = null,Object? splitType = null,Object? status = null,Object? message = freezed,Object? creatorAccountId = null,Object? creatorAccount = freezed,Object? expiredAt = null,Object? recipients = null,Object? isOpen = 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,currency: null == currency ? _self.currency : currency // ignore: cast_nullable_to_non_nullable
 as String,totalAmount: null == totalAmount ? _self.totalAmount : totalAmount // ignore: cast_nullable_to_non_nullable
-as double,splitType: null == splitType ? _self.splitType : splitType // ignore: cast_nullable_to_non_nullable
+as double,remainingAmount: null == remainingAmount ? _self.remainingAmount : remainingAmount // ignore: cast_nullable_to_non_nullable
+as double,amountOfSplits: null == amountOfSplits ? _self.amountOfSplits : amountOfSplits // ignore: cast_nullable_to_non_nullable
+as int,splitType: null == splitType ? _self.splitType : splitType // ignore: cast_nullable_to_non_nullable
 as int,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
 as int,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
 as String?,creatorAccountId: null == creatorAccountId ? _self.creatorAccountId : creatorAccountId // ignore: cast_nullable_to_non_nullable
 as String,creatorAccount: freezed == creatorAccount ? _self.creatorAccount : creatorAccount // ignore: cast_nullable_to_non_nullable
 as SnAccount?,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
 as DateTime,recipients: null == recipients ? _self.recipients : recipients // ignore: cast_nullable_to_non_nullable
-as List<SnWalletFundRecipient>,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as List<SnWalletFundRecipient>,isOpen: null == isOpen ? _self.isOpen : isOpen // ignore: cast_nullable_to_non_nullable
+as bool,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
@@ -2714,10 +2717,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String currency,  double totalAmount,  int splitType,  int status,  String? message,  String creatorAccountId,  SnAccount? creatorAccount,  DateTime expiredAt,  List<SnWalletFundRecipient> recipients,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String currency,  double totalAmount,  double remainingAmount,  int amountOfSplits,  int splitType,  int status,  String? message,  String creatorAccountId,  SnAccount? creatorAccount,  DateTime expiredAt,  List<SnWalletFundRecipient> recipients,  bool isOpen,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnWalletFund() when $default != null:
-return $default(_that.id,_that.currency,_that.totalAmount,_that.splitType,_that.status,_that.message,_that.creatorAccountId,_that.creatorAccount,_that.expiredAt,_that.recipients,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.currency,_that.totalAmount,_that.remainingAmount,_that.amountOfSplits,_that.splitType,_that.status,_that.message,_that.creatorAccountId,_that.creatorAccount,_that.expiredAt,_that.recipients,_that.isOpen,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
  return orElse();

 }
@@ -2735,10 +2738,10 @@ return $default(_that.id,_that.currency,_that.totalAmount,_that.splitType,_that.
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String currency,  double totalAmount,  int splitType,  int status,  String? message,  String creatorAccountId,  SnAccount? creatorAccount,  DateTime expiredAt,  List<SnWalletFundRecipient> recipients,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String currency,  double totalAmount,  double remainingAmount,  int amountOfSplits,  int splitType,  int status,  String? message,  String creatorAccountId,  SnAccount? creatorAccount,  DateTime expiredAt,  List<SnWalletFundRecipient> recipients,  bool isOpen,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnWalletFund():
-return $default(_that.id,_that.currency,_that.totalAmount,_that.splitType,_that.status,_that.message,_that.creatorAccountId,_that.creatorAccount,_that.expiredAt,_that.recipients,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.currency,_that.totalAmount,_that.remainingAmount,_that.amountOfSplits,_that.splitType,_that.status,_that.message,_that.creatorAccountId,_that.creatorAccount,_that.expiredAt,_that.recipients,_that.isOpen,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -2752,10 +2755,10 @@ return $default(_that.id,_that.currency,_that.totalAmount,_that.splitType,_that.
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String currency,  double totalAmount,  int splitType,  int status,  String? message,  String creatorAccountId,  SnAccount? creatorAccount,  DateTime expiredAt,  List<SnWalletFundRecipient> recipients,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String currency,  double totalAmount,  double remainingAmount,  int amountOfSplits,  int splitType,  int status,  String? message,  String creatorAccountId,  SnAccount? creatorAccount,  DateTime expiredAt,  List<SnWalletFundRecipient> recipients,  bool isOpen,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnWalletFund() when $default != null:
-return $default(_that.id,_that.currency,_that.totalAmount,_that.splitType,_that.status,_that.message,_that.creatorAccountId,_that.creatorAccount,_that.expiredAt,_that.recipients,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.currency,_that.totalAmount,_that.remainingAmount,_that.amountOfSplits,_that.splitType,_that.status,_that.message,_that.creatorAccountId,_that.creatorAccount,_that.expiredAt,_that.recipients,_that.isOpen,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
  return null;

 }
@@ -2767,12 +2770,14 @@ return $default(_that.id,_that.currency,_that.totalAmount,_that.splitType,_that.
@JsonSerializable()

 class _SnWalletFund implements SnWalletFund {
-  const _SnWalletFund({required this.id, required this.currency, required this.totalAmount, required this.splitType, required this.status, required this.message, required this.creatorAccountId, required this.creatorAccount, required this.expiredAt, required final  List<SnWalletFundRecipient> recipients, required this.createdAt, required this.updatedAt, required this.deletedAt}): _recipients = recipients;
+  const _SnWalletFund({required this.id, required this.currency, required this.totalAmount, required this.remainingAmount, required this.amountOfSplits, required this.splitType, required this.status, required this.message, required this.creatorAccountId, required this.creatorAccount, required this.expiredAt, required final  List<SnWalletFundRecipient> recipients, required this.isOpen, required this.createdAt, required this.updatedAt, required this.deletedAt}): _recipients = recipients;
  factory _SnWalletFund.fromJson(Map<String, dynamic> json) => _$SnWalletFundFromJson(json);

@override final  String id;
@override final  String currency;
@override final  double totalAmount;
+@override final  double remainingAmount;
+@override final  int amountOfSplits;
@override final  int splitType;
 // 0: even, 1: random
@override final  int status;
@@ -2788,6 +2793,7 @@ class _SnWalletFund implements SnWalletFund {
  return EqualUnmodifiableListView(_recipients);
 }

+@override final  bool isOpen;
@override final  DateTime createdAt;
@override final  DateTime updatedAt;
@override final  DateTime? deletedAt;
@@ -2805,16 +2811,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnWalletFund&&(identical(other.id, id) || other.id == id)&&(identical(other.currency, currency) || other.currency == currency)&&(identical(other.totalAmount, totalAmount) || other.totalAmount == totalAmount)&&(identical(other.splitType, splitType) || other.splitType == splitType)&&(identical(other.status, status) || other.status == status)&&(identical(other.message, message) || other.message == message)&&(identical(other.creatorAccountId, creatorAccountId) || other.creatorAccountId == creatorAccountId)&&(identical(other.creatorAccount, creatorAccount) || other.creatorAccount == creatorAccount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&const DeepCollectionEquality().equals(other._recipients, _recipients)&&(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 _SnWalletFund&&(identical(other.id, id) || other.id == id)&&(identical(other.currency, currency) || other.currency == currency)&&(identical(other.totalAmount, totalAmount) || other.totalAmount == totalAmount)&&(identical(other.remainingAmount, remainingAmount) || other.remainingAmount == remainingAmount)&&(identical(other.amountOfSplits, amountOfSplits) || other.amountOfSplits == amountOfSplits)&&(identical(other.splitType, splitType) || other.splitType == splitType)&&(identical(other.status, status) || other.status == status)&&(identical(other.message, message) || other.message == message)&&(identical(other.creatorAccountId, creatorAccountId) || other.creatorAccountId == creatorAccountId)&&(identical(other.creatorAccount, creatorAccount) || other.creatorAccount == creatorAccount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&const DeepCollectionEquality().equals(other._recipients, _recipients)&&(identical(other.isOpen, isOpen) || other.isOpen == isOpen)&&(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,currency,totalAmount,splitType,status,message,creatorAccountId,creatorAccount,expiredAt,const DeepCollectionEquality().hash(_recipients),createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,currency,totalAmount,remainingAmount,amountOfSplits,splitType,status,message,creatorAccountId,creatorAccount,expiredAt,const DeepCollectionEquality().hash(_recipients),isOpen,createdAt,updatedAt,deletedAt);

@override
 String toString() {
-  return 'SnWalletFund(id: $id, currency: $currency, totalAmount: $totalAmount, splitType: $splitType, status: $status, message: $message, creatorAccountId: $creatorAccountId, creatorAccount: $creatorAccount, expiredAt: $expiredAt, recipients: $recipients, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnWalletFund(id: $id, currency: $currency, totalAmount: $totalAmount, remainingAmount: $remainingAmount, amountOfSplits: $amountOfSplits, splitType: $splitType, status: $status, message: $message, creatorAccountId: $creatorAccountId, creatorAccount: $creatorAccount, expiredAt: $expiredAt, recipients: $recipients, isOpen: $isOpen, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }


@@ -2825,7 +2831,7 @@ abstract mixin class _$SnWalletFundCopyWith<$Res> implements $SnWalletFundCopyWi
  factory _$SnWalletFundCopyWith(_SnWalletFund value, $Res Function(_SnWalletFund) _then) = __$SnWalletFundCopyWithImpl;
@override @useResult
 $Res call({
- String id, String currency, double totalAmount, int splitType, int status, String? message, String creatorAccountId, SnAccount? creatorAccount, DateTime expiredAt, List<SnWalletFundRecipient> recipients, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String currency, double totalAmount, double remainingAmount, int amountOfSplits, int splitType, int status, String? message, String creatorAccountId, SnAccount? creatorAccount, DateTime expiredAt, List<SnWalletFundRecipient> recipients, bool isOpen, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });


@@ -2842,19 +2848,22 @@ class __$SnWalletFundCopyWithImpl<$Res>

 /// Create a copy of SnWalletFund
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? currency = null,Object? totalAmount = null,Object? splitType = null,Object? status = null,Object? message = freezed,Object? creatorAccountId = null,Object? creatorAccount = freezed,Object? expiredAt = null,Object? recipients = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? currency = null,Object? totalAmount = null,Object? remainingAmount = null,Object? amountOfSplits = null,Object? splitType = null,Object? status = null,Object? message = freezed,Object? creatorAccountId = null,Object? creatorAccount = freezed,Object? expiredAt = null,Object? recipients = null,Object? isOpen = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_SnWalletFund(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,currency: null == currency ? _self.currency : currency // ignore: cast_nullable_to_non_nullable
 as String,totalAmount: null == totalAmount ? _self.totalAmount : totalAmount // ignore: cast_nullable_to_non_nullable
-as double,splitType: null == splitType ? _self.splitType : splitType // ignore: cast_nullable_to_non_nullable
+as double,remainingAmount: null == remainingAmount ? _self.remainingAmount : remainingAmount // ignore: cast_nullable_to_non_nullable
+as double,amountOfSplits: null == amountOfSplits ? _self.amountOfSplits : amountOfSplits // ignore: cast_nullable_to_non_nullable
+as int,splitType: null == splitType ? _self.splitType : splitType // ignore: cast_nullable_to_non_nullable
 as int,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
 as int,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
 as String?,creatorAccountId: null == creatorAccountId ? _self.creatorAccountId : creatorAccountId // ignore: cast_nullable_to_non_nullable
 as String,creatorAccount: freezed == creatorAccount ? _self.creatorAccount : creatorAccount // ignore: cast_nullable_to_non_nullable
 as SnAccount?,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
 as DateTime,recipients: null == recipients ? _self._recipients : recipients // ignore: cast_nullable_to_non_nullable
-as List<SnWalletFundRecipient>,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as List<SnWalletFundRecipient>,isOpen: null == isOpen ? _self.isOpen : isOpen // ignore: cast_nullable_to_non_nullable
+as bool,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
--- a/lib/models/wallet.g.dart
+++ b/lib/models/wallet.g.dart
@@ -336,6 +336,8 @@ _SnWalletFund _$SnWalletFundFromJson(
  id: json['id'] as String,
  currency: json['currency'] as String,
  totalAmount: (json['total_amount'] as num).toDouble(),
+  remainingAmount: (json['remaining_amount'] as num).toDouble(),
+  amountOfSplits: (json['amount_of_splits'] as num).toInt(),
  splitType: (json['split_type'] as num).toInt(),
  status: (json['status'] as num).toInt(),
  message: json['message'] as String?,
@@ -349,6 +351,7 @@ _SnWalletFund _$SnWalletFundFromJson(
      (json['recipients'] as List<dynamic>)
          .map((e) => SnWalletFundRecipient.fromJson(e as Map<String, dynamic>))
          .toList(),
+  isOpen: json['is_open'] as bool,
  createdAt: DateTime.parse(json['created_at'] as String),
  updatedAt: DateTime.parse(json['updated_at'] as String),
  deletedAt:
@@ -362,6 +365,8 @@ Map<String, dynamic> _$SnWalletFundToJson(_SnWalletFund instance) =>
      'id': instance.id,
      'currency': instance.currency,
      'total_amount': instance.totalAmount,
+      'remaining_amount': instance.remainingAmount,
+      'amount_of_splits': instance.amountOfSplits,
      'split_type': instance.splitType,
      'status': instance.status,
      'message': instance.message,
@@ -369,6 +374,7 @@ Map<String, dynamic> _$SnWalletFundToJson(_SnWalletFund instance) =>
      'creator_account': instance.creatorAccount?.toJson(),
      'expired_at': instance.expiredAt.toIso8601String(),
      'recipients': instance.recipients.map((e) => e.toJson()).toList(),
+      'is_open': instance.isOpen,
      'created_at': instance.createdAt.toIso8601String(),
      'updated_at': instance.updatedAt.toIso8601String(),
      'deleted_at': instance.deletedAt?.toIso8601String(),
--- a/lib/pods/activity/activity_rpc.dart
+++ b/lib/pods/activity/activity_rpc.dart
@@ -1,12 +1,13 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'package:dio/dio.dart' hide Response;
 import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/account.dart';
+import 'package:island/models/activity.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/talker.dart';
-import 'package:island/widgets/account/status.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shelf/shelf.dart';
 import 'package:shelf/shelf_io.dart' as shelf_io;
 import 'package:shelf_web_socket/shelf_web_socket.dart';
@@ -15,6 +16,8 @@ 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';

+part 'activity_rpc.g.dart';
+
 const String kRpcLogPrefix = 'arRPC.websocket';
 const String kRpcIpcLogPrefix = 'arRPC.ipc';

@@ -116,12 +119,19 @@ class ActivityRpcServer {
          _handleIpcPacket(socket, packet);
        };

+        // Set up IPC close handler
+        if (!kIsWeb) {
+          (_ipcServer as dynamic).onSocketClose = (socket) {
+            handlers['close']?.call(socket);
+          };
+        }
+
        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');
+      talker.log('IPC server disabled on macOS or web');
    }
  }

@@ -294,23 +304,42 @@ class _WsSocketWrapper {
 class ServerState {
  final String status;
  final List<String> activities;
+  final String? currentActivityManualId;
+  final Map<String, dynamic>? currentActivityData;

-  ServerState({required this.status, this.activities = const []});
+  ServerState({
+    required this.status,
+    this.activities = const [],
+    this.currentActivityManualId,
+    this.currentActivityData,
+  });

-  ServerState copyWith({String? status, List<String>? activities}) {
+  ServerState copyWith({
+    String? status,
+    List<String>? activities,
+    String? currentActivityManualId,
+    Map<String, dynamic>? currentActivityData,
+  }) {
    return ServerState(
      status: status ?? this.status,
      activities: activities ?? this.activities,
+      currentActivityManualId:
+          currentActivityManualId ?? this.currentActivityManualId,
+      currentActivityData: currentActivityData ?? this.currentActivityData,
    );
  }
 }

 class ServerStateNotifier extends StateNotifier<ServerState> {
  final ActivityRpcServer server;
+  final Dio apiClient;
+  Timer? _renewalTimer;

-  ServerStateNotifier(this.server)
+  ServerStateNotifier(this.apiClient, this.server)
    : super(ServerState(status: 'Server not started'));

+  String? get currentActivityManualId => state.currentActivityManualId;
+
  Future<void> start() async {
    if (!kIsWeb && !Platform.isAndroid && !Platform.isIOS) {
      try {
@@ -333,122 +362,185 @@ class ServerStateNotifier extends StateNotifier<ServerState> {
  void addActivity(String activity) {
    state = state.copyWith(activities: [...state.activities, activity]);
  }
+
+  void setCurrentActivity(String? id, Map<String, dynamic>? data) {
+    state = state.copyWith(
+      currentActivityManualId: id,
+      currentActivityData: data,
+    );
+    if (id != null && data != null) {
+      _startRenewal();
+    } else {
+      _stopRenewal();
+    }
+  }
+
+  void _startRenewal() {
+    _renewalTimer?.cancel();
+    const int renewalIntervalSeconds = kPresenceActivityLease * 60 - 30;
+    _renewalTimer = Timer.periodic(Duration(seconds: renewalIntervalSeconds), (
+      timer,
+    ) {
+      _renewActivity();
+    });
+  }
+
+  void _stopRenewal() {
+    _renewalTimer?.cancel();
+    _renewalTimer = null;
+  }
+
+  Future<void> _renewActivity() async {
+    if (state.currentActivityData != null) {
+      try {
+        await apiClient.post(
+          '/pass/activities',
+          data: state.currentActivityData,
+        );
+        talker.log('Activity lease renewed');
+      } catch (e) {
+        talker.log('Failed to renew activity lease: $e');
+      }
+    }
+  }
 }

+const kPresenceActivityLease = 5;
+
 // 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');
-          }
+final rpcServerStateProvider = StateNotifierProvider<
+  ServerStateNotifier,
+  ServerState
+>((ref) {
+  final apiClient = ref.watch(apiClientProvider);
+  final server = ActivityRpcServer({});
+  final notifier = ServerStateNotifier(apiClient, 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',
      });
-      return notifier;
-    });
+    },
+    'message': (socket, dynamic data) async {
+      if (data['cmd'] == 'SET_ACTIVITY') {
+        final activity = data['args']['activity'];
+        final appId = 'rpc:${socket.clientId}';
+
+        final currentId = notifier.currentActivityManualId;
+        if (currentId != null && currentId != appId) {
+          talker.info(
+            'Skipped the new SET_ACTIVITY command due to there is one existing...',
+          );
+          return;
+        }
+
+        notifier.addActivity('Activity: ${activity['details'] ?? 'Untitled'}');
+        // https://discord.com/developers/docs/topics/rpc#setactivity-set-activity-argument-structure
+        final type = switch (activity['type']) {
+          0 => 1, // Discord Playing -> Playing
+          2 => 2, // Discord Music -> Listening
+          3 => 2, // Discord Watching -> Listening
+          _ => 1, // Discord Competing (or null) -> Playing
+        };
+        final title = activity['name'] ?? activity['assets']?['small_text'];
+        final subtitle =
+            activity['details'] ?? activity['assets']?['large_text'];
+        var imageSmall = activity['assets']?['small_image'];
+        var imageLarge = activity['assets']?['large_image'];
+        if (imageSmall != null && !imageSmall!.contains(':')) {
+          imageSmall = 'discord:$imageSmall';
+        }
+        if (imageLarge != null && !imageLarge!.contains(':')) {
+          imageLarge = 'discord:$imageLarge';
+        }
+        try {
+          final apiClient = ref.watch(apiClientProvider);
+          final activityData = {
+            'type': type,
+            'manual_id': appId,
+            'title': title,
+            'subtitle': subtitle,
+            'caption': activity['state'],
+            'title_url': activity['assets']?['small_text_url'],
+            'subtitle_url': activity['assets']?['large_text_url'],
+            'small_image': imageSmall,
+            'large_image': imageLarge,
+            'meta': activity,
+            'lease_minutes': kPresenceActivityLease,
+          };
+
+          await apiClient.post('/pass/activities', data: activityData);
+          notifier.setCurrentActivity(appId, activityData);
+        } 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 currentId = notifier.currentActivityManualId;
+      try {
+        final apiClient = ref.watch(apiClientProvider);
+        await apiClient.delete(
+          '/pass/activities',
+          queryParameters: {'manualId': currentId},
+        );
+        notifier.setCurrentActivity(null, null);
+      } 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(
+@riverpod
+Future<List<SnPresenceActivity>> presenceActivities(
  Ref ref,
-  String label,
-  String appId,
-  Map<String, dynamic> meta,
+  String uname,
 ) async {
-  final apiClient = ref.read(apiClientProvider);
-  await apiClient.post(
-    '/pass/accounts/me/statuses',
-    data: {
-      'is_invisible': false,
-      'is_not_disturb': false,
-      'is_automated': true,
-      'label': label,
-      'app_identifier': appId,
-      'meta': meta,
-    },
+  ref.keepAlive();
+  final timer = Timer.periodic(
+    const Duration(minutes: 1),
+    (_) => ref.invalidateSelf(),
  );
-}
+  ref.onDispose(() => timer.cancel());

-Future<void> unsetRemoteActivityStatus(Ref ref, String appId) async {
-  final apiClient = ref.read(apiClientProvider);
-  await apiClient.delete(
-    '/pass/accounts/me/statuses',
-    queryParameters: {'app': appId},
-  );
+  final apiClient = ref.watch(apiClientProvider);
+  final response = await apiClient.get('/pass/activities/$uname');
+  final data = response.data as List<dynamic>;
+  return data.map((json) => SnPresenceActivity.fromJson(json)).toList();
 }
--- a/lib/pods/activity/activity_rpc.g.dart
+++ b/lib/pods/activity/activity_rpc.g.dart
@@ -0,0 +1,157 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'activity_rpc.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$presenceActivitiesHash() =>
+    r'3bfaa638eeb961ecd62a32d6a7760a6a7e7bf6f2';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [presenceActivities].
+@ProviderFor(presenceActivities)
+const presenceActivitiesProvider = PresenceActivitiesFamily();
+
+/// See also [presenceActivities].
+class PresenceActivitiesFamily
+    extends Family<AsyncValue<List<SnPresenceActivity>>> {
+  /// See also [presenceActivities].
+  const PresenceActivitiesFamily();
+
+  /// See also [presenceActivities].
+  PresenceActivitiesProvider call(String uname) {
+    return PresenceActivitiesProvider(uname);
+  }
+
+  @override
+  PresenceActivitiesProvider getProviderOverride(
+    covariant PresenceActivitiesProvider provider,
+  ) {
+    return call(provider.uname);
+  }
+
+  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'presenceActivitiesProvider';
+}
+
+/// See also [presenceActivities].
+class PresenceActivitiesProvider
+    extends AutoDisposeFutureProvider<List<SnPresenceActivity>> {
+  /// See also [presenceActivities].
+  PresenceActivitiesProvider(String uname)
+    : this._internal(
+        (ref) => presenceActivities(ref as PresenceActivitiesRef, uname),
+        from: presenceActivitiesProvider,
+        name: r'presenceActivitiesProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$presenceActivitiesHash,
+        dependencies: PresenceActivitiesFamily._dependencies,
+        allTransitiveDependencies:
+            PresenceActivitiesFamily._allTransitiveDependencies,
+        uname: uname,
+      );
+
+  PresenceActivitiesProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.uname,
+  }) : super.internal();
+
+  final String uname;
+
+  @override
+  Override overrideWith(
+    FutureOr<List<SnPresenceActivity>> Function(PresenceActivitiesRef provider)
+    create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: PresenceActivitiesProvider._internal(
+        (ref) => create(ref as PresenceActivitiesRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        uname: uname,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<List<SnPresenceActivity>> createElement() {
+    return _PresenceActivitiesProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is PresenceActivitiesProvider && other.uname == uname;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, uname.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin PresenceActivitiesRef
+    on AutoDisposeFutureProviderRef<List<SnPresenceActivity>> {
+  /// The parameter `uname` of this provider.
+  String get uname;
+}
+
+class _PresenceActivitiesProviderElement
+    extends AutoDisposeFutureProviderElement<List<SnPresenceActivity>>
+    with PresenceActivitiesRef {
+  _PresenceActivitiesProviderElement(super.provider);
+
+  @override
+  String get uname => (origin as PresenceActivitiesProvider).uname;
+}
+
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
--- a/lib/pods/activity/ipc_server.dart
+++ b/lib/pods/activity/ipc_server.dart
@@ -79,6 +79,8 @@ abstract class IpcServer {
    Map<String, Function> handlers,
  )?
  handlePacket;
+
+  void Function(IpcSocketWrapper socket)? onSocketClose;
 }

 // Abstract base class for IPC socket wrapper
@@ -178,6 +180,8 @@ class MultiPlatformIpcServer extends IpcServer {
      },
      onDone: () {
        talker.log('IPC connection closed');
+        removeSocket(socket);
+        onSocketClose?.call(socket);
        socket.close();
      },
      onError: (e) {
--- a/lib/pods/chat/messages_notifier.dart
+++ b/lib/pods/chat/messages_notifier.dart
@@ -3,10 +3,13 @@ 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:hooks_riverpod/hooks_riverpod.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/models/poll.dart";
+import "package:island/models/wallet.dart";
 import "package:island/pods/database.dart";
 import "package:island/pods/lifecycle.dart";
 import "package:island/pods/network.dart";
@@ -28,7 +31,7 @@ class MessagesNotifier extends _$MessagesNotifier {
  late final SnChatMember _identity;

  final Map<String, LocalChatMessage> _pendingMessages = {};
-  final Map<String, Map<int, double>> _fileUploadProgress = {};
+  final Map<String, Map<int, double?>> _fileUploadProgress = {};
  int? _totalCount;
  String? _searchQuery;
  bool? _withLinks;
@@ -433,12 +436,15 @@ class MessagesNotifier extends _$MessagesNotifier {
  }

  Future<void> sendMessage(
+    WidgetRef ref,
    String content,
    List<UniversalFile> attachments, {
+    SnPoll? poll,
+    SnWalletFund? fund,
    SnChatMessage? editingTo,
    SnChatMessage? forwardingTo,
    SnChatMessage? replyingTo,
-    Function(String, Map<int, double>)? onProgress,
+    Function(String, Map<int, double?>)? onProgress,
  }) async {
    final nonce = const Uuid().v4();
    talker.log('Sending message with nonce $nonce');
@@ -471,10 +477,10 @@ class MessagesNotifier extends _$MessagesNotifier {
      for (var idx = 0; idx < attachments.length; idx++) {
        final cloudFile =
            await FileUploader.createCloudFile(
+              ref: ref,
              fileData: attachments[idx],
-              client: ref.read(apiClientProvider),
              onProgress: (progress, _) {
-                _fileUploadProgress[localMessage.id]?[idx] = progress;
+                _fileUploadProgress[localMessage.id]?[idx] = progress ?? 0.0;
                onProgress?.call(
                  localMessage.id,
                  _fileUploadProgress[localMessage.id] ?? {},
@@ -496,6 +502,8 @@ class MessagesNotifier extends _$MessagesNotifier {
          'attachments_id': cloudAttachments.map((e) => e.id).toList(),
          'replied_message_id': replyingTo?.id,
          'forwarded_message_id': forwardingTo?.id,
+          'poll_id': poll?.id,
+          'fund_id': fund?.id,
          'meta': {},
          'nonce': nonce,
        },
--- a/lib/pods/chat/messages_notifier.g.dart
+++ b/lib/pods/chat/messages_notifier.g.dart
@@ -6,7 +6,7 @@ part of 'messages_notifier.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$messagesNotifierHash() => r'6adefd9152cdd686c2a863964993f24c42d405b5';
+String _$messagesNotifierHash() => r'fc9c99024a0801efa4894f250aea8bdc6127a0b6';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/pods/file_list.dart
+++ b/lib/pods/file_list.dart
@@ -0,0 +1,104 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/models/file_list_item.dart';
+import 'package:island/pods/network.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
+
+part 'file_list.g.dart';
+
+@riverpod
+class CloudFileListNotifier extends _$CloudFileListNotifier
+    with CursorPagingNotifierMixin<FileListItem> {
+  String _currentPath = '/';
+
+  void setPath(String path) {
+    _currentPath = path;
+    ref.invalidateSelf();
+  }
+
+  @override
+  Future<CursorPagingData<FileListItem>> build() => fetch(cursor: null);
+
+  @override
+  Future<CursorPagingData<FileListItem>> fetch({
+    required String? cursor,
+  }) async {
+    final client = ref.read(apiClientProvider);
+
+    final response = await client.get(
+      '/drive/index/browse',
+      queryParameters: {'path': _currentPath},
+    );
+
+    final List<String> folders =
+        (response.data['folders'] as List).map((e) => e as String).toList();
+    final List<SnCloudFileIndex> files =
+        (response.data['files'] as List)
+            .map((e) => SnCloudFileIndex.fromJson(e as Map<String, dynamic>))
+            .toList();
+
+    final List<FileListItem> items = [
+      ...folders.map((folderName) => FileListItem.folder(folderName)),
+      ...files.map((file) => FileListItem.file(file)),
+    ];
+
+    // The new API returns all files in the path, no pagination
+    return CursorPagingData(items: items, hasMore: false, nextCursor: null);
+  }
+}
+
+@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
+class UnindexedFileListNotifier extends _$UnindexedFileListNotifier
+    with CursorPagingNotifierMixin<FileListItem> {
+  @override
+  Future<CursorPagingData<FileListItem>> build() => fetch(cursor: null);
+
+  @override
+  Future<CursorPagingData<FileListItem>> fetch({
+    required String? cursor,
+  }) async {
+    final client = ref.read(apiClientProvider);
+
+    final offset = cursor != null ? int.tryParse(cursor) ?? 0 : 0;
+    const take = 50; // Default page size
+
+    final response = await client.get(
+      '/drive/index/unindexed',
+      queryParameters: {'take': take.toString(), 'offset': offset.toString()},
+    );
+
+    final total = int.tryParse(response.headers.value('x-total') ?? '0') ?? 0;
+
+    final List<SnCloudFile> files =
+        (response.data as List)
+            .map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
+            .toList();
+
+    final List<FileListItem> items =
+        files.map((file) => FileListItem.unindexedFile(file)).toList();
+
+    final hasMore = offset + take < total;
+    final nextCursor = hasMore ? (offset + take).toString() : null;
+
+    return CursorPagingData(
+      items: items,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
+@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;
+}
--- a/lib/screens/files/file_list.g.dart
+++ b/lib/screens/files/file_list.g.dart
@@ -45,13 +45,13 @@ final billingQuotaProvider =
 // ignore: unused_element
 typedef BillingQuotaRef = AutoDisposeFutureProviderRef<Map<String, dynamic>?>;
 String _$cloudFileListNotifierHash() =>
-    r'22c45a8ea23147a3835ba870ad2f0bb833f853ea';
+    r'5f2f80357cb31ac6473df5ac2101f9a462004f81';

 /// See also [CloudFileListNotifier].
@ProviderFor(CloudFileListNotifier)
 final cloudFileListNotifierProvider = AutoDisposeAsyncNotifierProvider<
  CloudFileListNotifier,
-  CursorPagingData<SnCloudFile>
+  CursorPagingData<FileListItem>
 >.internal(
  CloudFileListNotifier.new,
  name: r'cloudFileListNotifierProvider',
@@ -64,6 +64,27 @@ final cloudFileListNotifierProvider = AutoDisposeAsyncNotifierProvider<
 );

 typedef _$CloudFileListNotifier =
-    AutoDisposeAsyncNotifier<CursorPagingData<SnCloudFile>>;
+    AutoDisposeAsyncNotifier<CursorPagingData<FileListItem>>;
+String _$unindexedFileListNotifierHash() =>
+    r'48fc92432a50a562190da5fe8ed0920d171b07b6';
+
+/// See also [UnindexedFileListNotifier].
+@ProviderFor(UnindexedFileListNotifier)
+final unindexedFileListNotifierProvider = AutoDisposeAsyncNotifierProvider<
+  UnindexedFileListNotifier,
+  CursorPagingData<FileListItem>
+>.internal(
+  UnindexedFileListNotifier.new,
+  name: r'unindexedFileListNotifierProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$unindexedFileListNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$UnindexedFileListNotifier =
+    AutoDisposeAsyncNotifier<CursorPagingData<FileListItem>>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
--- a/lib/pods/upload_tasks.dart
+++ b/lib/pods/upload_tasks.dart
@@ -0,0 +1,494 @@
+import 'dart:async';
+import 'dart:typed_data';
+import 'package:cross_file/cross_file.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/models/drive_task.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/services/file_uploader.dart';
+import 'package:island/talker.dart';
+
+final uploadTasksProvider =
+    StateNotifierProvider<UploadTasksNotifier, List<DriveTask>>(
+      (ref) => UploadTasksNotifier(ref),
+    );
+
+class UploadTasksNotifier extends StateNotifier<List<DriveTask>> {
+  final Ref ref;
+  StreamSubscription? _websocketSubscription;
+  final Map<String, Map<String, dynamic>> _pendingUploads = {};
+
+  UploadTasksNotifier(this.ref) : super([]) {
+    _listenToWebSocket();
+  }
+
+  void _listenToWebSocket() {
+    final WebSocketService websocketService = ref.read(websocketProvider);
+    _websocketSubscription = websocketService.dataStream.listen(
+      _handleWebSocketPacket,
+    );
+  }
+
+  void _handleWebSocketPacket(dynamic packet) {
+    if (packet.type.startsWith('task.')) {
+      final data = packet.data;
+      if (data == null) return;
+
+      // Debug logging
+      talker.info(
+        '[UploadTasks] Received WebSocket packet: ${packet.type}, data: $data',
+      );
+
+      final taskId = data['task_id'] as String?;
+      if (taskId == null) return;
+
+      switch (packet.type) {
+        case 'task.created':
+          _handleTaskCreated(taskId, data);
+          break;
+        case 'task.progress':
+          _handleProgressUpdate(taskId, data);
+          break;
+        case 'task.completed':
+          _handleUploadCompleted(taskId, data);
+          break;
+        case 'task.failed':
+          _handleUploadFailed(taskId, data);
+          break;
+      }
+    }
+  }
+
+  void _handleTaskCreated(String taskId, Map<String, dynamic> data) {
+    talker.info('[UploadTasks] Handling task.created for taskId: $taskId');
+
+    // Check if task already exists (might have been created locally)
+    final existingTask =
+        state.where((task) => task.taskId == taskId).firstOrNull;
+    if (existingTask != null) {
+      talker.info('[UploadTasks] Task already exists, updating status');
+      // Task already exists, just update its status to confirm server creation
+      state =
+          state.map((task) {
+            if (task.taskId == taskId) {
+              return task.copyWith(
+                status: DriveTaskStatus.pending,
+                updatedAt: DateTime.now(),
+              );
+            }
+            return task;
+          }).toList();
+      return;
+    }
+
+    // Check if we have stored metadata for this task
+    final metadata = _pendingUploads[taskId];
+    talker.info('[UploadTasks] Metadata for taskId $taskId: $metadata');
+
+    if (metadata != null) {
+      talker.info('[UploadTasks] Creating task with full metadata');
+      // Create task with full metadata
+      final uploadTask = DriveTask(
+        id: DateTime.now().millisecondsSinceEpoch.toString(),
+        taskId: taskId,
+        fileName: metadata['file_name'] as String,
+        contentType: metadata['mime_type'] as String,
+        fileSize: metadata['file_size'] as int,
+        uploadedBytes: 0,
+        totalChunks: metadata['total_chunks'] as int,
+        uploadedChunks: 0,
+        status: DriveTaskStatus.pending,
+        createdAt: DateTime.now(),
+        updatedAt: DateTime.now(),
+        type: 'FileUpload',
+        poolId: metadata['pool_id'] as String?,
+        bundleId: metadata['bundleId'] as String?,
+        encryptPassword: metadata['encrypt_password'] as String?,
+        expiredAt: metadata['expired_at'] as String?,
+      );
+
+      state = [...state, uploadTask];
+      talker.info(
+        '[UploadTasks] Task created successfully. Total tasks: ${state.length}',
+      );
+      // Clean up stored metadata
+      _pendingUploads.remove(taskId);
+    } else {
+      talker.info('[UploadTasks] No metadata found, creating minimal task');
+      // Create minimal task if no metadata is stored
+      final params = data['parameters'];
+      final uploadTask = DriveTask(
+        id: DateTime.now().millisecondsSinceEpoch.toString(),
+        taskId: taskId,
+        fileName: params['file_name'] as String? ?? 'Unknown file',
+        contentType: params['content_type'],
+        fileSize: params['file_size'],
+        uploadedBytes:
+            (params['chunk_size'] as int) * (params['chunks_uploaded'] as int),
+        totalChunks: params['chunks_count'],
+        uploadedChunks: params['chunks_uploaded'],
+        status: DriveTaskStatus.pending,
+        createdAt: DateTime.tryParse(data['created_at']) ?? DateTime.now(),
+        updatedAt: DateTime.now(),
+        type: data['type'],
+      );
+
+      state = [...state, uploadTask];
+      talker.info(
+        '[UploadTasks] Minimal task created. Total tasks: ${state.length}',
+      );
+    }
+  }
+
+  void _handleProgressUpdate(String taskId, Map<String, dynamic> data) {
+    final progress = data['progress'] as num? ?? 0.0;
+
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            final uploadedBytes = (progress / 100.0 * task.fileSize).toInt();
+            return task.copyWith(
+              statusMessage: data['status'],
+              uploadedBytes: uploadedBytes,
+              status: DriveTaskStatus.inProgress,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void _handleUploadCompleted(String taskId, Map<String, dynamic> data) {
+    final results = data['results'] as Map<String, dynamic>?;
+
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            return task.copyWith(
+              status: DriveTaskStatus.completed,
+              uploadedChunks: task.totalChunks,
+              uploadedBytes: task.fileSize,
+              // Update file information from Results if available
+              fileName: results?['file_name'] as String? ?? task.fileName,
+              fileSize: results?['file_size'] as int? ?? task.fileSize,
+              contentType: results?['mime_type'] as String? ?? task.contentType,
+              result:
+                  results?['file_info'] != null
+                      ? SnCloudFile.fromJson(results!['file_info'])
+                      : null,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void _handleUploadFailed(String taskId, Map<String, dynamic> data) {
+    final errorMessage = data['error_message'] as String? ?? 'Upload failed';
+
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            return task.copyWith(
+              status: DriveTaskStatus.failed,
+              errorMessage: errorMessage,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void addUploadTask(DriveTask task) {
+    state = [...state, task];
+  }
+
+  void storeUploadMetadata(
+    String taskId, {
+    required String fileName,
+    required String contentType,
+    required int fileSize,
+    required int totalChunks,
+    String? poolId,
+    String? bundleId,
+    String? encryptPassword,
+    String? expiredAt,
+  }) {
+    _pendingUploads[taskId] = {
+      'file_name': fileName,
+      'mime_type': contentType,
+      'file_size': fileSize,
+      'total_chunks': totalChunks,
+      'pool_id': poolId,
+      'bundleId': bundleId,
+      'encrypt_password': encryptPassword,
+      'expired_at': expiredAt,
+    };
+  }
+
+  void updateTaskStatus(
+    String taskId,
+    DriveTaskStatus status, {
+    String? errorMessage,
+  }) {
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            return task.copyWith(
+              status: status,
+              errorMessage: errorMessage,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void updateTransmissionProgress(String taskId, double progress) {
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            return task.copyWith(
+              transmissionProgress: progress,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void removeTask(String taskId) {
+    state = state.where((task) => task.taskId != taskId).toList();
+  }
+
+  void clearCompletedTasks() {
+    state =
+        state
+            .where(
+              (task) =>
+                  task.status != DriveTaskStatus.completed &&
+                  task.status != DriveTaskStatus.failed &&
+                  task.status != DriveTaskStatus.cancelled &&
+                  task.status != DriveTaskStatus.expired,
+            )
+            .toList();
+  }
+
+  DriveTask? getTask(String taskId) {
+    return state.where((task) => task.taskId == taskId).firstOrNull;
+  }
+
+  List<DriveTask> getActiveTasks() {
+    return state
+        .where(
+          (task) =>
+              task.status == DriveTaskStatus.pending ||
+              task.status == DriveTaskStatus.inProgress ||
+              task.status == DriveTaskStatus.paused ||
+              task.status == DriveTaskStatus.completed,
+        )
+        .toList();
+  }
+
+  @override
+  void dispose() {
+    _websocketSubscription?.cancel();
+    super.dispose();
+  }
+}
+
+// Provider for the enhanced FileUploader that integrates with upload tasks
+final enhancedFileUploaderProvider = Provider<EnhancedFileUploader>((ref) {
+  final dio = ref.watch(apiClientProvider);
+  return EnhancedFileUploader(dio, ref);
+});
+
+class EnhancedFileUploader extends FileUploader {
+  final Ref ref;
+
+  EnhancedFileUploader(super.client, this.ref);
+
+  /// Reads the next chunk from a stream subscription.
+  Future<Uint8List> _readNextChunkFromStream(
+    StreamSubscription<List<int>> subscription,
+    int size,
+  ) async {
+    final completer = Completer<Uint8List>();
+    final buffer = <int>[];
+    int remaining = size;
+
+    void onData(List<int> data) {
+      buffer.addAll(data);
+      remaining -= data.length;
+      if (remaining <= 0) {
+        subscription.pause();
+        completer.complete(Uint8List.fromList(buffer.sublist(0, size)));
+      }
+    }
+
+    void onDone() {
+      if (!completer.isCompleted) {
+        completer.complete(Uint8List.fromList(buffer));
+      }
+    }
+
+    subscription.onData(onData);
+    subscription.onDone(onDone);
+
+    return completer.future;
+  }
+
+  @override
+  Future<SnCloudFile> uploadFile({
+    required dynamic fileData,
+    required String fileName,
+    required String contentType,
+    String? poolId,
+    String? bundleId,
+    String? encryptPassword,
+    String? expiredAt,
+    int? customChunkSize,
+    String? path,
+    Function(double? progress, Duration estimate)? onProgress,
+  }) async {
+    // Step 1: Create upload task
+    onProgress?.call(null, Duration.zero);
+    final createResponse = await createUploadTask(
+      fileData: fileData,
+      fileName: fileName,
+      contentType: contentType,
+      poolId: poolId,
+      bundleId: bundleId,
+      encryptPassword: encryptPassword,
+      expiredAt: expiredAt,
+      chunkSize: customChunkSize,
+      path: path,
+    );
+
+    int totalSize;
+    if (fileData is XFile) {
+      totalSize = await fileData.length();
+    } else if (fileData is Uint8List) {
+      totalSize = fileData.length;
+    } else {
+      throw ArgumentError('Invalid fileData type');
+    }
+
+    if (createResponse['file_exists'] == true) {
+      // File already exists, create a local task to show it was found
+      final existingFile = SnCloudFile.fromJson(createResponse['file']);
+
+      // Create a task that shows as completed immediately
+      // Use a generated taskId since the server might not provide one for existing files
+      final taskId =
+          createResponse['task_id'] as String? ??
+          'existing-${DateTime.now().millisecondsSinceEpoch}';
+
+      final uploadTask = DriveTask(
+        id: DateTime.now().millisecondsSinceEpoch.toString(),
+        taskId: taskId,
+        fileName: fileName,
+        contentType: contentType,
+        fileSize: totalSize,
+        uploadedBytes: totalSize,
+        totalChunks: 1, // For existing files, we consider it as 1 chunk
+        uploadedChunks: 1,
+        status: DriveTaskStatus.completed,
+        createdAt: DateTime.now(),
+        updatedAt: DateTime.now(),
+        type: 'FileUpload',
+        poolId: poolId,
+        bundleId: bundleId,
+        encryptPassword: encryptPassword,
+        expiredAt: expiredAt,
+      );
+
+      ref.read(uploadTasksProvider.notifier).addUploadTask(uploadTask);
+
+      return existingFile;
+    }
+
+    final taskId = createResponse['task_id'] as String;
+    final chunkSize = createResponse['chunk_size'] as int;
+    final chunksCount = createResponse['chunks_count'] as int;
+
+    // Store upload metadata for when task.created event arrives
+    talker.info('[UploadTasks] Storing metadata for taskId: $taskId');
+    ref
+        .read(uploadTasksProvider.notifier)
+        .storeUploadMetadata(
+          taskId,
+          fileName: fileName,
+          contentType: contentType,
+          fileSize: totalSize,
+          totalChunks: chunksCount,
+          poolId: poolId,
+          bundleId: bundleId,
+          encryptPassword: encryptPassword,
+          expiredAt: expiredAt,
+        );
+
+    // Step 2: Upload chunks
+    int bytesUploaded = 0;
+    if (fileData is XFile) {
+      // Use stream for XFile
+      final subscription = fileData.openRead().listen(null);
+      subscription.pause();
+      for (int i = 0; i < chunksCount; i++) {
+        subscription.resume();
+        final chunkData = await _readNextChunkFromStream(
+          subscription,
+          chunkSize,
+        );
+        await uploadChunk(
+          taskId: taskId,
+          chunkIndex: i,
+          chunkData: chunkData,
+          onSendProgress: (sent, total) {
+            final overallProgress = (bytesUploaded + sent) / totalSize;
+            onProgress?.call(overallProgress, Duration.zero);
+            // Update transmission progress in UI
+            ref
+                .read(uploadTasksProvider.notifier)
+                .updateTransmissionProgress(taskId, overallProgress);
+          },
+        );
+        bytesUploaded += chunkData.length;
+      }
+      subscription.cancel();
+    } else if (fileData is Uint8List) {
+      // Use old way for Uint8List
+      final chunks = <Uint8List>[];
+      for (int i = 0; i < fileData.length; i += chunkSize) {
+        final end =
+            i + chunkSize > fileData.length ? fileData.length : i + chunkSize;
+        chunks.add(Uint8List.fromList(fileData.sublist(i, end)));
+      }
+
+      // Upload each chunk
+      for (int i = 0; i < chunks.length; i++) {
+        await uploadChunk(
+          taskId: taskId,
+          chunkIndex: i,
+          chunkData: chunks[i],
+          onSendProgress: (sent, total) {
+            final overallProgress = (bytesUploaded + sent) / totalSize;
+            onProgress?.call(overallProgress, Duration.zero);
+            // Update transmission progress in UI
+            ref
+                .read(uploadTasksProvider.notifier)
+                .updateTransmissionProgress(taskId, overallProgress);
+          },
+        );
+        bytesUploaded += chunks[i].length;
+      }
+    } else {
+      throw ArgumentError('Invalid fileData type');
+    }
+
+    // Step 3: Complete upload
+    onProgress?.call(null, Duration.zero);
+    return await completeUpload(taskId);
+  }
+}
--- a/lib/route.dart
+++ b/lib/route.dart
@@ -8,15 +8,13 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/screens/about.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';
-import 'package:island/screens/developers/edit_bot.dart';
 import 'package:island/screens/developers/hub.dart';
-import 'package:island/screens/developers/new_app.dart';
-import 'package:island/screens/developers/new_bot.dart';
 import 'package:island/screens/developers/edit_project.dart';
 import 'package:island/screens/developers/new_project.dart';
 import 'package:island/screens/discovery/articles.dart';
+import 'package:island/models/file.dart';
 import 'package:island/screens/files/file_list.dart';
+import 'package:island/screens/files/file_detail.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';
@@ -32,7 +30,6 @@ 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';
@@ -46,12 +43,11 @@ 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_form.dart';
 import 'package:island/screens/creators/webfeed/webfeed_list.dart';
-import 'package:island/screens/poll/poll_editor.dart';
 import 'package:island/screens/posts/compose.dart';
+import 'package:island/screens/posts/compose_article.dart';
 import 'package:island/screens/posts/post_detail.dart';
-import 'package:island/screens/posts/pub_profile.dart';
+import 'package:island/screens/posts/publisher_profile.dart';
 import 'package:island/screens/auth/login.dart';
 import 'package:island/screens/auth/create_account.dart';
 import 'package:island/screens/settings.dart';
@@ -106,22 +102,19 @@ final routerProvider = Provider<GoRouter>((ref) {
        routes: [
          // Standalone routes without bottom navigation
          GoRoute(
-            name: 'postCompose',
-            path: '/posts/compose',
+            name: 'articleCompose',
+            path: '/articles/compose',
            builder:
-                (context, state) => PostComposeScreen(
+                (context, state) => ArticleComposeScreen(
                  initialState: state.extra as PostComposeInitialState?,
-                  type:
-                      int.tryParse(state.uri.queryParameters['type'] ?? '0') ??
-                      0,
                ),
          ),
          GoRoute(
-            name: 'postEdit',
-            path: '/posts/:id/edit',
+            name: 'articleEdit',
+            path: '/articles/:id/edit',
            builder: (context, state) {
              final id = state.pathParameters['id']!;
-              return PostEditScreen(id: id);
+              return ArticleEditScreen(id: id);
            },
          ),
          GoRoute(
@@ -132,11 +125,6 @@ final routerProvider = Provider<GoRouter>((ref) {
              return CallScreen(roomId: id);
            },
          ),
-          GoRoute(
-            name: 'thought',
-            path: '/thought',
-            builder: (context, state) => const ThoughtScreen(),
-          ),
          GoRoute(
            name: 'logs',
            path: '/logs',
@@ -275,11 +263,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                    path: '/chat',
                    builder: (context, state) => const ChatListScreen(),
                  ),
-                  GoRoute(
-                    name: 'chatNew',
-                    path: '/chat/new',
-                    builder: (context, state) => const NewChatScreen(),
-                  ),
                  GoRoute(
                    name: 'chatRoom',
                    path: '/chat/:id',
@@ -288,14 +271,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                      return ChatRoomScreen(id: id);
                    },
                  ),
-                  GoRoute(
-                    name: 'chatEdit',
-                    path: '/chat/:id/edit',
-                    builder: (context, state) {
-                      final id = state.pathParameters['id']!;
-                      return EditChatScreen(id: id);
-                    },
-                  ),
                  GoRoute(
                    name: 'chatDetail',
                    path: '/chat/:id/detail',
@@ -402,11 +377,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                    path: '/account/wallet',
                    builder: (context, state) => const WalletScreen(),
                  ),
-                  GoRoute(
-                    name: 'files',
-                    path: '/account/files',
-                    builder: (context, state) => const FileListScreen(),
-                  ),
                  GoRoute(
                    name: 'relationships',
                    path: '/account/relationships',
@@ -451,6 +421,38 @@ final routerProvider = Provider<GoRouter>((ref) {
                  return AccountProfileScreen(name: name);
                },
              ),
+
+              // Files tab
+              GoRoute(
+                name: 'files',
+                path: '/files',
+                builder: (context, state) => const FileListScreen(),
+                routes: [
+                  GoRoute(
+                    name: 'fileDetail',
+                    path: ':id',
+                    builder: (context, state) {
+                      // For now, we'll need to pass the file object through extra
+                      // This will be updated when we modify the file list navigation
+                      final file = state.extra as SnCloudFile?;
+                      if (file != null) {
+                        return FileDetailScreen(item: file);
+                      }
+                      // Fallback - this shouldn't happen in normal flow
+                      Navigator.of(context).pop();
+                      return const SizedBox.shrink();
+                    },
+                  ),
+                ],
+              ),
+
+              // SN-chan tab
+              GoRoute(
+                name: 'thought',
+                path: '/thought',
+                builder: (context, state) => const ThoughtScreen(),
+              ),
+
              // Creator hub tab
              GoRoute(
                name: 'creatorHub',
@@ -483,28 +485,7 @@ final routerProvider = Provider<GoRouter>((ref) {
                      return CreatorPollListScreen(pubName: name);
                    },
                  ),
-                  // Poll routes
-                  GoRoute(
-                    name: 'creatorPollNew',
-                    path: ':name/polls/new',
-                    builder: (context, state) {
-                      final name = state.pathParameters['name']!;
-                      // initialPollId left null for create; initialPublisher prefilled
-                      return PollEditorScreen(initialPublisher: name);
-                    },
-                  ),
-                  GoRoute(
-                    name: 'creatorPollEdit',
-                    path: ':name/polls/:id/edit',
-                    builder: (context, state) {
-                      final name = state.pathParameters['name']!;
-                      final id = state.pathParameters['id']!;
-                      return PollEditorScreen(
-                        initialPollId: id,
-                        initialPublisher: name,
-                      );
-                    },
-                  ),
+
                  GoRoute(
                    name: 'creatorStickers',
                    path: ':name/stickers',
@@ -513,19 +494,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                      return StickersScreen(pubName: name);
                    },
                  ),
-                  GoRoute(
-                    name: 'creatorNew',
-                    path: 'new',
-                    builder: (context, state) => const NewPublisherScreen(),
-                  ),
-                  GoRoute(
-                    name: 'creatorEdit',
-                    path: ':name/edit',
-                    builder: (context, state) {
-                      final name = state.pathParameters['name']!;
-                      return EditPublisherScreen(name: name);
-                    },
-                  ),
                ],
              ),

@@ -572,25 +540,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                      return const SizedBox.shrink(); // Temporary placeholder
                    },
                    routes: [
-                      GoRoute(
-                        name: 'developerAppNew',
-                        path: 'apps/new',
-                        builder:
-                            (context, state) => NewCustomAppScreen(
-                              publisherName: state.pathParameters['name']!,
-                              projectId: state.pathParameters['projectId']!,
-                            ),
-                      ),
-                      GoRoute(
-                        name: 'developerAppEdit',
-                        path: 'apps/:id/edit',
-                        builder:
-                            (context, state) => EditAppScreen(
-                              publisherName: state.pathParameters['name']!,
-                              projectId: state.pathParameters['projectId']!,
-                              id: state.pathParameters['id']!,
-                            ),
-                      ),
                      GoRoute(
                        name: 'developerAppDetail',
                        path: 'apps/:appId',
@@ -601,15 +550,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                              appId: state.pathParameters['appId']!,
                            ),
                      ),
-                      GoRoute(
-                        name: 'developerBotNew',
-                        path: 'bots/new',
-                        builder:
-                            (context, state) => NewBotScreen(
-                              publisherName: state.pathParameters['name']!,
-                              projectId: state.pathParameters['projectId']!,
-                            ),
-                      ),
                      GoRoute(
                        name: 'developerBotDetail',
                        path: 'bots/:botId',
@@ -620,16 +560,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                              botId: state.pathParameters['botId']!,
                            ),
                      ),
-                      GoRoute(
-                        name: 'developerBotEdit',
-                        path: 'bots/:id/edit',
-                        builder:
-                            (context, state) => EditBotScreen(
-                              publisherName: state.pathParameters['name']!,
-                              projectId: state.pathParameters['projectId']!,
-                              id: state.pathParameters['id']!,
-                            ),
-                      ),
                    ],
                  ),
                ],
--- a/lib/screens/account.dart
+++ b/lib/screens/account.dart
@@ -8,6 +8,7 @@ import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/account/account_name.dart';
+import 'package:island/widgets/account/activity_presence.dart';
 import 'package:island/widgets/account/status.dart';
 import 'package:island/widgets/account/leveling_progress.dart';
 import 'package:island/widgets/alert.dart';
@@ -74,72 +75,125 @@ class AccountScreen extends HookConsumerWidget {
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  if (user.value?.profile.background?.id != null)
-                    ClipRRect(
-                      borderRadius: BorderRadius.only(
-                        topLeft: Radius.circular(8),
-                        topRight: Radius.circular(8),
-                      ),
-                      child: AspectRatio(
-                        aspectRatio: 16 / 7,
-                        child: CloudImageWidget(
-                          file: user.value?.profile.background,
-                          fit: BoxFit.cover,
+                    Stack(
+                      clipBehavior: Clip.none,
+                      children: [
+                        ClipRRect(
+                          borderRadius: BorderRadius.only(
+                            topLeft: Radius.circular(8),
+                            topRight: Radius.circular(8),
+                          ),
+                          child: AspectRatio(
+                            aspectRatio: 16 / 7,
+                            child: CloudImageWidget(
+                              file: user.value?.profile.background,
+                              fit: BoxFit.cover,
+                            ),
+                          ),
                        ),
-                      ),
+                        Positioned(
+                          bottom: -24,
+                          left: 16,
+                          child: GestureDetector(
+                            child: ProfilePictureWidget(
+                              file: user.value?.profile.picture,
+                              radius: 32,
+                            ),
+                            onTap: () {
+                              context.pushNamed(
+                                'accountProfile',
+                                pathParameters: {'name': user.value!.name},
+                              );
+                            },
+                          ),
+                        ),
+                      ],
                    ),
-                  Row(
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    spacing: 16,
-                    children: [
-                      GestureDetector(
-                        child: ProfilePictureWidget(
-                          file: user.value?.profile.picture,
-                          radius: 24,
-                        ),
-                        onTap: () {
-                          context.pushNamed(
-                            'accountProfile',
-                            pathParameters: {'name': user.value!.name},
-                          );
-                        },
-                      ),
-                      Expanded(
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Row(
-                              spacing: 4,
-                              crossAxisAlignment: CrossAxisAlignment.baseline,
-                              textBaseline: TextBaseline.alphabetic,
+                  Builder(
+                    builder: (context) {
+                      final hasBackground =
+                          user.value?.profile.background?.id != null;
+                      return Row(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        spacing: hasBackground ? 0 : 16,
+                        children: [
+                          if (!hasBackground)
+                            GestureDetector(
+                              child: ProfilePictureWidget(
+                                file: user.value?.profile.picture,
+                                radius: 24,
+                              ),
+                              onTap: () {
+                                context.pushNamed(
+                                  'accountProfile',
+                                  pathParameters: {'name': user.value!.name},
+                                );
+                              },
+                            ).padding(bottom: 12),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
                              children: [
-                                Flexible(
-                                  child: AccountName(
-                                    account: user.value!,
-                                    style: TextStyle(
-                                      fontSize: 16,
-                                      fontWeight: FontWeight.bold,
+                                Row(
+                                  spacing: 4,
+                                  crossAxisAlignment: CrossAxisAlignment.end,
+                                  children: [
+                                    Flexible(
+                                      child: AccountName(
+                                        account: user.value!,
+                                        style: TextStyle(
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.bold,
+                                        ),
+                                      ),
                                    ),
-                                  ),
+                                    Flexible(
+                                      child: Text(
+                                        '@${user.value!.name}',
+                                      ).fontSize(11).padding(bottom: 2.5),
+                                    ),
+                                  ],
                                ),
-                                Flexible(child: Text('@${user.value!.name}')),
+                                Text(
+                                  (user.value!.profile.bio.isNotEmpty)
+                                      ? user.value!.profile.bio
+                                      : 'descriptionNone'.tr(),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                                const Gap(12),
                              ],
                            ),
-                            Text(
-                              (user.value!.profile.bio.isNotEmpty)
-                                  ? user.value!.profile.bio
-                                  : 'descriptionNone'.tr(),
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                          ],
-                        ),
-                      ),
-                    ],
-                  ).padding(horizontal: 16, top: 16),
-                  AccountStatusCreationWidget(uname: user.value!.name),
+                          ),
+                        ],
+                      ).padding(
+                        left: 16,
+                        right: 16,
+                        top: 16 + (hasBackground ? 16 : 0),
+                      );
+                    },
+                  ),
                ],
              ),
            ).padding(horizontal: 8),
+            Card(
+              margin: EdgeInsets.zero,
+              child: Column(
+                children: [
+                  AccountStatusCreationWidget(uname: user.value!.name),
+                  ActivityPresenceWidget(
+                    uname: user.value!.name,
+                    isCompact: true,
+                    compactPadding: const EdgeInsets.only(
+                      left: 16,
+                      right: 16,
+                      bottom: 8,
+                      top: 4,
+                    ),
+                  ),
+                ],
+              ),
+            ).padding(horizontal: 12, bottom: 4),
            LevelingProgressCard(
              isCompact: true,
              level: user.value!.profile.level,
@@ -211,62 +265,93 @@ class AccountScreen extends HookConsumerWidget {
                ],
              ).padding(horizontal: 12),
            const SizedBox.shrink(),
-            SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: Row(
-                spacing: 8,
-                children: [
-                  Card(
-                    margin: EdgeInsets.zero,
-                    child: InkWell(
-                      borderRadius: BorderRadius.circular(8),
+            ConstrainedBox(
+              constraints: BoxConstraints(
+                maxWidth: MediaQuery.of(context).size.width,
+              ),
+              child: LayoutBuilder(
+                builder: (context, constraints) {
+                  const minWidth = 160.0;
+                  const spacing = 8.0;
+                  const padding = 24.0; // 12 * 2
+                  final totalMin = 3 * minWidth + 2 * spacing;
+                  final availableWidth = constraints.maxWidth - padding;
+                  final children = [
+                    Card(
+                      margin: EdgeInsets.zero,
+                      child: InkWell(
+                        borderRadius: BorderRadius.circular(8),
+                        child: Row(
+                          spacing: 8,
+                          children: [
+                            Icon(Symbols.settings, size: 20),
+                            Text('appSettings').tr().fontSize(13).bold(),
+                          ],
+                        ).padding(horizontal: 16, vertical: 12),
+                        onTap: () {
+                          context.pushNamed('settings');
+                        },
+                      ),
+                    ),
+                    Card(
+                      margin: EdgeInsets.zero,
+                      child: InkWell(
+                        borderRadius: BorderRadius.circular(8),
+                        child: Row(
+                          spacing: 8,
+                          children: [
+                            Icon(Symbols.person_edit, size: 20),
+                            Text('updateYourProfile').tr().fontSize(13).bold(),
+                          ],
+                        ).padding(horizontal: 16, vertical: 12),
+                        onTap: () {
+                          context.pushNamed('profileUpdate');
+                        },
+                      ),
+                    ),
+                    Card(
+                      margin: EdgeInsets.zero,
+                      child: InkWell(
+                        borderRadius: BorderRadius.circular(8),
+                        child: Row(
+                          spacing: 8,
+                          children: [
+                            Icon(Symbols.manage_accounts, size: 20),
+                            Text('accountSettings').tr().fontSize(13).bold(),
+                          ],
+                        ).padding(horizontal: 16, vertical: 12),
+                        onTap: () {
+                          context.pushNamed('accountSettings');
+                        },
+                      ),
+                    ),
+                  ];
+                  if (availableWidth > totalMin) {
+                    return Row(
+                      spacing: 8,
+                      children:
+                          children
+                              .map((child) => Expanded(child: child))
+                              .toList(),
+                    ).padding(horizontal: 12).height(48);
+                  } else {
+                    return SingleChildScrollView(
+                      scrollDirection: Axis.horizontal,
                      child: Row(
                        spacing: 8,
-                        children: [
-                          Icon(Symbols.settings, size: 20),
-                          Text('appSettings').tr().fontSize(13).bold(),
-                        ],
-                      ).padding(horizontal: 16, vertical: 12),
-                      onTap: () {
-                        context.pushNamed('settings');
-                      },
-                    ),
-                  ),
-                  Card(
-                    margin: EdgeInsets.zero,
-                    child: InkWell(
-                      borderRadius: BorderRadius.circular(8),
-                      child: Row(
-                        spacing: 8,
-                        children: [
-                          Icon(Symbols.person_edit, size: 20),
-                          Text('updateYourProfile').tr().fontSize(13).bold(),
-                        ],
-                      ).padding(horizontal: 16, vertical: 12),
-                      onTap: () {
-                        context.pushNamed('profileUpdate');
-                      },
-                    ),
-                  ),
-                  Card(
-                    margin: EdgeInsets.zero,
-                    child: InkWell(
-                      borderRadius: BorderRadius.circular(8),
-                      child: Row(
-                        spacing: 8,
-                        children: [
-                          Icon(Symbols.manage_accounts, size: 20),
-                          Text('accountSettings').tr().fontSize(13).bold(),
-                        ],
-                      ).padding(horizontal: 16, vertical: 12),
-                      onTap: () {
-                        context.pushNamed('accountSettings');
-                      },
-                    ),
-                  ),
-                ],
-              ).padding(horizontal: 12),
-            ).height(48),
+                        children:
+                            children
+                                .map(
+                                  (child) =>
+                                      SizedBox(width: minWidth, child: child),
+                                )
+                                .toList(),
+                      ).padding(horizontal: 12),
+                    ).height(48);
+                  }
+                },
+              ),
+            ),
            ListTile(
              minTileHeight: 48,
              leading: const Icon(Symbols.notifications),
@@ -290,6 +375,17 @@ class AccountScreen extends HookConsumerWidget {
                );
              },
            ),
+            if (!isWideScreen(context))
+              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.goNamed('files');
+                },
+              ),
            ListTile(
              minTileHeight: 48,
              leading: const Icon(Symbols.wallet),
@@ -300,16 +396,6 @@ 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),
--- a/lib/screens/account/me/account_settings.dart
+++ b/lib/screens/account/me/account_settings.dart
@@ -84,9 +84,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
        'accountPasswordChange'.tr(),
      );
      if (!confirm || !context.mounted) return;
-      final captchaTk = await Navigator.of(
-        context,
-      ).push(MaterialPageRoute(builder: (context) => CaptchaScreen()));
+      final captchaTk = await CaptchaScreen.show(context);
      if (captchaTk == null) return;
      try {
        if (context.mounted) showLoadingModal(context);
--- a/lib/screens/account/me/profile_update.dart
+++ b/lib/screens/account/me/profile_update.dart
@@ -76,7 +76,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
      try {
        final cloudFile =
            await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
              fileData: UniversalFile(
                data: result,
                type: UniversalFileType.image,
--- a/lib/screens/account/me/settings_connections.dart
+++ b/lib/screens/account/me/settings_connections.dart
@@ -1,5 +1,4 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -9,7 +8,6 @@ import 'package:island/models/auth.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/screens/account/me/account_settings.dart';
-import 'package:island/screens/auth/oidc.native.dart';
 import 'package:island/utils/text.dart';
 import 'package:island/services/time.dart';
 import 'package:island/widgets/alert.dart';
@@ -32,12 +30,20 @@ Widget getProviderIcon(String provider, {double size = 24, Color? color}) {
    case 'github':
    case 'discord':
    case 'afdian':
+    case 'steam':
      return SvgPicture.asset(
        'assets/images/oidc/$providerLower.svg',
        width: size,
        height: size,
        color: color,
      );
+    case 'spotify':
+      return Image.asset(
+        'assets/images/oidc/spotify.png',
+        width: size,
+        height: size,
+        color: color,
+      );
    default:
      return Icon(Symbols.link, size: size);
  }
@@ -57,6 +63,10 @@ String getLocalizedProviderName(String provider) {
      return 'accountConnectionProviderDiscord'.tr();
    case 'afdian':
      return 'accountConnectionProviderAfdian'.tr();
+    case 'spotify':
+      return 'accountConnectionProviderSpotify'.tr();
+    case 'steam':
+      return 'accountConnectionProviderSteam'.tr();
    default:
      return provider;
  }
@@ -156,6 +166,8 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
      'github',
      'discord',
      'afdian',
+      'spotify',
+      'steam',
    ];

    Future<void> addConnection() async {
@@ -191,34 +203,14 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
          } finally {
            if (context.mounted) hideLoadingModal(context);
          }
-        case 'microsoft':
-        case 'google':
-        case 'github':
-        case 'discord':
-        case 'afdian':
-          if (kIsWeb) {
-            final serverUrl = ref.watch(serverUrlProvider);
-            final accessToken = ref.watch(tokenProvider);
-            launchUrlString(
-              '$serverUrl/pass/auth/login/${selectedProvider.value}?tk=${accessToken!.token}',
-            );
-          } else {
-            await Navigator.of(context, rootNavigator: true).push(
-              MaterialPageRoute(
-                builder:
-                    (context) => OidcScreen(
-                      provider: selectedProvider.value.toLowerCase(),
-                      title:
-                          'Connect with ${selectedProvider.value.capitalizeEachWord()}',
-                    ),
-              ),
-            );
-            if (context.mounted) Navigator.pop(context, true);
-          }
-          break;
        default:
-          showSnackBar('accountConnectionAddError'.tr());
-          return;
+          final serverUrl = ref.watch(serverUrlProvider);
+          final accessToken = ref.watch(tokenProvider);
+          launchUrlString(
+            '$serverUrl/pass/auth/login/${selectedProvider.value}?tk=${accessToken!.token}',
+          );
+          if (context.mounted) Navigator.pop(context, true);
+          break;
      }
    }

--- a/lib/screens/account/profile.dart
+++ b/lib/screens/account/profile.dart
@@ -22,6 +22,7 @@ import 'package:island/utils/text.dart';
 import 'package:island/services/time.dart';
 import 'package:island/services/timezone/native.dart';
 import 'package:island/widgets/account/account_name.dart';
+import 'package:island/widgets/account/activity_presence.dart';
 import 'package:island/widgets/account/badge.dart';
 import 'package:island/widgets/account/fortune_graph.dart';
 import 'package:island/widgets/account/leveling_progress.dart';
@@ -53,56 +54,134 @@ class _AccountBasicInfo extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          ProfilePictureWidget(file: data.profile.picture, radius: 32),
-          const Gap(20),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.stretch,
-              children: [
-                Row(
+    return Card(
+      child: Builder(
+        builder: (context) {
+          final hasBackground = data.profile.background?.id != null;
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              if (isWideScreen(context) && hasBackground)
+                Stack(
+                  clipBehavior: Clip.none,
                  children: [
-                    AccountName(account: data, style: TextStyle(fontSize: 20)),
-                    const Gap(6),
-                    Flexible(
-                      child: Text(
-                        '@${data.name}',
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                      ).fontSize(14).opacity(0.85),
+                    ClipRRect(
+                      borderRadius: BorderRadius.only(
+                        topLeft: Radius.circular(8),
+                        topRight: Radius.circular(8),
+                      ),
+                      child: AspectRatio(
+                        aspectRatio: 16 / 7,
+                        child: CloudImageWidget(
+                          file: data.profile.background,
+                          fit: BoxFit.cover,
+                        ),
+                      ),
+                    ),
+                    Positioned(
+                      bottom: -24,
+                      left: 16,
+                      child: ProfilePictureWidget(
+                        file: data.profile.picture,
+                        radius: 32,
+                      ),
                    ),
                  ],
                ),
-                if (accountDeveloper.value != null)
-                  Row(
-                    spacing: 7,
+              Builder(
+                builder: (context) {
+                  final showBackground = isWideScreen(context) && hasBackground;
+                  return Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    spacing: showBackground ? 0 : 20,
                    children: [
-                      const Icon(Symbols.smart_toy, size: 18),
-                      Text(
-                        'botAutomatedBy'.tr(
-                          args: [accountDeveloper.value!.publisher!.nick],
+                      if (!showBackground)
+                        ProfilePictureWidget(
+                          file: data.profile.picture,
+                          radius: 32,
                        ),
-                      ).fontSize(13),
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Row(
+                              spacing: 4,
+                              crossAxisAlignment: CrossAxisAlignment.end,
+                              children: [
+                                Flexible(
+                                  child: AccountName(
+                                    account: data,
+                                    style: TextStyle(
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                ),
+                                if (isWideScreen(context))
+                                  Flexible(
+                                    child: Text(
+                                      '@${data.name}',
+                                    ).fontSize(11).padding(bottom: 2.5),
+                                  ),
+                              ],
+                            ),
+                            if (!isWideScreen(context))
+                              Text(
+                                '@${data.name}',
+                              ).fontSize(11).padding(bottom: 2.5),
+                            Text(
+                              (data.profile.bio.isNotEmpty)
+                                  ? data.profile.bio
+                                  : 'descriptionNone'.tr(),
+                              maxLines: 1,
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                            if (accountDeveloper.value != null)
+                              Row(
+                                spacing: 7,
+                                children: [
+                                  const Icon(Symbols.smart_toy, size: 18),
+                                  Text(
+                                    'botAutomatedBy'.tr(
+                                      args: [
+                                        accountDeveloper.value!.publisher!.nick,
+                                      ],
+                                    ),
+                                  ).fontSize(13),
+                                ],
+                              ).opacity(0.75).padding(top: 4),
+                            const Gap(4),
+                            AccountStatusWidget(
+                              uname: uname,
+                              padding: EdgeInsets.zero,
+                            ),
+                            const Gap(8),
+                          ],
+                        ),
+                      ),
+                      IconButton(
+                        onPressed: () {
+                          SharePlus.instance.share(
+                            ShareParams(
+                              uri: Uri.parse(
+                                'https://solian.app/@${data.name}',
+                              ),
+                            ),
+                          );
+                        },
+                        icon: const Icon(Symbols.share),
+                      ),
                    ],
-                  ).opacity(0.75),
-                const Gap(4),
-                AccountStatusWidget(uname: uname, padding: EdgeInsets.zero),
-              ],
-            ),
-          ),
-          IconButton(
-            onPressed: () {
-              SharePlus.instance.share(
-                ShareParams(uri: Uri.parse('https://solian.app/@${data.name}')),
-              );
-            },
-            icon: const Icon(Symbols.share),
-          ),
-        ],
+                  ).padding(
+                    left: 16,
+                    right: 16,
+                    top: 16 + (showBackground ? 16 : 0),
+                  );
+                },
+              ),
+            ],
+          );
+        },
      ),
    );
  }
@@ -205,7 +284,7 @@ class _AccountProfileDetail extends StatelessWidget {
        child: Row(
          spacing: 6,
          children: [
-            Icon(Symbols.star, size: 17, fill: 1).padding(right: 2),
+            Icon(Symbols.attribution, size: 17, fill: 1).padding(right: 2),
            Text('${data.profile.socialCredits.toStringAsFixed(2)} pts'),
            Text('·').bold(),
            switch (data.profile.socialCreditsLevel) {
@@ -253,30 +332,34 @@ class _AccountProfileDetail extends StatelessWidget {
              children: _buildSubcolumn(),
            ),
          if (data.profile.timeZone.isNotEmpty && !kIsWeb)
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text('timeZone').tr().bold(),
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.baseline,
-                  textBaseline: TextBaseline.alphabetic,
-                  spacing: 6,
-                  children: [
-                    Text(data.profile.timeZone),
-                    Text(
-                      getTzInfo(
-                        data.profile.timeZone,
-                      ).$2.formatCustomGlobal('HH:mm'),
-                    ),
-                    Text(
-                      getTzInfo(data.profile.timeZone).$1.formatOffsetLocal(),
-                    ).fontSize(11),
-                    Text(
-                      'UTC${getTzInfo(data.profile.timeZone).$1.formatOffset()}',
-                    ).fontSize(11).opacity(0.75),
-                  ],
-                ),
-              ],
+            Builder(
+              builder: (context) {
+                try {
+                  final tzInfo = getTzInfo(data.profile.timeZone);
+                  return Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text('timeZone').tr().bold(),
+                      Row(
+                        crossAxisAlignment: CrossAxisAlignment.baseline,
+                        textBaseline: TextBaseline.alphabetic,
+                        spacing: 6,
+                        children: [
+                          Text(data.profile.timeZone),
+                          Text(tzInfo.$2.formatCustomGlobal('HH:mm')),
+                          Text(tzInfo.$1.formatOffsetLocal()).fontSize(11),
+                          Text(
+                            'UTC${tzInfo.$1.formatOffset()}',
+                          ).fontSize(11).opacity(0.75),
+                        ],
+                      ),
+                    ],
+                  );
+                } catch (e) {
+                  // Hide timezone section if timezone is invalid
+                  return const SizedBox.shrink();
+                }
+              },
            ),
        ],
      ).padding(horizontal: 24, vertical: 16),
@@ -763,33 +846,14 @@ class AccountProfileScreen extends HookConsumerWidget {
                      color: appbarColor.value,
                      shadows: [appbarShadow],
                    ),
-                    flexibleSpace: Stack(
-                      children: [
-                        Positioned.fill(
-                          child:
-                              data.profile.background?.id != null
-                                  ? CloudImageWidget(
-                                    file: data.profile.background,
-                                  )
-                                  : Container(
-                                    color:
-                                        Theme.of(
-                                          context,
-                                        ).appBarTheme.backgroundColor,
-                                  ),
-                        ),
-                        FlexibleSpaceBar(
-                          title: Text(
-                            data.nick,
-                            style: TextStyle(
-                              color:
-                                  appbarColor.value ??
-                                  Theme.of(context).appBarTheme.foregroundColor,
-                              shadows: [appbarShadow],
-                            ),
-                          ),
-                        ),
-                      ],
+                    title: Text(
+                      data.nick,
+                      style: TextStyle(
+                        color:
+                            appbarColor.value ??
+                            Theme.of(context).appBarTheme.foregroundColor,
+                        shadows: [appbarShadow],
+                      ),
                    ),
                  )
                  : null,
@@ -805,7 +869,7 @@ class AccountProfileScreen extends HookConsumerWidget {
                                data: data,
                                uname: name,
                                accountDeveloper: accountDeveloper,
-                              ),
+                              ).padding(horizontal: 4, top: 20),
                            ),
                            if (data.badges.isNotEmpty)
                              SliverToBoxAdapter(
@@ -856,7 +920,12 @@ class AccountProfileScreen extends HookConsumerWidget {
                      Flexible(
                        child: CustomScrollView(
                          slivers: [
-                            SliverGap(24),
+                            SliverGap(18),
+                            SliverToBoxAdapter(
+                              child: ActivityPresenceWidget(
+                                uname: name,
+                              ).padding(horizontal: 4, top: 4, bottom: 4),
+                            ),
                            SliverToBoxAdapter(
                              child: _AccountPublisherList(
                                publishers: accountPublishers.value ?? [],
@@ -933,7 +1002,7 @@ class AccountProfileScreen extends HookConsumerWidget {
                          data: data,
                          uname: name,
                          accountDeveloper: accountDeveloper,
-                        ),
+                        ).padding(horizontal: 4, top: 8),
                      ),
                      if (data.badges.isNotEmpty)
                        SliverToBoxAdapter(
@@ -977,6 +1046,11 @@ class AccountProfileScreen extends HookConsumerWidget {
                            data: data,
                          ).padding(horizontal: 4),
                        ),
+                      SliverToBoxAdapter(
+                        child: ActivityPresenceWidget(
+                          uname: name,
+                        ).padding(horizontal: 8, top: 4, bottom: 4),
+                      ),
                      SliverToBoxAdapter(
                        child: _AccountPublisherList(
                          publishers: accountPublishers.value ?? [],
--- a/lib/screens/auth/captcha.native.dart
+++ b/lib/screens/auth/captcha.native.dart
@@ -2,9 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:island/screens/auth/captcha.config.dart';
-import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/sheet.dart';

 class CaptchaScreen extends ConsumerWidget {
+  static Future<String?> show(BuildContext context) {
+    return showModalBottomSheet<String>(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => const CaptchaScreen(),
+    );
+  }
+
  const CaptchaScreen({super.key});

  @override
@@ -13,9 +21,9 @@ class CaptchaScreen extends ConsumerWidget {

    if (!captchaUrl.hasValue) return Center(child: CircularProgressIndicator());

-    return AppScaffold(
-      appBar: AppBar(title: Text("Anti-Robot")),
-      body: InAppWebView(
+    return SheetScaffold(
+      titleText: "Anti-Robot",
+      child: InAppWebView(
        initialUrlRequest: URLRequest(
          url: WebUri('${captchaUrl.value}?redirect_uri=solian://captcha'),
        ),
--- a/lib/screens/auth/captcha.web.dart
+++ b/lib/screens/auth/captcha.web.dart
@@ -4,11 +4,19 @@ import 'dart:ui_web' as ui;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/screens/auth/captcha.config.dart';
-import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/sheet.dart';
 import 'package:web/web.dart' as web;
 import 'package:flutter/material.dart';

 class CaptchaScreen extends ConsumerStatefulWidget {
+  static Future<String?> show(BuildContext context) {
+    return showModalBottomSheet<String>(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => const CaptchaScreen(),
+    );
+  }
+
  const CaptchaScreen({super.key});

  @override
@@ -61,9 +69,9 @@ class _CaptchaScreenState extends ConsumerState<CaptchaScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
-      appBar: AppBar(title: Text("Anti-Robot")),
-      body:
+    return SheetScaffold(
+      titleText: "Anti-Robot",
+      child:
          _isInitialized
              ? HtmlElementView(viewType: 'captcha-iframe')
              : Center(child: CircularProgressIndicator()),
--- a/lib/screens/auth/create_account.dart
+++ b/lib/screens/auth/create_account.dart
@@ -1,317 +1,22 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:email_validator/email_validator.dart';
 import 'package:flutter/material.dart';
-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:island/pods/network.dart';
-import 'package:island/screens/account/me/profile_update.dart';
-import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
-import 'package:material_symbols_icons/symbols.dart';
-import 'package:styled_widget/styled_widget.dart';
-import 'package:url_launcher/url_launcher_string.dart';

-import 'captcha.dart';
+import 'create_account_content.dart';

 class CreateAccountScreen extends HookConsumerWidget {
  const CreateAccountScreen({super.key});

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final formKey = useMemoized(GlobalKey<FormState>.new, const []);
-
-    final emailController = useTextEditingController();
-    final usernameController = useTextEditingController();
-    final nicknameController = useTextEditingController();
-    final passwordController = useTextEditingController();
-
-    void showPostCreateModal() {
-      showModalBottomSheet(
-        isScrollControlled: true,
-        context: context,
-        builder: (context) => _PostCreateModal(),
-      );
-    }
-
-    void performAction() async {
-      if (!formKey.currentState!.validate()) return;
-
-      final captchaTk = await Navigator.of(
-        context,
-      ).push(MaterialPageRoute(builder: (context) => CaptchaScreen()));
-      if (captchaTk == null) return;
-
-      if (!context.mounted) return;
-
-      try {
-        showLoadingModal(context);
-        final client = ref.watch(apiClientProvider);
-        await client.post(
-          '/pass/accounts',
-          data: {
-            'name': usernameController.text,
-            'nick': nicknameController.text,
-            'email': emailController.text,
-            'password': passwordController.text,
-            'language':
-                kServerSupportedLanguages[EasyLocalization.of(
-                  context,
-                )!.currentLocale.toString()] ??
-                'en-us',
-            'captcha_token': captchaTk,
-          },
-        );
-        if (!context.mounted) return;
-        hideLoadingModal(context);
-        showPostCreateModal();
-      } catch (err) {
-        if (context.mounted) hideLoadingModal(context);
-        showErrorAlert(err);
-      }
-    }
-
    return AppScaffold(
      isNoBackground: false,
      appBar: AppBar(
        leading: const PageBackButton(),
        title: Text('createAccount').tr(),
      ),
-      body:
-          StyledWidget(
-            Container(
-              constraints: const BoxConstraints(maxWidth: 380),
-              child: SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Align(
-                      alignment: Alignment.centerLeft,
-                      child: CircleAvatar(
-                        radius: 26,
-                        child: const Icon(Symbols.person_add, size: 28),
-                      ).padding(bottom: 8),
-                    ),
-                    Text(
-                      'createAccount',
-                      style: const TextStyle(
-                        fontSize: 28,
-                        fontWeight: FontWeight.w900,
-                      ),
-                    ).tr().padding(left: 4, bottom: 16),
-                    Form(
-                      key: formKey,
-                      autovalidateMode: AutovalidateMode.onUserInteraction,
-                      child: Column(
-                        children: [
-                          TextFormField(
-                            controller: usernameController,
-                            validator: (value) {
-                              if (value == null || value.isEmpty) {
-                                return 'fieldCannotBeEmpty'.tr();
-                              }
-                              return null;
-                            },
-                            autocorrect: false,
-                            enableSuggestions: false,
-                            autofillHints: const [AutofillHints.username],
-                            decoration: InputDecoration(
-                              isDense: true,
-                              border: const UnderlineInputBorder(),
-                              labelText: 'username'.tr(),
-                              helperText: 'usernameCannotChangeHint'.tr(),
-                            ),
-                            onTapOutside:
-                                (_) =>
-                                    FocusManager.instance.primaryFocus
-                                        ?.unfocus(),
-                          ),
-                          const Gap(12),
-                          TextFormField(
-                            controller: nicknameController,
-                            validator: (value) {
-                              if (value == null || value.isEmpty) {
-                                return 'fieldCannotBeEmpty'.tr();
-                              }
-                              return null;
-                            },
-                            autocorrect: false,
-                            autofillHints: const [AutofillHints.nickname],
-                            decoration: InputDecoration(
-                              isDense: true,
-                              border: const UnderlineInputBorder(),
-                              labelText: 'nickname'.tr(),
-                            ),
-                            onTapOutside:
-                                (_) =>
-                                    FocusManager.instance.primaryFocus
-                                        ?.unfocus(),
-                          ),
-                          const Gap(12),
-                          TextFormField(
-                            controller: emailController,
-                            validator: (value) {
-                              if (value == null || value.isEmpty) {
-                                return 'fieldCannotBeEmpty'.tr();
-                              }
-                              if (!EmailValidator.validate(value)) {
-                                return 'fieldEmailAddressMustBeValid'.tr();
-                              }
-                              return null;
-                            },
-                            autocorrect: false,
-                            enableSuggestions: false,
-                            autofillHints: const [AutofillHints.email],
-                            decoration: InputDecoration(
-                              isDense: true,
-                              border: const UnderlineInputBorder(),
-                              labelText: 'email'.tr(),
-                            ),
-                            onTapOutside:
-                                (_) =>
-                                    FocusManager.instance.primaryFocus
-                                        ?.unfocus(),
-                          ),
-                          const Gap(12),
-                          TextFormField(
-                            controller: passwordController,
-                            validator: (value) {
-                              if (value == null || value.isEmpty) {
-                                return 'fieldCannotBeEmpty'.tr();
-                              }
-                              return null;
-                            },
-                            obscureText: true,
-                            autocorrect: false,
-                            enableSuggestions: false,
-                            autofillHints: const [AutofillHints.password],
-                            decoration: InputDecoration(
-                              isDense: true,
-                              border: const UnderlineInputBorder(),
-                              labelText: 'password'.tr(),
-                            ),
-                            onTapOutside:
-                                (_) =>
-                                    FocusManager.instance.primaryFocus
-                                        ?.unfocus(),
-                          ),
-                        ],
-                      ).padding(horizontal: 7),
-                    ),
-                    const Gap(16),
-                    Align(
-                      alignment: Alignment.centerRight,
-                      child: StyledWidget(
-                        Container(
-                          constraints: const BoxConstraints(maxWidth: 290),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.end,
-                            children: [
-                              Text(
-                                'termAcceptNextWithAgree'.tr(),
-                                textAlign: TextAlign.end,
-                                style: Theme.of(
-                                  context,
-                                ).textTheme.bodySmall!.copyWith(
-                                  color: Theme.of(context).colorScheme.onSurface
-                                      .withAlpha((255 * 0.75).round()),
-                                ),
-                              ),
-                              Material(
-                                color: Colors.transparent,
-                                child: InkWell(
-                                  child: Row(
-                                    mainAxisSize: MainAxisSize.min,
-                                    children: [
-                                      Text('termAcceptLink').tr(),
-                                      const Gap(4),
-                                      const Icon(Symbols.launch, size: 14),
-                                    ],
-                                  ),
-                                  onTap: () {
-                                    launchUrlString(
-                                      'https://solsynth.dev/terms',
-                                    );
-                                  },
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ).padding(horizontal: 16),
-                    ),
-                    Align(
-                      alignment: Alignment.centerRight,
-                      child: TextButton(
-                        onPressed: () {
-                          performAction();
-                        },
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            Text("next").tr(),
-                            const Icon(Symbols.chevron_right),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ).padding(all: 24).center(),
-    );
-  }
-}
-
-class _PostCreateModal extends HookConsumerWidget {
-  const _PostCreateModal();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return Center(
-      child: ConstrainedBox(
-        constraints: const BoxConstraints(maxWidth: 280),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text('🎉').fontSize(32),
-            Text(
-              'postCreateAccountTitle'.tr(),
-              textAlign: TextAlign.center,
-            ).fontSize(17),
-            const Gap(18),
-            Text('postCreateAccountNext').tr().fontSize(19).bold(),
-            const Gap(4),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 6,
-              children: [
-                Text('\u2022'),
-                Expanded(child: Text('postCreateAccountNext1').tr()),
-              ],
-            ),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 6,
-              children: [
-                Text('\u2022'),
-                Expanded(child: Text('postCreateAccountNext2').tr()),
-              ],
-            ),
-            const Gap(6),
-            TextButton(
-              onPressed: () {
-                Navigator.pop(context);
-                context.pushReplacementNamed('login');
-              },
-              child: Text('login'.tr()),
-            ),
-          ],
-        ),
-      ),
+      body: CreateAccountContent(),
    );
  }
 }
--- a/lib/screens/auth/create_account_content.dart
+++ b/lib/screens/auth/create_account_content.dart
@@ -0,0 +1,486 @@
+import 'dart:convert';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:email_validator/email_validator.dart';
+import 'package:flutter/foundation.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:gap/gap.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/userinfo.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/screens/account/me/profile_update.dart';
+import 'package:island/services/event_bus.dart';
+import 'package:island/services/notify.dart';
+import 'package:island/services/udid.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+import 'captcha.dart';
+
+Widget getProviderIcon(String provider, {double size = 24, Color? color}) {
+  final providerLower = provider.toLowerCase();
+
+  // Check if we have an SVG for this provider
+  switch (providerLower) {
+    case 'apple':
+    case 'microsoft':
+    case 'google':
+    case 'github':
+    case 'discord':
+    case 'afdian':
+    case 'steam':
+      return SvgPicture.asset(
+        'assets/images/oidc/$providerLower.svg',
+        width: size,
+        height: size,
+        colorFilter:
+            color != null ? ColorFilter.mode(color, BlendMode.srcIn) : null,
+      );
+    case 'spotify':
+      return Image.asset(
+        'assets/images/oidc/spotify.png',
+        width: size,
+        height: size,
+        color: color,
+      );
+    default:
+      return Icon(Symbols.link, size: size);
+  }
+}
+
+class CreateAccountContent extends HookConsumerWidget {
+  const CreateAccountContent({super.key});
+
+  Map<String, dynamic> decodeJwt(String token) {
+    final parts = token.split('.');
+    if (parts.length != 3) throw FormatException('Invalid JWT');
+    final payload = parts[1];
+    final normalized = base64Url.normalize(payload);
+    final decoded = utf8.decode(base64Url.decode(normalized));
+    return json.decode(decoded);
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final formKey = useMemoized(GlobalKey<FormState>.new, const []);
+
+    final emailController = useTextEditingController();
+    final usernameController = useTextEditingController();
+    final nicknameController = useTextEditingController();
+    final passwordController = useTextEditingController();
+    final waitingForOidc = useState(false);
+    final onboardingToken = useState<String?>(null);
+
+    void showPostCreateModal() {
+      showModalBottomSheet(
+        isScrollControlled: true,
+        context: context,
+        builder: (context) => _PostCreateModal(),
+      );
+    }
+
+    void performAction() async {
+      if (!formKey.currentState!.validate()) return;
+
+      String endpoint = '/pass/accounts';
+      Map<String, dynamic> data = {};
+
+      if (onboardingToken.value != null) {
+        // OIDC onboarding
+        endpoint = '/pass/account/onboard';
+        data['onboarding_token'] = onboardingToken.value;
+        data['name'] = usernameController.text;
+        data['nick'] = nicknameController.text;
+        // Password is required in form, but might be optional
+      } else {
+        // Manual account creation
+        final captchaTk = await CaptchaScreen.show(context);
+        if (captchaTk == null) return;
+        if (!context.mounted) return;
+        data['captcha_token'] = captchaTk;
+        data['name'] = usernameController.text;
+        data['nick'] = nicknameController.text;
+        data['email'] = emailController.text;
+        data['password'] = passwordController.text;
+        data['language'] =
+            kServerSupportedLanguages[EasyLocalization.of(
+              context,
+            )!.currentLocale.toString()] ??
+            'en-us';
+      }
+
+      if (!context.mounted) return;
+
+      try {
+        showLoadingModal(context);
+        final client = ref.watch(apiClientProvider);
+        final resp = await client.post(endpoint, data: data);
+        if (endpoint == '/pass/account/onboard') {
+          // Onboard response has tokens, set them
+          final token = resp.data['token'];
+          setToken(ref.watch(sharedPreferencesProvider), token);
+          ref.invalidate(tokenProvider);
+          final userNotifier = ref.read(userInfoProvider.notifier);
+          await userNotifier.fetchUser();
+          final apiClient = ref.read(apiClientProvider);
+          subscribePushNotification(apiClient);
+          final wsNotifier = ref.read(websocketStateProvider.notifier);
+          wsNotifier.connect();
+          if (context.mounted) Navigator.pop(context, true);
+        } else {
+          if (!context.mounted) return;
+          hideLoadingModal(context);
+          onboardingToken.value = null; // reset
+          showPostCreateModal();
+        }
+      } catch (err) {
+        if (context.mounted) hideLoadingModal(context);
+        showErrorAlert(err);
+      }
+    }
+
+    useEffect(() {
+      final subscription = eventBus.on<OidcAuthCallbackEvent>().listen((
+        event,
+      ) async {
+        if (!waitingForOidc.value || !context.mounted) return;
+        waitingForOidc.value = false;
+        final client = ref.watch(apiClientProvider);
+        try {
+          // Exchange code for tokens
+          final resp = await client.post(
+            '/pass/auth/token',
+            data: {
+              'grant_type': 'authorization_code',
+              'code': event.challengeId,
+            },
+          );
+          final data = resp.data;
+          if (data.containsKey('onboarding_token')) {
+            // New user onboarding
+            final token = data['onboarding_token'] as String;
+            final decoded = decodeJwt(token);
+            final name = decoded['name'] as String?;
+            final email = decoded['email'] as String?;
+            final provider = decoded['provider'] as String?;
+            // Pre-fill form
+            usernameController.text = '';
+            nicknameController.text = name ?? '';
+            emailController.text = email ?? '';
+            passwordController.clear(); // User needs to set password
+            onboardingToken.value = token;
+            // Optionally show a message
+            showSnackBar('Pre-filled from ${provider ?? 'provider'}');
+          } else {
+            // Existing user, switch to login
+            showSnackBar('Account already exists. Redirecting to login.');
+            if (context.mounted) context.goNamed('login');
+          }
+        } catch (err) {
+          showErrorAlert(err);
+        }
+      });
+      return subscription.cancel;
+    }, [waitingForOidc.value, context.mounted]);
+
+    Future<void> withOidc(String provider) async {
+      waitingForOidc.value = true;
+      final serverUrl = ref.watch(serverUrlProvider);
+      final deviceId = await getUdid();
+      final url =
+          Uri.parse('$serverUrl/pass/auth/login/${provider.toLowerCase()}')
+              .replace(
+                queryParameters: {
+                  'returnUrl': 'solian://auth/callback',
+                  'deviceId': deviceId,
+                  'flow': 'login',
+                },
+              )
+              .toString();
+      final isLaunched = await launchUrlString(
+        url,
+        mode:
+            kIsWeb
+                ? LaunchMode.platformDefault
+                : LaunchMode.externalApplication,
+      );
+      if (!isLaunched) {
+        waitingForOidc.value = false;
+        showErrorAlert('failedToLaunchBrowser'.tr());
+      }
+    }
+
+    return StyledWidget(
+      Container(
+        constraints: const BoxConstraints(maxWidth: 380),
+        child: SingleChildScrollView(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Align(
+                alignment: Alignment.centerLeft,
+                child: CircleAvatar(
+                  radius: 26,
+                  child: const Icon(Symbols.person_add, size: 28),
+                ).padding(bottom: 8),
+              ),
+              Text(
+                'createAccount',
+                style: const TextStyle(
+                  fontSize: 28,
+                  fontWeight: FontWeight.w900,
+                ),
+              ).tr().padding(left: 4, bottom: 16),
+              if (!kIsWeb)
+                Row(
+                  spacing: 6,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: <Widget>[
+                    Text("orCreateWith").tr().fontSize(11).opacity(0.85),
+                    const Gap(8),
+                    Spacer(),
+                    IconButton.filledTonal(
+                      onPressed: () => withOidc('github'),
+                      padding: EdgeInsets.zero,
+                      icon: getProviderIcon(
+                        "github",
+                        size: 16,
+                        color: Theme.of(context).colorScheme.onPrimaryContainer,
+                      ),
+                      tooltip: 'GitHub',
+                    ),
+                    IconButton.filledTonal(
+                      onPressed: () => withOidc('google'),
+                      padding: EdgeInsets.zero,
+                      icon: getProviderIcon(
+                        "google",
+                        size: 16,
+                        color: Theme.of(context).colorScheme.onPrimaryContainer,
+                      ),
+                      tooltip: 'Google',
+                    ),
+                    IconButton.filledTonal(
+                      onPressed: () => withOidc('apple'),
+                      padding: EdgeInsets.zero,
+                      icon: getProviderIcon(
+                        "apple",
+                        size: 16,
+                        color: Theme.of(context).colorScheme.onPrimaryContainer,
+                      ),
+                      tooltip: 'Apple Account',
+                    ),
+                  ],
+                ).padding(horizontal: 8, vertical: 8)
+              else
+                const Gap(12),
+              Form(
+                key: formKey,
+                autovalidateMode: AutovalidateMode.onUserInteraction,
+                child: Column(
+                  children: [
+                    TextFormField(
+                      controller: usernameController,
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'fieldCannotBeEmpty'.tr();
+                        }
+                        return null;
+                      },
+                      autocorrect: false,
+                      enableSuggestions: false,
+                      autofillHints: const [AutofillHints.username],
+                      decoration: InputDecoration(
+                        isDense: true,
+                        border: const UnderlineInputBorder(),
+                        labelText: 'username'.tr(),
+                        helperText: 'usernameCannotChangeHint'.tr(),
+                      ),
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                    const Gap(12),
+                    TextFormField(
+                      controller: nicknameController,
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'fieldCannotBeEmpty'.tr();
+                        }
+                        return null;
+                      },
+                      autocorrect: false,
+                      autofillHints: const [AutofillHints.nickname],
+                      decoration: InputDecoration(
+                        isDense: true,
+                        border: const UnderlineInputBorder(),
+                        labelText: 'nickname'.tr(),
+                      ),
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                    const Gap(12),
+                    TextFormField(
+                      controller: emailController,
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'fieldCannotBeEmpty'.tr();
+                        }
+                        if (!EmailValidator.validate(value)) {
+                          return 'fieldEmailAddressMustBeValid'.tr();
+                        }
+                        return null;
+                      },
+                      autocorrect: false,
+                      enableSuggestions: false,
+                      autofillHints: const [AutofillHints.email],
+                      decoration: InputDecoration(
+                        isDense: true,
+                        border: const UnderlineInputBorder(),
+                        labelText: 'email'.tr(),
+                      ),
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                    const Gap(12),
+                    TextFormField(
+                      controller: passwordController,
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'fieldCannotBeEmpty'.tr();
+                        }
+                        return null;
+                      },
+                      obscureText: true,
+                      autocorrect: false,
+                      enableSuggestions: false,
+                      autofillHints: const [AutofillHints.password],
+                      decoration: InputDecoration(
+                        isDense: true,
+                        border: const UnderlineInputBorder(),
+                        labelText: 'password'.tr(),
+                      ),
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                  ],
+                ).padding(horizontal: 7),
+              ),
+              const Gap(16),
+              Align(
+                alignment: Alignment.centerRight,
+                child: StyledWidget(
+                  Container(
+                    constraints: const BoxConstraints(maxWidth: 290),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      children: [
+                        Text(
+                          'termAcceptNextWithAgree'.tr(),
+                          textAlign: TextAlign.end,
+                          style: Theme.of(
+                            context,
+                          ).textTheme.bodySmall!.copyWith(
+                            color: Theme.of(context).colorScheme.onSurface
+                                .withAlpha((255 * 0.75).round()),
+                          ),
+                        ),
+                        Material(
+                          color: Colors.transparent,
+                          child: InkWell(
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Text('termAcceptLink').tr(),
+                                const Gap(4),
+                                const Icon(Symbols.launch, size: 14),
+                              ],
+                            ),
+                            onTap: () {
+                              launchUrlString('https://solsynth.dev/terms');
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ).padding(horizontal: 16),
+              ),
+              Align(
+                alignment: Alignment.centerRight,
+                child: TextButton(
+                  onPressed: () {
+                    performAction();
+                  },
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text("next").tr(),
+                      const Icon(Symbols.chevron_right),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    ).padding(all: 24).center();
+  }
+}
+
+class _PostCreateModal extends HookConsumerWidget {
+  const _PostCreateModal();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Center(
+      child: ConstrainedBox(
+        constraints: const BoxConstraints(maxWidth: 280),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text('🎉').fontSize(32),
+            Text(
+              'postCreateAccountTitle'.tr(),
+              textAlign: TextAlign.center,
+            ).fontSize(17),
+            const Gap(18),
+            Text('postCreateAccountNext').tr().fontSize(19).bold(),
+            const Gap(4),
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              spacing: 6,
+              children: [
+                Text('\u2022'),
+                Expanded(child: Text('postCreateAccountNext1').tr()),
+              ],
+            ),
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              spacing: 6,
+              children: [
+                Text('\u2022'),
+                Expanded(child: Text('postCreateAccountNext2').tr()),
+              ],
+            ),
+            const Gap(6),
+            TextButton(
+              onPressed: () {
+                Navigator.pop(context);
+                context.pushReplacementNamed('login');
+              },
+              child: Text('login'.tr()),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/screens/auth/create_account_modal.dart
+++ b/lib/screens/auth/create_account_modal.dart
@@ -0,0 +1,19 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/widgets/content/sheet.dart';
+
+import 'create_account_content.dart';
+
+class CreateAccountModal extends HookConsumerWidget {
+  const CreateAccountModal({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return SheetScaffold(
+      titleText: 'createAccount'.tr(),
+      heightFactor: 0.9,
+      child: CreateAccountContent(),
+    );
+  }
+}
--- a/lib/screens/auth/login.dart
+++ b/lib/screens/auth/login.dart
@@ -1,31 +1,10 @@
-import 'dart:convert';
-import 'dart:math' as math;
-import 'package:animations/animations.dart';
-import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:flutter_otp_text_field/flutter_otp_text_field.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:gap/gap.dart';
-import 'package:island/models/auth.dart';
-import 'package:island/pods/config.dart';
-import 'package:island/pods/network.dart';
-import 'package:island/pods/userinfo.dart';
-import 'package:island/pods/websocket.dart';
-import 'package:island/screens/account/me/settings_connections.dart';
-import 'package:island/screens/auth/oidc.dart';
-import 'package:island/services/notify.dart';
-import 'package:island/services/udid.dart';
-import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:sign_in_with_apple/sign_in_with_apple.dart';
-import 'package:styled_widget/styled_widget.dart';
-import 'package:url_launcher/url_launcher_string.dart';

-import 'captcha.dart';
+import 'login_content.dart';

 final Map<int, (String, String, IconData)> kFactorTypes = {
  0: ('authFactorPassword', 'authFactorPasswordDescription', Symbols.password),
@@ -44,745 +23,13 @@ class LoginScreen extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final isBusy = useState(false);
-
-    final period = useState(0);
-    final currentTicket = useState<SnAuthChallenge?>(null);
-    final factors = useState<List<SnAuthFactor>>([]);
-    final factorPicked = useState<SnAuthFactor?>(null);
-
    return AppScaffold(
      isNoBackground: false,
      appBar: AppBar(
        leading: const PageBackButton(),
        title: Text('login').tr(),
      ),
-      body: Theme(
-        data: Theme.of(context).copyWith(canvasColor: Colors.transparent),
-        child: Column(
-          children: [
-            if (isBusy.value)
-              LinearProgressIndicator(
-                minHeight: 4,
-                borderRadius: BorderRadius.zero,
-                trackGap: 0,
-                stopIndicatorRadius: 0,
-              )
-            else if (currentTicket.value != null)
-              LinearProgressIndicator(
-                minHeight: 4,
-                borderRadius: BorderRadius.zero,
-                trackGap: 0,
-                stopIndicatorRadius: 0,
-                value:
-                    1 -
-                    (currentTicket.value!.stepRemain /
-                        currentTicket.value!.stepTotal),
-              )
-            else
-              const Gap(4),
-            Expanded(
-              child:
-                  SingleChildScrollView(
-                    child: PageTransitionSwitcher(
-                      transitionBuilder: (
-                        Widget child,
-                        Animation<double> primaryAnimation,
-                        Animation<double> secondaryAnimation,
-                      ) {
-                        return SharedAxisTransition(
-                          animation: primaryAnimation,
-                          secondaryAnimation: secondaryAnimation,
-                          transitionType: SharedAxisTransitionType.horizontal,
-                          child: Container(
-                            constraints: BoxConstraints(maxWidth: 380),
-                            child: child,
-                          ),
-                        );
-                      },
-                      child: switch (period.value % 3) {
-                        1 => _LoginPickerScreen(
-                          key: const ValueKey(1),
-                          challenge: currentTicket.value,
-                          factors: factors.value,
-                          onChallenge:
-                              (SnAuthChallenge? p0) => currentTicket.value = p0,
-                          onPickFactor:
-                              (SnAuthFactor p0) => factorPicked.value = p0,
-                          onNext: () => period.value++,
-                          onBusy: (value) => isBusy.value = value,
-                        ),
-                        2 => _LoginCheckScreen(
-                          key: const ValueKey(2),
-                          challenge: currentTicket.value,
-                          factor: factorPicked.value,
-                          onChallenge:
-                              (SnAuthChallenge? p0) => currentTicket.value = p0,
-                          onNext: () => period.value = 1,
-                          onBusy: (value) => isBusy.value = value,
-                        ),
-                        _ => _LoginLookupScreen(
-                          key: const ValueKey(0),
-                          ticket: currentTicket.value,
-                          onChallenge:
-                              (SnAuthChallenge? p0) => currentTicket.value = p0,
-                          onFactor:
-                              (List<SnAuthFactor>? p0) =>
-                                  factors.value = p0 ?? [],
-                          onNext: () => period.value++,
-                          onBusy: (value) => isBusy.value = value,
-                        ),
-                      },
-                    ).padding(all: 24),
-                  ).center(),
-            ),
-
-            const Gap(4),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _LoginCheckScreen extends HookConsumerWidget {
-  final SnAuthChallenge? challenge;
-  final SnAuthFactor? factor;
-  final Function(SnAuthChallenge?) onChallenge;
-  final VoidCallback onNext;
-  final Function(bool) onBusy;
-
-  const _LoginCheckScreen({
-    super.key,
-    required this.challenge,
-    required this.factor,
-    required this.onChallenge,
-    required this.onNext,
-    required this.onBusy,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isBusy = useState(false);
-    final passwordController = useTextEditingController();
-
-    useEffect(() {
-      onBusy.call(isBusy.value);
-      return null;
-    }, [isBusy]);
-
-    Future<void> getToken({String? code}) async {
-      // Get token if challenge is completed
-      final client = ref.watch(apiClientProvider);
-      final tokenResp = await client.post(
-        '/pass/auth/token',
-        data: {
-          'grant_type': 'authorization_code',
-          'code': code ?? challenge!.id,
-        },
-      );
-      final token = tokenResp.data['token'];
-      setToken(ref.watch(sharedPreferencesProvider), token);
-      ref.invalidate(tokenProvider);
-      if (!context.mounted) return;
-
-      // Do post login tasks
-      final userNotifier = ref.read(userInfoProvider.notifier);
-      userNotifier.fetchUser().then((_) {
-        final apiClient = ref.read(apiClientProvider);
-        subscribePushNotification(apiClient);
-        final wsNotifier = ref.read(websocketStateProvider.notifier);
-        wsNotifier.connect();
-        if (context.mounted) Navigator.pop(context, true);
-      });
-    }
-
-    useEffect(() {
-      if (challenge != null && challenge?.stepRemain == 0) {
-        Future(() {
-          if (isBusy.value) return;
-          isBusy.value = true;
-          getToken().catchError((err) {
-            showErrorAlert(err);
-            isBusy.value = false;
-          });
-        });
-      }
-      return null;
-    }, [challenge]);
-
-    if (factor == null) {
-      // Logging in by third parties
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Align(
-            alignment: Alignment.centerLeft,
-            child: CircleAvatar(
-              radius: 26,
-              child: const Icon(Symbols.asterisk, size: 28),
-            ).padding(bottom: 8),
-          ),
-          Text(
-            'loginInProgress'.tr(),
-            style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w900),
-          ).padding(left: 4, bottom: 16),
-          const Gap(16),
-          CircularProgressIndicator().alignment(Alignment.centerLeft),
-        ],
-      );
-    }
-
-    Future<void> performCheckTicket() async {
-      final pwd = passwordController.value.text;
-      if (pwd.isEmpty) return;
-      isBusy.value = true;
-      try {
-        // Pass challenge
-        final client = ref.watch(apiClientProvider);
-        final resp = await client.patch(
-          '/pass/auth/challenge/${challenge!.id}',
-          data: {'factor_id': factor!.id, 'password': pwd},
-        );
-        final result = SnAuthChallenge.fromJson(resp.data);
-        onChallenge(result);
-        if (result.stepRemain > 0) {
-          onNext();
-          return;
-        }
-
-        await getToken(code: result.id);
-      } catch (err) {
-        showErrorAlert(err);
-        return;
-      } finally {
-        isBusy.value = false;
-      }
-    }
-
-    final width = math.min(380, MediaQuery.of(context).size.width);
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Align(
-          alignment: Alignment.centerLeft,
-          child: CircleAvatar(
-            radius: 26,
-            child: const Icon(Symbols.asterisk, size: 28),
-          ).padding(bottom: 8),
-        ),
-        Text(
-          'loginEnterPassword'.tr(),
-          style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w900),
-        ).padding(left: 4, bottom: 16),
-        if ([0].contains(factor!.type))
-          TextField(
-            autocorrect: false,
-            enableSuggestions: false,
-            controller: passwordController,
-            obscureText: true,
-            autofillHints: [
-              factor!.type == 0
-                  ? AutofillHints.password
-                  : AutofillHints.oneTimeCode,
-            ],
-            decoration: InputDecoration(
-              isDense: true,
-              labelText: 'password'.tr(),
-            ),
-            onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-            onSubmitted: isBusy.value ? null : (_) => performCheckTicket(),
-          ).padding(horizontal: 7)
-        else
-          OtpTextField(
-            showCursor: false,
-            numberOfFields: 6,
-            obscureText: false,
-            showFieldAsBox: true,
-            focusedBorderColor: Theme.of(context).colorScheme.primary,
-            fieldWidth: (width / 6) - 10,
-            onSubmit: (value) {
-              passwordController.text = value;
-              performCheckTicket();
-            },
-            textStyle: Theme.of(context).textTheme.titleLarge!,
-          ),
-        const Gap(12),
-        ListTile(
-          leading: Icon(
-            kFactorTypes[factor!.type]?.$3 ?? Symbols.question_mark,
-          ),
-          title: Text(kFactorTypes[factor!.type]?.$1 ?? 'unknown').tr(),
-          subtitle: Text(kFactorTypes[factor!.type]?.$2 ?? 'unknown').tr(),
-        ),
-        const Gap(12),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.end,
-          children: [
-            TextButton(
-              onPressed: isBusy.value ? null : () => performCheckTicket(),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text('next').tr(),
-                  const Icon(Symbols.chevron_right),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}
-
-class _LoginPickerScreen extends HookConsumerWidget {
-  final SnAuthChallenge? challenge;
-  final List<SnAuthFactor>? factors;
-  final Function(SnAuthChallenge?) onChallenge;
-  final Function(SnAuthFactor) onPickFactor;
-  final VoidCallback onNext;
-  final Function(bool) onBusy;
-
-  const _LoginPickerScreen({
-    super.key,
-    required this.challenge,
-    required this.factors,
-    required this.onChallenge,
-    required this.onPickFactor,
-    required this.onNext,
-    required this.onBusy,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isBusy = useState(false);
-    final factorPicked = useState<SnAuthFactor?>(null);
-
-    useEffect(() {
-      onBusy.call(isBusy.value);
-      return null;
-    }, [isBusy]);
-
-    useEffect(() {
-      if (challenge != null && challenge?.stepRemain == 0) {
-        Future(() {
-          onNext();
-        });
-      }
-      return null;
-    }, [challenge]);
-
-    final unfocusColor = Theme.of(
-      context,
-    ).colorScheme.onSurface.withAlpha((255 * 0.75).round());
-
-    final hintController = useTextEditingController();
-
-    void performGetFactorCode() async {
-      if (factorPicked.value == null) return;
-
-      isBusy.value = true;
-      final client = ref.watch(apiClientProvider);
-
-      try {
-        await client.post(
-          '/pass/auth/challenge/${challenge!.id}/factors/${factorPicked.value!.id}',
-          data:
-              hintController.text.isNotEmpty
-                  ? jsonEncode(hintController.text)
-                  : null,
-        );
-        onPickFactor(factors!.where((x) => x == factorPicked.value).first);
-        onNext();
-      } catch (err) {
-        if (err is DioException && err.response?.statusCode == 400) {
-          onPickFactor(factors!.where((x) => x == factorPicked.value).first);
-          onNext();
-          if (context.mounted) {
-            showSnackBar(err.response!.data.toString());
-          }
-          return;
-        }
-        showErrorAlert(err);
-        return;
-      } finally {
-        isBusy.value = false;
-      }
-    }
-
-    return Column(
-      key: const ValueKey<int>(1),
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Align(
-          alignment: Alignment.centerLeft,
-          child: CircleAvatar(
-            radius: 26,
-            child: const Icon(Symbols.lock, size: 28),
-          ).padding(bottom: 8),
-        ),
-        Text(
-          'loginPickFactor',
-          style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w900),
-        ).tr().padding(left: 4),
-        const Gap(8),
-        Card(
-          margin: const EdgeInsets.symmetric(vertical: 4),
-          child: Column(
-            children:
-                factors
-                    ?.map(
-                      (x) => CheckboxListTile(
-                        shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.all(Radius.circular(8)),
-                        ),
-                        secondary: Icon(
-                          kFactorTypes[x.type]?.$3 ?? Symbols.question_mark,
-                        ),
-                        title: Text(kFactorTypes[x.type]?.$1 ?? 'unknown').tr(),
-                        enabled: !challenge!.blacklistFactors.contains(x.id),
-                        value: factorPicked.value == x,
-                        onChanged: (value) {
-                          if (value == true) {
-                            factorPicked.value = x;
-                          }
-                        },
-                      ),
-                    )
-                    .toList() ??
-                List.empty(),
-          ),
-        ),
-        if ([1].contains(factorPicked.value?.type))
-          TextField(
-            controller: hintController,
-            decoration: InputDecoration(
-              isDense: true,
-              border: const OutlineInputBorder(),
-              labelText: 'authFactorHint'.tr(),
-              helperText: 'authFactorHintHelper'.tr(),
-            ),
-          ).padding(top: 12, bottom: 4, horizontal: 4),
-        const Gap(8),
-        Text(
-          'loginMultiFactor'.plural(challenge!.stepRemain),
-          style: TextStyle(color: unfocusColor, fontSize: 13),
-        ).padding(horizontal: 16),
-        const Gap(12),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.end,
-          children: [
-            TextButton(
-              onPressed: isBusy.value ? null : () => performGetFactorCode(),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text('next'.tr()),
-                  const Icon(Symbols.chevron_right),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}
-
-class _LoginLookupScreen extends HookConsumerWidget {
-  final SnAuthChallenge? ticket;
-  final Function(SnAuthChallenge?) onChallenge;
-  final Function(List<SnAuthFactor>?) onFactor;
-  final VoidCallback onNext;
-  final Function(bool) onBusy;
-
-  const _LoginLookupScreen({
-    super.key,
-    required this.ticket,
-    required this.onChallenge,
-    required this.onFactor,
-    required this.onNext,
-    required this.onBusy,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isBusy = useState(false);
-    final usernameController = useTextEditingController();
-
-    useEffect(() {
-      onBusy.call(isBusy.value);
-      return null;
-    }, [isBusy]);
-
-    Future<void> requestResetPassword() async {
-      final uname = usernameController.value.text;
-      if (uname.isEmpty) {
-        showErrorAlert('loginResetPasswordHint'.tr());
-        return;
-      }
-      final captchaTk = await Navigator.of(
-        context,
-      ).push(MaterialPageRoute(builder: (context) => CaptchaScreen()));
-      if (captchaTk == null) return;
-      isBusy.value = true;
-      try {
-        final client = ref.watch(apiClientProvider);
-        await client.post(
-          '/pass/accounts/recovery/password',
-          data: {'account': uname, 'captcha_token': captchaTk},
-        );
-        showInfoAlert('loginResetPasswordSent'.tr(), 'done'.tr());
-      } catch (err) {
-        showErrorAlert(err);
-      } finally {
-        isBusy.value = false;
-      }
-    }
-
-    Future<void> performNewTicket() async {
-      final uname = usernameController.value.text;
-      if (uname.isEmpty) return;
-      isBusy.value = true;
-      try {
-        final client = ref.watch(apiClientProvider);
-        final resp = await client.post(
-          '/pass/auth/challenge',
-          data: {
-            'account': uname,
-            'device_id': await getUdid(),
-            'device_name': await getDeviceName(),
-            'platform':
-                kIsWeb
-                    ? 1
-                    : switch (defaultTargetPlatform) {
-                      TargetPlatform.iOS => 2,
-                      TargetPlatform.android => 3,
-                      TargetPlatform.macOS => 4,
-                      TargetPlatform.windows => 5,
-                      TargetPlatform.linux => 6,
-                      _ => 0,
-                    },
-          },
-        );
-        final result = SnAuthChallenge.fromJson(resp.data);
-        onChallenge(result);
-        final factorResp = await client.get(
-          '/pass/auth/challenge/${result.id}/factors',
-        );
-        onFactor(
-          List<SnAuthFactor>.from(
-            factorResp.data.map((ele) => SnAuthFactor.fromJson(ele)),
-          ),
-        );
-        onNext();
-      } catch (err) {
-        showErrorAlert(err);
-        return;
-      } finally {
-        isBusy.value = false;
-      }
-    }
-
-    Future<void> withApple() async {
-      final client = ref.watch(apiClientProvider);
-      try {
-        final credential = await SignInWithApple.getAppleIDCredential(
-          scopes: [AppleIDAuthorizationScopes.email],
-          webAuthenticationOptions: WebAuthenticationOptions(
-            clientId: 'dev.solsynth.solarpass',
-            redirectUri: Uri.parse('https://nt.solian.app/auth/callback/apple'),
-          ),
-        );
-
-        if (context.mounted) showLoadingModal(context);
-        final resp = await client.post(
-          '/pass/auth/login/apple/mobile',
-          data: {
-            'identity_token': credential.identityToken!,
-            'authorization_code': credential.authorizationCode,
-            'device_id': await getUdid(),
-            'device_name': await getDeviceName(),
-          },
-        );
-
-        final challenge = SnAuthChallenge.fromJson(resp.data);
-        onChallenge(challenge);
-        final factorResp = await client.get(
-          '/pass/auth/challenge/${challenge.id}/factors',
-        );
-        onFactor(
-          List<SnAuthFactor>.from(
-            factorResp.data.map((ele) => SnAuthFactor.fromJson(ele)),
-          ),
-        );
-        onNext();
-      } catch (err) {
-        if (err is SignInWithAppleAuthorizationException) return;
-        showErrorAlert(err);
-      } finally {
-        if (context.mounted) hideLoadingModal(context);
-      }
-    }
-
-    Future<void> withOidc(String provider) async {
-      final challengeId = await Navigator.of(context, rootNavigator: true).push(
-        MaterialPageRoute(
-          builder: (context) => OidcScreen(provider: provider.toLowerCase()),
-        ),
-      );
-
-      final client = ref.watch(apiClientProvider);
-      try {
-        final resp = await client.get('/pass/auth/challenge/$challengeId');
-        final challenge = SnAuthChallenge.fromJson(resp.data);
-        onChallenge(challenge);
-        final factorResp = await client.get(
-          '/pass/auth/challenge/${challenge.id}/factors',
-        );
-        onFactor(
-          List<SnAuthFactor>.from(
-            factorResp.data.map((ele) => SnAuthFactor.fromJson(ele)),
-          ),
-        );
-        onNext();
-      } catch (err) {
-        showErrorAlert(err);
-      }
-    }
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Align(
-          alignment: Alignment.centerLeft,
-          child: CircleAvatar(
-            radius: 26,
-            child: const Icon(Symbols.login, size: 28),
-          ).padding(bottom: 8),
-        ),
-        Text(
-          'loginGreeting',
-          style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w900),
-        ).tr().padding(left: 4, bottom: 16),
-        TextField(
-          autocorrect: false,
-          enableSuggestions: false,
-          controller: usernameController,
-          autofillHints: const [AutofillHints.username],
-          decoration: InputDecoration(
-            isDense: true,
-            border: const UnderlineInputBorder(),
-            labelText: 'username'.tr(),
-            helperText: 'usernameLookupHint'.tr(),
-          ),
-          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-          onSubmitted: isBusy.value ? null : (_) => performNewTicket(),
-        ).padding(horizontal: 7),
-        if (!kIsWeb)
-          Row(
-            spacing: 6,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: <Widget>[
-              Text("loginOr").tr().fontSize(11).opacity(0.85),
-              const Gap(8),
-              Spacer(),
-              IconButton.filledTonal(
-                onPressed: () => withOidc('github'),
-                padding: EdgeInsets.zero,
-                icon: getProviderIcon(
-                  "github",
-                  size: 16,
-                  color: Theme.of(context).colorScheme.onPrimaryContainer,
-                ),
-                tooltip: 'GitHub',
-              ),
-              IconButton.filledTonal(
-                onPressed: () => withOidc('google'),
-                padding: EdgeInsets.zero,
-                icon: getProviderIcon(
-                  "google",
-                  size: 16,
-                  color: Theme.of(context).colorScheme.onPrimaryContainer,
-                ),
-                tooltip: 'Google',
-              ),
-              IconButton.filledTonal(
-                onPressed: withApple,
-                padding: EdgeInsets.zero,
-                icon: getProviderIcon(
-                  "apple",
-                  size: 16,
-                  color: Theme.of(context).colorScheme.onPrimaryContainer,
-                ),
-                tooltip: 'Apple Account',
-              ),
-            ],
-          ).padding(horizontal: 8, vertical: 8)
-        else
-          const Gap(12),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            TextButton(
-              onPressed: isBusy.value ? null : () => requestResetPassword(),
-              style: TextButton.styleFrom(foregroundColor: Colors.grey),
-              child: Text('forgotPassword'.tr()),
-            ),
-            TextButton(
-              onPressed: isBusy.value ? null : () => performNewTicket(),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text('next').tr(),
-                  const Icon(Symbols.chevron_right),
-                ],
-              ),
-            ),
-          ],
-        ),
-        const Gap(12),
-        Align(
-          alignment: Alignment.centerRight,
-          child: StyledWidget(
-            Container(
-              constraints: const BoxConstraints(maxWidth: 290),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Text(
-                    'termAcceptNextWithAgree'.tr(),
-                    textAlign: TextAlign.end,
-                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                      color: Theme.of(
-                        context,
-                      ).colorScheme.onSurface.withAlpha((255 * 0.75).round()),
-                    ),
-                  ),
-                  Material(
-                    color: Colors.transparent,
-                    child: InkWell(
-                      child: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          Text('termAcceptLink'.tr()),
-                          const Gap(4),
-                          const Icon(Symbols.launch, size: 14),
-                        ],
-                      ),
-                      onTap: () {
-                        launchUrlString('https://solsynth.dev/terms');
-                      },
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ).padding(horizontal: 16),
-        ),
-      ],
+      body: LoginContent(),
    );
  }
 }
--- a/lib/screens/auth/login_content.dart
+++ b/lib/screens/auth/login_content.dart
@@ -0,0 +1,814 @@
+import 'dart:convert';
+import 'dart:math' as math;
+import 'package:animations/animations.dart';
+import 'package:dio/dio.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_otp_text_field/flutter_otp_text_field.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:gap/gap.dart';
+import 'package:island/models/auth.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/userinfo.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/screens/account/me/settings_connections.dart';
+import 'package:island/services/event_bus.dart';
+import 'package:island/services/notify.dart';
+import 'package:island/services/udid.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:sign_in_with_apple/sign_in_with_apple.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+import 'captcha.dart';
+
+final Map<int, (String, String, IconData)> kFactorTypes = {
+  0: ('authFactorPassword', 'authFactorPasswordDescription', Symbols.password),
+  1: ('authFactorEmail', 'authFactorEmailDescription', Symbols.email),
+  2: (
+    'authFactorInAppNotify',
+    'authFactorInAppNotifyDescription',
+    Symbols.notifications_active,
+  ),
+  3: ('authFactorTOTP', 'authFactorTOTPDescription', Symbols.timer),
+  4: ('authFactorPin', 'authFactorPinDescription', Symbols.nest_secure_alarm),
+};
+
+class _LoginCheckScreen extends HookConsumerWidget {
+  final SnAuthChallenge? challenge;
+  final SnAuthFactor? factor;
+  final Function(SnAuthChallenge?) onChallenge;
+  final VoidCallback onNext;
+  final Function(bool) onBusy;
+
+  const _LoginCheckScreen({
+    super.key,
+    required this.challenge,
+    required this.factor,
+    required this.onChallenge,
+    required this.onNext,
+    required this.onBusy,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isBusy = useState(false);
+    final passwordController = useTextEditingController();
+
+    useEffect(() {
+      onBusy.call(isBusy.value);
+      return null;
+    }, [isBusy]);
+
+    Future<void> getToken({String? code}) async {
+      // Get token if challenge is completed
+      final client = ref.watch(apiClientProvider);
+      final tokenResp = await client.post(
+        '/pass/auth/token',
+        data: {
+          'grant_type': 'authorization_code',
+          'code': code ?? challenge!.id,
+        },
+      );
+      final token = tokenResp.data['token'];
+      setToken(ref.watch(sharedPreferencesProvider), token);
+      ref.invalidate(tokenProvider);
+      if (!context.mounted) return;
+
+      // Do post login tasks
+      final userNotifier = ref.read(userInfoProvider.notifier);
+      userNotifier.fetchUser().then((_) {
+        final apiClient = ref.read(apiClientProvider);
+        subscribePushNotification(apiClient);
+        final wsNotifier = ref.read(websocketStateProvider.notifier);
+        wsNotifier.connect();
+        if (context.mounted) Navigator.pop(context, true);
+      });
+    }
+
+    useEffect(() {
+      if (challenge != null && challenge?.stepRemain == 0) {
+        Future(() {
+          if (isBusy.value) return;
+          isBusy.value = true;
+          getToken().catchError((err) {
+            showErrorAlert(err);
+            isBusy.value = false;
+          });
+        });
+      }
+      return null;
+    }, [challenge]);
+
+    if (factor == null) {
+      // Logging in by third parties
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Align(
+            alignment: Alignment.centerLeft,
+            child: CircleAvatar(
+              radius: 26,
+              child: const Icon(Symbols.asterisk, size: 28),
+            ).padding(bottom: 8),
+          ),
+          Text(
+            'loginInProgress'.tr(),
+            style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w900),
+          ).padding(left: 4, bottom: 16),
+          const Gap(16),
+          CircularProgressIndicator().alignment(Alignment.centerLeft),
+        ],
+      );
+    }
+
+    Future<void> performCheckTicket() async {
+      final pwd = passwordController.value.text;
+      if (pwd.isEmpty) return;
+      isBusy.value = true;
+      try {
+        // Pass challenge
+        final client = ref.watch(apiClientProvider);
+        final resp = await client.patch(
+          '/pass/auth/challenge/${challenge!.id}',
+          data: {'factor_id': factor!.id, 'password': pwd},
+        );
+        final result = SnAuthChallenge.fromJson(resp.data);
+        onChallenge(result);
+        if (result.stepRemain > 0) {
+          onNext();
+          return;
+        }
+
+        await getToken(code: result.id);
+      } catch (err) {
+        showErrorAlert(err);
+        return;
+      } finally {
+        isBusy.value = false;
+      }
+    }
+
+    final width = math.min(380, MediaQuery.of(context).size.width);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Align(
+          alignment: Alignment.centerLeft,
+          child: CircleAvatar(
+            radius: 26,
+            child: const Icon(Symbols.asterisk, size: 28),
+          ).padding(bottom: 8),
+        ),
+        Text(
+          'loginEnterPassword'.tr(),
+          style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w900),
+        ).padding(left: 4, bottom: 16),
+        if ([0].contains(factor!.type))
+          TextField(
+            autocorrect: false,
+            enableSuggestions: false,
+            controller: passwordController,
+            obscureText: true,
+            autofillHints: [
+              factor!.type == 0
+                  ? AutofillHints.password
+                  : AutofillHints.oneTimeCode,
+            ],
+            decoration: InputDecoration(
+              isDense: true,
+              labelText: 'password'.tr(),
+            ),
+            onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+            onSubmitted: isBusy.value ? null : (_) => performCheckTicket(),
+          ).padding(horizontal: 7)
+        else
+          OtpTextField(
+            showCursor: false,
+            numberOfFields: 6,
+            obscureText: false,
+            showFieldAsBox: true,
+            focusedBorderColor: Theme.of(context).colorScheme.primary,
+            fieldWidth: (width / 6) - 10,
+            onSubmit: (value) {
+              passwordController.text = value;
+              performCheckTicket();
+            },
+            textStyle: Theme.of(context).textTheme.titleLarge!,
+          ),
+        const Gap(12),
+        ListTile(
+          leading: Icon(
+            kFactorTypes[factor!.type]?.$3 ?? Symbols.question_mark,
+          ),
+          title: Text(kFactorTypes[factor!.type]?.$1 ?? 'unknown').tr(),
+          subtitle: Text(kFactorTypes[factor!.type]?.$2 ?? 'unknown').tr(),
+        ),
+        const Gap(12),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            TextButton(
+              onPressed: isBusy.value ? null : () => performCheckTicket(),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text('next').tr(),
+                  const Icon(Symbols.chevron_right),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+}
+
+class LoginContent extends HookConsumerWidget {
+  const LoginContent({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isBusy = useState(false);
+
+    final period = useState(0);
+    final currentTicket = useState<SnAuthChallenge?>(null);
+    final factors = useState<List<SnAuthFactor>>([]);
+    final factorPicked = useState<SnAuthFactor?>(null);
+
+    return Theme(
+      data: Theme.of(context).copyWith(canvasColor: Colors.transparent),
+      child: Column(
+        children: [
+          if (isBusy.value)
+            LinearProgressIndicator(
+              minHeight: 4,
+              borderRadius: BorderRadius.zero,
+              trackGap: 0,
+              stopIndicatorRadius: 0,
+            )
+          else if (currentTicket.value != null)
+            LinearProgressIndicator(
+              minHeight: 4,
+              borderRadius: BorderRadius.zero,
+              trackGap: 0,
+              stopIndicatorRadius: 0,
+              value:
+                  1 -
+                  (currentTicket.value!.stepRemain /
+                      currentTicket.value!.stepTotal),
+            )
+          else
+            const Gap(4),
+          Expanded(
+            child:
+                SingleChildScrollView(
+                  child: PageTransitionSwitcher(
+                    transitionBuilder: (
+                      Widget child,
+                      Animation<double> primaryAnimation,
+                      Animation<double> secondaryAnimation,
+                    ) {
+                      return SharedAxisTransition(
+                        animation: primaryAnimation,
+                        secondaryAnimation: secondaryAnimation,
+                        transitionType: SharedAxisTransitionType.horizontal,
+                        child: Container(
+                          constraints: BoxConstraints(maxWidth: 380),
+                          child: child,
+                        ),
+                      );
+                    },
+                    child: switch (period.value % 3) {
+                      1 => _LoginPickerScreen(
+                        key: const ValueKey(1),
+                        challenge: currentTicket.value,
+                        factors: factors.value,
+                        onChallenge:
+                            (SnAuthChallenge? p0) => currentTicket.value = p0,
+                        onPickFactor:
+                            (SnAuthFactor p0) => factorPicked.value = p0,
+                        onNext: () => period.value++,
+                        onBusy: (value) => isBusy.value = value,
+                      ),
+                      2 => _LoginCheckScreen(
+                        key: const ValueKey(2),
+                        challenge: currentTicket.value,
+                        factor: factorPicked.value,
+                        onChallenge:
+                            (SnAuthChallenge? p0) => currentTicket.value = p0,
+                        onNext: () => period.value = 1,
+                        onBusy: (value) => isBusy.value = value,
+                      ),
+                      _ => _LoginLookupScreen(
+                        key: const ValueKey(0),
+                        ticket: currentTicket.value,
+                        onChallenge:
+                            (SnAuthChallenge? p0) => currentTicket.value = p0,
+                        onFactor:
+                            (List<SnAuthFactor>? p0) =>
+                                factors.value = p0 ?? [],
+                        onNext: () => period.value++,
+                        onBusy: (value) => isBusy.value = value,
+                      ),
+                    },
+                  ).padding(all: 24),
+                ).center(),
+          ),
+
+          const Gap(4),
+        ],
+      ),
+    );
+  }
+}
+
+class _LoginPickerScreen extends HookConsumerWidget {
+  final SnAuthChallenge? challenge;
+  final List<SnAuthFactor>? factors;
+  final Function(SnAuthChallenge?) onChallenge;
+  final Function(SnAuthFactor) onPickFactor;
+  final VoidCallback onNext;
+  final Function(bool) onBusy;
+
+  const _LoginPickerScreen({
+    super.key,
+    required this.challenge,
+    required this.factors,
+    required this.onChallenge,
+    required this.onPickFactor,
+    required this.onNext,
+    required this.onBusy,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isBusy = useState(false);
+    final factorPicked = useState<SnAuthFactor?>(null);
+
+    useEffect(() {
+      onBusy.call(isBusy.value);
+      return null;
+    }, [isBusy]);
+
+    useEffect(() {
+      if (challenge != null && challenge?.stepRemain == 0) {
+        Future(() {
+          onNext();
+        });
+      }
+      return null;
+    }, [challenge]);
+
+    final unfocusColor = Theme.of(
+      context,
+    ).colorScheme.onSurface.withAlpha((255 * 0.75).round());
+
+    final hintController = useTextEditingController();
+
+    void performGetFactorCode() async {
+      if (factorPicked.value == null) return;
+
+      isBusy.value = true;
+      final client = ref.watch(apiClientProvider);
+
+      try {
+        await client.post(
+          '/pass/auth/challenge/${challenge!.id}/factors/${factorPicked.value!.id}',
+          data:
+              hintController.text.isNotEmpty
+                  ? jsonEncode(hintController.text)
+                  : null,
+        );
+        onPickFactor(factors!.where((x) => x == factorPicked.value).first);
+        onNext();
+      } catch (err) {
+        if (err is DioException && err.response?.statusCode == 400) {
+          onPickFactor(factors!.where((x) => x == factorPicked.value).first);
+          onNext();
+          if (context.mounted) {
+            showSnackBar(err.response!.data.toString());
+          }
+          return;
+        }
+        showErrorAlert(err);
+        return;
+      } finally {
+        isBusy.value = false;
+      }
+    }
+
+    return Column(
+      key: const ValueKey<int>(1),
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Align(
+          alignment: Alignment.centerLeft,
+          child: CircleAvatar(
+            radius: 26,
+            child: const Icon(Symbols.lock, size: 28),
+          ).padding(bottom: 8),
+        ),
+        Text(
+          'loginPickFactor'.tr(),
+          style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w900),
+        ).padding(left: 4),
+        const Gap(8),
+        Card(
+          margin: const EdgeInsets.symmetric(vertical: 4),
+          child: Column(
+            children:
+                factors
+                    ?.map(
+                      (x) => CheckboxListTile(
+                        shape: const RoundedRectangleBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(8)),
+                        ),
+                        secondary: Icon(
+                          kFactorTypes[x.type]?.$3 ?? Symbols.question_mark,
+                        ),
+                        title: Text(kFactorTypes[x.type]?.$1 ?? 'unknown').tr(),
+                        enabled: !challenge!.blacklistFactors.contains(x.id),
+                        value: factorPicked.value == x,
+                        onChanged: (value) {
+                          if (value == true) {
+                            factorPicked.value = x;
+                          }
+                        },
+                      ),
+                    )
+                    .toList() ??
+                List.empty(),
+          ),
+        ),
+        if ([1].contains(factorPicked.value?.type))
+          TextField(
+            controller: hintController,
+            decoration: InputDecoration(
+              isDense: true,
+              border: const OutlineInputBorder(),
+              labelText: 'authFactorHint'.tr(),
+              helperText: 'authFactorHintHelper'.tr(),
+            ),
+          ).padding(top: 12, bottom: 4, horizontal: 4),
+        const Gap(8),
+        Text(
+          'loginMultiFactor'.plural(challenge!.stepRemain),
+          style: TextStyle(color: unfocusColor, fontSize: 13),
+        ).padding(horizontal: 16),
+        const Gap(12),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            TextButton(
+              onPressed: isBusy.value ? null : () => performGetFactorCode(),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text('next'.tr()),
+                  const Icon(Symbols.chevron_right),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+}
+
+class _LoginLookupScreen extends HookConsumerWidget {
+  final SnAuthChallenge? ticket;
+  final Function(SnAuthChallenge?) onChallenge;
+  final Function(List<SnAuthFactor>?) onFactor;
+  final VoidCallback onNext;
+  final Function(bool) onBusy;
+
+  const _LoginLookupScreen({
+    super.key,
+    required this.ticket,
+    required this.onChallenge,
+    required this.onFactor,
+    required this.onNext,
+    required this.onBusy,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isBusy = useState(false);
+    final usernameController = useTextEditingController();
+    final waitingForOidc = useState(false);
+
+    useEffect(() {
+      onBusy.call(isBusy.value);
+      return null;
+    }, [isBusy]);
+
+    useEffect(() {
+      final subscription = eventBus.on<OidcAuthCallbackEvent>().listen((
+        event,
+      ) async {
+        if (!waitingForOidc.value || !context.mounted) return;
+        waitingForOidc.value = false;
+        final client = ref.watch(apiClientProvider);
+        try {
+          final resp = await client.get(
+            '/pass/auth/challenge/${event.challengeId}',
+          );
+          final challenge = SnAuthChallenge.fromJson(resp.data);
+          onChallenge(challenge);
+          final factorResp = await client.get(
+            '/pass/auth/challenge/${challenge.id}/factors',
+          );
+          onFactor(
+            List<SnAuthFactor>.from(
+              factorResp.data.map((ele) => SnAuthFactor.fromJson(ele)),
+            ),
+          );
+          onNext();
+        } catch (err) {
+          showErrorAlert(err);
+        }
+      });
+      return subscription.cancel;
+    }, [waitingForOidc.value, context.mounted]);
+
+    Future<void> requestResetPassword() async {
+      final uname = usernameController.value.text;
+      if (uname.isEmpty) {
+        showErrorAlert('loginResetPasswordHint'.tr());
+        return;
+      }
+      final captchaTk = await CaptchaScreen.show(context);
+      if (captchaTk == null) return;
+      isBusy.value = true;
+      try {
+        final client = ref.watch(apiClientProvider);
+        await client.post(
+          '/pass/accounts/recovery/password',
+          data: {'account': uname, 'captcha_token': captchaTk},
+        );
+        showInfoAlert('loginResetPasswordSent'.tr(), 'done'.tr());
+      } catch (err) {
+        showErrorAlert(err);
+      } finally {
+        isBusy.value = false;
+      }
+    }
+
+    Future<void> performNewTicket() async {
+      final uname = usernameController.value.text;
+      if (uname.isEmpty) return;
+      isBusy.value = true;
+      try {
+        final client = ref.watch(apiClientProvider);
+        final resp = await client.post(
+          '/pass/auth/challenge',
+          data: {
+            'account': uname,
+            'device_id': await getUdid(),
+            'device_name': await getDeviceName(),
+            'platform':
+                kIsWeb
+                    ? 1
+                    : switch (defaultTargetPlatform) {
+                      TargetPlatform.iOS => 2,
+                      TargetPlatform.android => 3,
+                      TargetPlatform.macOS => 4,
+                      TargetPlatform.windows => 5,
+                      TargetPlatform.linux => 6,
+                      _ => 0,
+                    },
+          },
+        );
+        final result = SnAuthChallenge.fromJson(resp.data);
+        onChallenge(result);
+        final factorResp = await client.get(
+          '/pass/auth/challenge/${result.id}/factors',
+        );
+        onFactor(
+          List<SnAuthFactor>.from(
+            factorResp.data.map((ele) => SnAuthFactor.fromJson(ele)),
+          ),
+        );
+        onNext();
+      } catch (err) {
+        showErrorAlert(err);
+        return;
+      } finally {
+        isBusy.value = false;
+      }
+    }
+
+    Future<void> withApple() async {
+      final client = ref.watch(apiClientProvider);
+      try {
+        final credential = await SignInWithApple.getAppleIDCredential(
+          scopes: [AppleIDAuthorizationScopes.email],
+          webAuthenticationOptions: WebAuthenticationOptions(
+            clientId: 'dev.solsynth.solarpass',
+            redirectUri: Uri.parse('https://nt.solian.app/auth/callback/apple'),
+          ),
+        );
+
+        if (context.mounted) showLoadingModal(context);
+        final resp = await client.post(
+          '/pass/auth/login/apple/mobile',
+          data: {
+            'identity_token': credential.identityToken!,
+            'authorization_code': credential.authorizationCode,
+            'device_id': await getUdid(),
+            'device_name': await getDeviceName(),
+          },
+        );
+
+        final challenge = SnAuthChallenge.fromJson(resp.data);
+        onChallenge(challenge);
+        final factorResp = await client.get(
+          '/pass/auth/challenge/${challenge.id}/factors',
+        );
+        onFactor(
+          List<SnAuthFactor>.from(
+            factorResp.data.map((ele) => SnAuthFactor.fromJson(ele)),
+          ),
+        );
+        onNext();
+      } catch (err) {
+        if (err is SignInWithAppleAuthorizationException) return;
+        showErrorAlert(err);
+      } finally {
+        if (context.mounted) hideLoadingModal(context);
+      }
+    }
+
+    Future<void> withOidc(String provider) async {
+      waitingForOidc.value = true;
+      final serverUrl = ref.watch(serverUrlProvider);
+      final token = ref.watch(tokenProvider);
+      final deviceId = await getUdid();
+      final queryParams = <String, String>{
+        'returnUrl': 'solian://auth/callback',
+        'deviceId': deviceId,
+        'flow': 'login',
+      };
+      if (token?.token != null) {
+        queryParams['token'] = token!.token;
+      }
+      final url =
+          Uri.parse(
+            '$serverUrl/pass/auth/login/${provider.toLowerCase()}',
+          ).replace(queryParameters: queryParams).toString();
+      final isLaunched = await launchUrlString(
+        url,
+        mode:
+            kIsWeb
+                ? LaunchMode.platformDefault
+                : LaunchMode.externalApplication,
+        webOnlyWindowName:
+            token?.token != null ? 'auth-${token!.token}' : 'auth',
+      );
+      if (!isLaunched) {
+        waitingForOidc.value = false;
+        showErrorAlert('failedToLaunchBrowser'.tr());
+      }
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Align(
+          alignment: Alignment.centerLeft,
+          child: CircleAvatar(
+            radius: 26,
+            child: const Icon(Symbols.login, size: 28),
+          ).padding(bottom: 8),
+        ),
+        Text(
+          'loginGreeting'.tr(),
+          style: const TextStyle(fontSize: 28, fontWeight: FontWeight.w900),
+        ).padding(left: 4, bottom: 16),
+        TextField(
+          autocorrect: false,
+          enableSuggestions: false,
+          controller: usernameController,
+          autofillHints: const [AutofillHints.username],
+          decoration: InputDecoration(
+            isDense: true,
+            border: const UnderlineInputBorder(),
+            labelText: 'username'.tr(),
+            helperText: 'usernameLookupHint'.tr(),
+          ),
+          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+          onSubmitted: isBusy.value ? null : (_) => performNewTicket(),
+        ).padding(horizontal: 7),
+        if (!kIsWeb)
+          Row(
+            spacing: 6,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: <Widget>[
+              Text("loginOr").tr().fontSize(11).opacity(0.85),
+              const Gap(8),
+              Spacer(),
+              IconButton.filledTonal(
+                onPressed: () => withOidc('github'),
+                padding: EdgeInsets.zero,
+                icon: getProviderIcon(
+                  "github",
+                  size: 16,
+                  color: Theme.of(context).colorScheme.onPrimaryContainer,
+                ),
+                tooltip: 'GitHub',
+              ),
+              IconButton.filledTonal(
+                onPressed: () => withOidc('google'),
+                padding: EdgeInsets.zero,
+                icon: getProviderIcon(
+                  "google",
+                  size: 16,
+                  color: Theme.of(context).colorScheme.onPrimaryContainer,
+                ),
+                tooltip: 'Google',
+              ),
+              IconButton.filledTonal(
+                onPressed: withApple,
+                padding: EdgeInsets.zero,
+                icon: getProviderIcon(
+                  "apple",
+                  size: 16,
+                  color: Theme.of(context).colorScheme.onPrimaryContainer,
+                ),
+                tooltip: 'Apple Account',
+              ),
+            ],
+          ).padding(horizontal: 8, vertical: 8)
+        else
+          const Gap(12),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            TextButton(
+              onPressed: isBusy.value ? null : () => requestResetPassword(),
+              style: TextButton.styleFrom(foregroundColor: Colors.grey),
+              child: Text('forgotPassword'.tr()),
+            ),
+            TextButton(
+              onPressed: isBusy.value ? null : () => performNewTicket(),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text('next').tr(),
+                  const Icon(Symbols.chevron_right),
+                ],
+              ),
+            ),
+          ],
+        ),
+        const Gap(12),
+        Align(
+          alignment: Alignment.centerRight,
+          child: StyledWidget(
+            Container(
+              constraints: const BoxConstraints(maxWidth: 290),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.end,
+                children: [
+                  Text(
+                    'termAcceptNextWithAgree'.tr(),
+                    textAlign: TextAlign.end,
+                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                      color: Theme.of(
+                        context,
+                      ).colorScheme.onSurface.withAlpha((255 * 0.75).round()),
+                    ),
+                  ),
+                  Material(
+                    color: Colors.transparent,
+                    child: InkWell(
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Text('termAcceptLink'.tr()),
+                          const Gap(4),
+                          const Icon(Symbols.launch, size: 14),
+                        ],
+                      ),
+                      onTap: () {
+                        launchUrlString('https://solsynth.dev/terms');
+                      },
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ).padding(horizontal: 16),
+        ),
+      ],
+    );
+  }
+}
--- a/lib/screens/auth/login_modal.dart
+++ b/lib/screens/auth/login_modal.dart
@@ -0,0 +1,19 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/widgets/content/sheet.dart';
+
+import 'login_content.dart';
+
+class LoginModal extends HookConsumerWidget {
+  const LoginModal({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return SheetScaffold(
+      titleText: 'login'.tr(),
+      heightFactor: 0.9,
+      child: LoginContent(),
+    );
+  }
+}
--- a/lib/screens/chat/chat_form.dart
+++ b/lib/screens/chat/chat_form.dart
@@ -16,10 +16,10 @@ 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';
+import 'package:island/widgets/content/sheet.dart';

 class NewChatScreen extends StatelessWidget {
  const NewChatScreen({super.key});
@@ -99,7 +99,7 @@ class EditChatScreen extends HookConsumerWidget {
      try {
        final cloudFile =
            await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
              fileData: UniversalFile(
                data: result,
                type: UniversalFileType.image,
@@ -151,12 +151,10 @@ class EditChatScreen extends HookConsumerWidget {
      }
    }

-    return AppScaffold(
-      appBar: AppBar(
-        title: Text(id == null ? 'createChatRoom' : 'editChatRoom').tr(),
-        leading: const PageBackButton(),
-      ),
-      body: SingleChildScrollView(
+    return SheetScaffold(
+      titleText: (id == null ? 'createChatRoom' : 'editChatRoom').tr(),
+      onClose: () => context.pop(),
+      child: SingleChildScrollView(
        child: Column(
          children: [
            AspectRatio(
@@ -204,16 +202,24 @@ class EditChatScreen extends HookConsumerWidget {
                children: [
                  TextFormField(
                    controller: nameController,
-                    decoration: const InputDecoration(labelText: 'Name'),
+                    decoration: InputDecoration(
+                      labelText: 'Name',
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                    ),
                    onTapOutside:
                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
                  ),
                  const SizedBox(height: 16),
                  TextFormField(
                    controller: descriptionController,
-                    decoration: const InputDecoration(
+                    decoration: InputDecoration(
                      labelText: 'Description',
                      alignLabelWithHint: true,
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(12),
+                      ),
                    ),
                    minLines: 3,
                    maxLines: null,
@@ -223,7 +229,12 @@ class EditChatScreen extends HookConsumerWidget {
                  const SizedBox(height: 16),
                  DropdownButtonFormField<SnRealm>(
                    value: currentRealm.value,
-                    decoration: InputDecoration(labelText: 'realm'.tr()),
+                    decoration: InputDecoration(
+                      labelText: 'realm'.tr(),
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                    ),
                    items: [
                      DropdownMenuItem<SnRealm>(
                        value: null,
--- a/lib/screens/chat/room.dart
+++ b/lib/screens/chat/room.dart
@@ -1,6 +1,8 @@
 import "dart:async";
+import "dart:math" as math;
 import "package:easy_localization/easy_localization.dart";
 import "package:file_picker/file_picker.dart";
+import "package:image_picker/image_picker.dart";
 import "package:flutter/material.dart";
 import "package:go_router/go_router.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
@@ -9,6 +11,8 @@ import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:island/database/message.dart";
 import "package:island/models/chat.dart";
 import "package:island/models/file.dart";
+import "package:island/models/poll.dart";
+import "package:island/models/wallet.dart";
 import "package:island/pods/chat/chat_rooms.dart";
 import "package:island/pods/chat/chat_subscribe.dart";
 import "package:island/pods/chat/messages_notifier.dart";
@@ -140,11 +144,38 @@ class ChatRoomScreen extends HookConsumerWidget {
    final messageController = useTextEditingController();
    final scrollController = useScrollController();

+    // Input height measurement for dynamic padding
+    final inputKey = useMemoized(() => GlobalKey());
+    final inputHeight = useState<double>(80.0);
+
+    // Track previous height for smooth animations
+    final previousInputHeight = usePrevious<double>(inputHeight.value);
+
+    // Periodic height measurement for dynamic sizing
+    useEffect(() {
+      final timer = Timer.periodic(const Duration(milliseconds: 50), (_) {
+        final renderBox =
+            inputKey.currentContext?.findRenderObject() as RenderBox?;
+        if (renderBox != null) {
+          final newHeight = renderBox.size.height;
+          if (newHeight != inputHeight.value) {
+            inputHeight.value = newHeight;
+          }
+        }
+      });
+      return timer.cancel;
+    }, []);
+
+    // Scroll animation notifiers
+    final bottomGradientNotifier = useState(ValueNotifier<double>(0.0));
+
    final messageReplyingTo = useState<SnChatMessage?>(null);
    final messageForwardingTo = useState<SnChatMessage?>(null);
    final messageEditingTo = useState<SnChatMessage?>(null);
+    final selectedPoll = useState<SnPoll?>(null);
+    final selectedFund = useState<SnWalletFund?>(null);
    final attachments = useState<List<UniversalFile>>([]);
-    final attachmentProgress = useState<Map<String, Map<int, double>>>({});
+    final attachmentProgress = useState<Map<String, Map<int, double?>>>({});

    // Selection mode state
    final isSelectionMode = useState<bool>(false);
@@ -164,6 +195,12 @@ class ChatRoomScreen extends HookConsumerWidget {
          isLoading = true;
          messagesNotifier.loadMore().then((_) => isLoading = false);
        }
+
+        // Update gradient animations
+        final pixels = scrollController.position.pixels;
+
+        // Bottom gradient: appears when not at bottom (pixels > 0)
+        bottomGradientNotifier.value.value = (pixels / 500.0).clamp(0.0, 1.0);
      }

      scrollController.addListener(onScroll);
@@ -171,16 +208,13 @@ class ChatRoomScreen extends HookConsumerWidget {
    }, [scrollController]);

    Future<void> pickPhotoMedia() async {
-      final result = await FilePicker.platform.pickFiles(
-        type: FileType.image,
-        allowMultiple: true,
-        allowCompression: false,
-      );
-      if (result == null || result.count == 0) return;
+      final ImagePicker picker = ImagePicker();
+      final List<XFile> results = await picker.pickMultiImage();
+      if (results.isEmpty) return;
      attachments.value = [
        ...attachments.value,
-        ...result.files.map(
-          (e) => UniversalFile(data: e.xFile, type: UniversalFileType.image),
+        ...results.map(
+          (xfile) => UniversalFile(data: xfile, type: UniversalFileType.image),
        ),
      ];
    }
@@ -255,10 +289,15 @@ class ChatRoomScreen extends HookConsumerWidget {

    void sendMessage() {
      if (messageController.text.trim().isNotEmpty ||
-          attachments.value.isNotEmpty) {
+          attachments.value.isNotEmpty ||
+          selectedPoll.value != null ||
+          selectedFund.value != null) {
        messagesNotifier.sendMessage(
+          ref,
          messageController.text.trim(),
          attachments.value,
+          poll: selectedPoll.value,
+          fund: selectedFund.value,
          editingTo: messageEditingTo.value,
          forwardingTo: messageForwardingTo.value,
          replyingTo: messageReplyingTo.value,
@@ -273,6 +312,8 @@ class ChatRoomScreen extends HookConsumerWidget {
        messageEditingTo.value = null;
        messageReplyingTo.value = null;
        messageForwardingTo.value = null;
+        selectedPoll.value = null;
+        selectedFund.value = null;
        attachments.value = [];
      }
    }
@@ -553,7 +594,7 @@ class ChatRoomScreen extends HookConsumerWidget {

        final cloudFile =
            await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
              fileData: attachment,
              poolId: config.poolId,
              mode:
@@ -563,7 +604,7 @@ class ChatRoomScreen extends HookConsumerWidget {
              onProgress: (progress, _) {
                attachmentProgress.value = {
                  ...attachmentProgress.value,
-                  'chat-upload': {index: progress},
+                  'chat-upload': {index: progress ?? 0.0},
                };
              },
            ).future;
@@ -583,181 +624,428 @@ class ChatRoomScreen extends HookConsumerWidget {
      }
    }

-    Widget chatMessageListWidget(
-      List<LocalChatMessage> messageList,
-    ) => SuperListView.builder(
-      listController: listController,
-      padding: EdgeInsets.only(
-        top: 16,
-        bottom: MediaQuery.of(context).padding.bottom + 16,
-      ),
-      controller: scrollController,
-      reverse: true, // Show newest messages at the bottom
-      itemCount: messageList.length,
-      findChildIndexCallback: (key) {
-        if (key is! ValueKey<String>) return null;
-        final messageId = key.value.substring(messageKeyPrefix.length);
-        final index = messageList.indexWhere(
-          (m) => (m.nonce ?? m.id) == messageId,
-        );
-        // Return null for invalid indices to let SuperListView handle it properly
-        return index >= 0 ? index : null;
-      },
-      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;
+    Widget chatMessageListWidget(List<LocalChatMessage> messageList) =>
+        previousInputHeight != null && previousInputHeight != inputHeight.value
+            ? TweenAnimationBuilder<double>(
+              tween: Tween<double>(
+                begin: previousInputHeight,
+                end: inputHeight.value,
+              ),
+              duration: const Duration(milliseconds: 200),
+              curve: Curves.easeOut,
+              builder:
+                  (context, height, child) => SuperListView.builder(
+                    listController: listController,
+                    padding: EdgeInsets.only(
+                      top: 16,
+                      bottom:
+                          MediaQuery.of(context).padding.bottom + 8 + height,
+                    ),
+                    controller: scrollController,
+                    reverse: true, // Show newest messages at the bottom
+                    itemCount: messageList.length,
+                    findChildIndexCallback: (key) {
+                      if (key is! ValueKey<String>) return null;
+                      final messageId = key.value.substring(
+                        messageKeyPrefix.length,
+                      );
+                      final index = messageList.indexWhere(
+                        (m) => (m.nonce ?? m.id) == messageId,
+                      );
+                      // Return null for invalid indices to let SuperListView handle it properly
+                      return index >= 0 ? index : null;
+                    },
+                    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;

-        // Use a stable animation key that doesn't change during message lifecycle
-        final key = Key('$messageKeyPrefix${message.nonce ?? message.id}');
+                      // Use a stable animation key that doesn't change during message lifecycle
+                      final key = Key(
+                        '$messageKeyPrefix${message.nonce ?? message.id}',
+                      );

-        final messageWidget = chatIdentity.when(
-          skipError: true,
-          data:
-              (identity) => GestureDetector(
-                onLongPress: () {
-                  if (!isSelectionMode.value) {
-                    toggleSelectionMode();
-                    toggleMessageSelection(message.id);
-                  }
-                },
-                onTap: () {
-                  if (isSelectionMode.value) {
-                    toggleMessageSelection(message.id);
-                  }
-                },
-                child: Container(
-                  color:
-                      selectedMessages.value.contains(message.id)
-                          ? Theme.of(
-                            context,
-                          ).colorScheme.primaryContainer.withOpacity(0.3)
-                          : null,
-                  child: Stack(
-                    children: [
-                      MessageItem(
-                        key: settings.disableAnimation ? key : null,
-                        message: message,
-                        isCurrentUser: identity?.id == message.senderId,
-                        onAction:
-                            isSelectionMode.value
-                                ? null
-                                : (action) {
-                                  switch (action) {
-                                    case MessageItemAction.delete:
-                                      messagesNotifier.deleteMessage(
-                                        message.id,
-                                      );
-                                    case MessageItemAction.edit:
-                                      messageEditingTo.value =
-                                          message.toRemoteMessage();
-                                      messageController.text =
-                                          messageEditingTo.value?.content ?? '';
-                                      attachments.value =
-                                          messageEditingTo.value!.attachments
-                                              .map(
-                                                (e) =>
-                                                    UniversalFile.fromAttachment(
-                                                      e,
-                                                    ),
-                                              )
-                                              .toList();
-                                    case MessageItemAction.forward:
-                                      messageForwardingTo.value =
-                                          message.toRemoteMessage();
-                                    case MessageItemAction.reply:
-                                      messageReplyingTo.value =
-                                          message.toRemoteMessage();
-                                    case MessageItemAction.resend:
-                                      messagesNotifier.retryMessage(message.id);
-                                  }
-                                },
-                        onJump: (messageId) {
-                          scrollToMessage(
-                            messageId: messageId,
-                            messageList: messageList,
-                            messagesNotifier: messagesNotifier,
-                            listController: listController,
-                            scrollController: scrollController,
-                            ref: ref,
+                      final messageWidget = chatIdentity.when(
+                        skipError: true,
+                        data:
+                            (identity) => GestureDetector(
+                              onLongPress: () {
+                                if (!isSelectionMode.value) {
+                                  toggleSelectionMode();
+                                  toggleMessageSelection(message.id);
+                                }
+                              },
+                              onTap: () {
+                                if (isSelectionMode.value) {
+                                  toggleMessageSelection(message.id);
+                                }
+                              },
+                              child: Container(
+                                color:
+                                    selectedMessages.value.contains(message.id)
+                                        ? Theme.of(context)
+                                            .colorScheme
+                                            .primaryContainer
+                                            .withOpacity(0.3)
+                                        : null,
+                                child: Stack(
+                                  children: [
+                                    MessageItem(
+                                      key:
+                                          settings.disableAnimation
+                                              ? key
+                                              : null,
+                                      message: message,
+                                      isCurrentUser:
+                                          identity?.id == message.senderId,
+                                      onAction:
+                                          isSelectionMode.value
+                                              ? null
+                                              : (action) {
+                                                switch (action) {
+                                                  case MessageItemAction.delete:
+                                                    messagesNotifier
+                                                        .deleteMessage(
+                                                          message.id,
+                                                        );
+                                                  case MessageItemAction.edit:
+                                                    messageEditingTo.value =
+                                                        message
+                                                            .toRemoteMessage();
+                                                    messageController.text =
+                                                        messageEditingTo
+                                                            .value
+                                                            ?.content ??
+                                                        '';
+                                                    attachments.value =
+                                                        messageEditingTo
+                                                            .value!
+                                                            .attachments
+                                                            .map(
+                                                              (e) =>
+                                                                  UniversalFile.fromAttachment(
+                                                                    e,
+                                                                  ),
+                                                            )
+                                                            .toList();
+                                                  case MessageItemAction
+                                                      .forward:
+                                                    messageForwardingTo.value =
+                                                        message
+                                                            .toRemoteMessage();
+                                                  case MessageItemAction.reply:
+                                                    messageReplyingTo.value =
+                                                        message
+                                                            .toRemoteMessage();
+                                                  case MessageItemAction.resend:
+                                                    messagesNotifier
+                                                        .retryMessage(
+                                                          message.id,
+                                                        );
+                                                }
+                                              },
+                                      onJump: (messageId) {
+                                        scrollToMessage(
+                                          messageId: messageId,
+                                          messageList: messageList,
+                                          messagesNotifier: messagesNotifier,
+                                          listController: listController,
+                                          scrollController: scrollController,
+                                          ref: ref,
+                                        );
+                                      },
+                                      progress:
+                                          attachmentProgress.value[message.id],
+                                      showAvatar: isLastInGroup,
+                                      isSelectionMode: isSelectionMode.value,
+                                      isSelected: selectedMessages.value
+                                          .contains(message.id),
+                                      onToggleSelection: toggleMessageSelection,
+                                      onEnterSelectionMode: () {
+                                        if (!isSelectionMode.value) {
+                                          toggleSelectionMode();
+                                        }
+                                      },
+                                    ),
+                                    if (selectedMessages.value.contains(
+                                      message.id,
+                                    ))
+                                      ...([
+                                        Positioned(
+                                          top: 8,
+                                          right: 8,
+                                          child: Container(
+                                            width: 16,
+                                            height: 16,
+                                            decoration: BoxDecoration(
+                                              color:
+                                                  Theme.of(
+                                                    context,
+                                                  ).colorScheme.primary,
+                                              shape: BoxShape.circle,
+                                            ),
+                                            child: Icon(
+                                              Icons.check,
+                                              size: 12,
+                                              color:
+                                                  Theme.of(
+                                                    context,
+                                                  ).colorScheme.onPrimary,
+                                            ),
+                                          ),
+                                        ),
+                                      ]),
+                                  ],
+                                ),
+                              ),
+                            ),
+                        loading:
+                            () => MessageItem(
+                              message: message,
+                              isCurrentUser: false,
+                              onAction: null,
+                              progress: null,
+                              showAvatar: false,
+                              onJump: (_) {},
+                            ),
+                        error: (_, _) => const SizedBox.shrink(),
+                      );
+
+                      return settings.disableAnimation
+                          ? messageWidget
+                          : TweenAnimationBuilder<double>(
+                            key: key,
+                            tween: Tween<double>(begin: 0.0, end: 1.0),
+                            duration: Duration(
+                              milliseconds: 400 + (index % 5) * 50,
+                            ), // Staggered delay
+                            curve: Curves.easeOutCubic,
+                            builder: (context, animationValue, child) {
+                              return Transform.translate(
+                                offset: Offset(
+                                  0,
+                                  20 * (1 - animationValue),
+                                ), // Slide up from bottom
+                                child: Opacity(
+                                  opacity: animationValue,
+                                  child: child,
+                                ),
+                              );
+                            },
+                            child: messageWidget,
                          );
-                        },
-                        progress: attachmentProgress.value[message.id],
-                        showAvatar: isLastInGroup,
-                        isSelectionMode: isSelectionMode.value,
-                        isSelected: selectedMessages.value.contains(message.id),
-                        onToggleSelection: toggleMessageSelection,
-                        onEnterSelectionMode: () {
+                    },
+                  ),
+            )
+            : SuperListView.builder(
+              listController: listController,
+              padding: EdgeInsets.only(
+                top: 16,
+                bottom:
+                    MediaQuery.of(context).padding.bottom +
+                    8 +
+                    inputHeight.value,
+              ),
+              controller: scrollController,
+              reverse: true, // Show newest messages at the bottom
+              itemCount: messageList.length,
+              findChildIndexCallback: (key) {
+                if (key is! ValueKey<String>) return null;
+                final messageId = key.value.substring(messageKeyPrefix.length);
+                final index = messageList.indexWhere(
+                  (m) => (m.nonce ?? m.id) == messageId,
+                );
+                // Return null for invalid indices to let SuperListView handle it properly
+                return index >= 0 ? index : null;
+              },
+              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;
+
+                // Use a stable animation key that doesn't change during message lifecycle
+                final key = Key(
+                  '$messageKeyPrefix${message.nonce ?? message.id}',
+                );
+
+                final messageWidget = chatIdentity.when(
+                  skipError: true,
+                  data:
+                      (identity) => GestureDetector(
+                        onLongPress: () {
                          if (!isSelectionMode.value) {
                            toggleSelectionMode();
+                            toggleMessageSelection(message.id);
                          }
                        },
-                      ),
-                      if (selectedMessages.value.contains(message.id))
-                        Positioned(
-                          top: 8,
-                          right: 8,
-                          child: Container(
-                            width: 16,
-                            height: 16,
-                            decoration: BoxDecoration(
-                              color: Theme.of(context).colorScheme.primary,
-                              shape: BoxShape.circle,
-                            ),
-                            child: Icon(
-                              Icons.check,
-                              size: 12,
-                              color: Theme.of(context).colorScheme.onPrimary,
-                            ),
+                        onTap: () {
+                          if (isSelectionMode.value) {
+                            toggleMessageSelection(message.id);
+                          }
+                        },
+                        child: Container(
+                          color:
+                              selectedMessages.value.contains(message.id)
+                                  ? Theme.of(context)
+                                      .colorScheme
+                                      .primaryContainer
+                                      .withOpacity(0.3)
+                                  : null,
+                          child: Stack(
+                            children: [
+                              MessageItem(
+                                key: settings.disableAnimation ? key : null,
+                                message: message,
+                                isCurrentUser: identity?.id == message.senderId,
+                                onAction:
+                                    isSelectionMode.value
+                                        ? null
+                                        : (action) {
+                                          switch (action) {
+                                            case MessageItemAction.delete:
+                                              messagesNotifier.deleteMessage(
+                                                message.id,
+                                              );
+                                            case MessageItemAction.edit:
+                                              messageEditingTo.value =
+                                                  message.toRemoteMessage();
+                                              messageController.text =
+                                                  messageEditingTo
+                                                      .value
+                                                      ?.content ??
+                                                  '';
+                                              attachments.value =
+                                                  messageEditingTo
+                                                      .value!
+                                                      .attachments
+                                                      .map(
+                                                        (e) =>
+                                                            UniversalFile.fromAttachment(
+                                                              e,
+                                                            ),
+                                                      )
+                                                      .toList();
+                                            case MessageItemAction.forward:
+                                              messageForwardingTo.value =
+                                                  message.toRemoteMessage();
+                                            case MessageItemAction.reply:
+                                              messageReplyingTo.value =
+                                                  message.toRemoteMessage();
+                                            case MessageItemAction.resend:
+                                              messagesNotifier.retryMessage(
+                                                message.id,
+                                              );
+                                          }
+                                        },
+                                onJump: (messageId) {
+                                  scrollToMessage(
+                                    messageId: messageId,
+                                    messageList: messageList,
+                                    messagesNotifier: messagesNotifier,
+                                    listController: listController,
+                                    scrollController: scrollController,
+                                    ref: ref,
+                                  );
+                                },
+                                progress: attachmentProgress.value[message.id],
+                                showAvatar: isLastInGroup,
+                                isSelectionMode: isSelectionMode.value,
+                                isSelected: selectedMessages.value.contains(
+                                  message.id,
+                                ),
+                                onToggleSelection: toggleMessageSelection,
+                                onEnterSelectionMode: () {
+                                  if (!isSelectionMode.value) {
+                                    toggleSelectionMode();
+                                  }
+                                },
+                              ),
+                              if (selectedMessages.value.contains(message.id))
+                                ...([
+                                  Positioned(
+                                    top: 8,
+                                    right: 8,
+                                    child: Container(
+                                      width: 16,
+                                      height: 16,
+                                      decoration: BoxDecoration(
+                                        color:
+                                            Theme.of(
+                                              context,
+                                            ).colorScheme.primary,
+                                        shape: BoxShape.circle,
+                                      ),
+                                      child: Icon(
+                                        Icons.check,
+                                        size: 12,
+                                        color:
+                                            Theme.of(
+                                              context,
+                                            ).colorScheme.onPrimary,
+                                      ),
+                                    ),
+                                  ),
+                                ]),
+                            ],
                          ),
                        ),
-                    ],
-                  ),
-                ),
-              ),
-          loading:
-              () => MessageItem(
-                message: message,
-                isCurrentUser: false,
-                onAction: null,
-                progress: null,
-                showAvatar: false,
-                onJump: (_) {},
-              ),
-          error: (_, _) => const SizedBox.shrink(),
-        );
-
-        return settings.disableAnimation
-            ? messageWidget
-            : TweenAnimationBuilder<double>(
-              key: key,
-              tween: Tween<double>(begin: 0.0, end: 1.0),
-              duration: Duration(
-                milliseconds: 400 + (index % 5) * 50,
-              ), // Staggered delay
-              curve: Curves.easeOutCubic,
-              builder: (context, animationValue, child) {
-                return Transform.translate(
-                  offset: Offset(
-                    0,
-                    20 * (1 - animationValue),
-                  ), // Slide up from bottom
-                  child: Opacity(opacity: animationValue, child: child),
+                      ),
+                  loading:
+                      () => MessageItem(
+                        message: message,
+                        isCurrentUser: false,
+                        onAction: null,
+                        progress: null,
+                        showAvatar: false,
+                        onJump: (_) {},
+                      ),
+                  error: (_, _) => const SizedBox.shrink(),
                );
+
+                return settings.disableAnimation
+                    ? messageWidget
+                    : TweenAnimationBuilder<double>(
+                      key: key,
+                      tween: Tween<double>(begin: 0.0, end: 1.0),
+                      duration: Duration(
+                        milliseconds: 400 + (index % 5) * 50,
+                      ), // Staggered delay
+                      curve: Curves.easeOutCubic,
+                      builder: (context, animationValue, child) {
+                        return Transform.translate(
+                          offset: Offset(
+                            0,
+                            20 * (1 - animationValue),
+                          ), // Slide up from bottom
+                          child: Opacity(opacity: animationValue, child: child),
+                        );
+                      },
+                      child: messageWidget,
+                    );
              },
-              child: messageWidget,
            );
-      },
-    );

    return AppScaffold(
      appBar: AppBar(
@@ -828,7 +1116,7 @@ class ChatRoomScreen extends HookConsumerWidget {
      ),
      body: Stack(
        children: [
-          // Messages and Input in Column
+          // Messages only in Column
          Positioned.fill(
            child: Column(
              children: [
@@ -872,73 +1160,6 @@ class ChatRoomScreen extends HookConsumerWidget {
                    ),
                  ),
                ),
-                if (!isSelectionMode.value)
-                  chatRoom.when(
-                    data:
-                        (room) => Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            ChatInput(
-                              messageController: messageController,
-                              chatRoom: room!,
-                              onSend: sendMessage,
-                              onClear: () {
-                                if (messageEditingTo.value != null) {
-                                  attachments.value.clear();
-                                  messageController.clear();
-                                }
-                                messageEditingTo.value = null;
-                                messageReplyingTo.value = null;
-                                messageForwardingTo.value = null;
-                              },
-                              messageEditingTo: messageEditingTo.value,
-                              messageReplyingTo: messageReplyingTo.value,
-                              messageForwardingTo: messageForwardingTo.value,
-                              onPickFile: (bool isPhoto) {
-                                if (isPhoto) {
-                                  pickPhotoMedia();
-                                } else {
-                                  pickVideoMedia();
-                                }
-                              },
-                              onPickAudio: pickAudioMedia,
-                              onPickGeneralFile: pickGeneralFile,
-                              onLinkAttachment: linkAttachment,
-                              attachments: attachments.value,
-                              onUploadAttachment: uploadAttachment,
-                              onDeleteAttachment: (index) async {
-                                final attachment = attachments.value[index];
-                                if (attachment.isOnCloud &&
-                                    !attachment.isLink) {
-                                  final client = ref.watch(apiClientProvider);
-                                  await client.delete(
-                                    '/drive/files/${attachment.data.id}',
-                                  );
-                                }
-                                final clone = List.of(attachments.value);
-                                clone.removeAt(index);
-                                attachments.value = clone;
-                              },
-                              onMoveAttachment: (idx, delta) {
-                                if (idx + delta < 0 ||
-                                    idx + delta >= attachments.value.length) {
-                                  return;
-                                }
-                                final clone = List.of(attachments.value);
-                                clone.insert(idx + delta, clone.removeAt(idx));
-                                attachments.value = clone;
-                              },
-                              onAttachmentsChanged: (newAttachments) {
-                                attachments.value = newAttachments;
-                              },
-                              attachmentProgress: attachmentProgress.value,
-                            ),
-                            Gap(MediaQuery.of(context).padding.bottom),
-                          ],
-                        ),
-                    error: (_, _) => const SizedBox.shrink(),
-                    loading: () => const SizedBox.shrink(),
-                  ),
              ],
            ),
          ),
@@ -977,6 +1198,119 @@ class ChatRoomScreen extends HookConsumerWidget {
                ),
              ),
            ),
+          // Bottom gradient - appears when scrolling towards newer messages (behind chat input)
+          if (!isSelectionMode.value)
+            AnimatedBuilder(
+              animation: bottomGradientNotifier.value,
+              builder:
+                  (context, child) => Positioned(
+                    left: 0,
+                    right: 0,
+                    bottom: 0,
+                    child: Opacity(
+                      opacity: bottomGradientNotifier.value.value,
+                      child: Container(
+                        height: math.min(
+                          MediaQuery.of(context).size.height * 0.1,
+                          128,
+                        ),
+                        decoration: BoxDecoration(
+                          gradient: LinearGradient(
+                            begin: Alignment.bottomCenter,
+                            end: Alignment.topCenter,
+                            colors: [
+                              Theme.of(
+                                context,
+                              ).colorScheme.surfaceContainer.withOpacity(0.8),
+                              Theme.of(
+                                context,
+                              ).colorScheme.surfaceContainer.withOpacity(0.0),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+            ),
+          // Chat Input positioned above gradient (higher z-index)
+          if (!isSelectionMode.value)
+            Positioned(
+              left: 0,
+              right: 0,
+              bottom: 0, // At the very bottom, above gradient
+              child: chatRoom.when(
+                data:
+                    (room) => Column(
+                      key: inputKey,
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        ChatInput(
+                          messageController: messageController,
+                          chatRoom: room!,
+                          onSend: sendMessage,
+                          onClear: () {
+                            if (messageEditingTo.value != null) {
+                              attachments.value.clear();
+                              messageController.clear();
+                            }
+                            messageEditingTo.value = null;
+                            messageReplyingTo.value = null;
+                            messageForwardingTo.value = null;
+                            selectedPoll.value = null;
+                            selectedFund.value = null;
+                          },
+                          messageEditingTo: messageEditingTo.value,
+                          messageReplyingTo: messageReplyingTo.value,
+                          messageForwardingTo: messageForwardingTo.value,
+                          selectedPoll: selectedPoll.value,
+                          onPollSelected: (poll) => selectedPoll.value = poll,
+                          selectedFund: selectedFund.value,
+                          onFundSelected: (fund) => selectedFund.value = fund,
+                          onPickFile: (bool isPhoto) {
+                            if (isPhoto) {
+                              pickPhotoMedia();
+                            } else {
+                              pickVideoMedia();
+                            }
+                          },
+                          onPickAudio: pickAudioMedia,
+                          onPickGeneralFile: pickGeneralFile,
+                          onLinkAttachment: linkAttachment,
+                          attachments: attachments.value,
+                          onUploadAttachment: uploadAttachment,
+                          onDeleteAttachment: (index) async {
+                            final attachment = attachments.value[index];
+                            if (attachment.isOnCloud && !attachment.isLink) {
+                              final client = ref.watch(apiClientProvider);
+                              await client.delete(
+                                '/drive/files/${attachment.data.id}',
+                              );
+                            }
+                            final clone = List.of(attachments.value);
+                            clone.removeAt(index);
+                            attachments.value = clone;
+                          },
+                          onMoveAttachment: (idx, delta) {
+                            if (idx + delta < 0 ||
+                                idx + delta >= attachments.value.length) {
+                              return;
+                            }
+                            final clone = List.of(attachments.value);
+                            clone.insert(idx + delta, clone.removeAt(idx));
+                            attachments.value = clone;
+                          },
+                          onAttachmentsChanged: (newAttachments) {
+                            attachments.value = newAttachments;
+                          },
+                          attachmentProgress: attachmentProgress.value,
+                        ),
+                        Gap(MediaQuery.of(context).padding.bottom),
+                      ],
+                    ),
+                error: (_, _) => const SizedBox.shrink(),
+                loading: () => const SizedBox.shrink(),
+              ),
+            ),
          // Selection mode toolbar
          if (isSelectionMode.value)
            Positioned(
--- a/lib/screens/chat/room_detail.dart
+++ b/lib/screens/chat/room_detail.dart
@@ -16,6 +16,7 @@ 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/screens/chat/chat_form.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
@@ -447,10 +448,17 @@ class _ChatRoomActionMenu extends HookConsumerWidget {
            if ((chatIdentity.value?.role ?? 0) >= 50)
              PopupMenuItem(
                onTap: () {
-                  context.pushReplacementNamed(
-                    'chatEdit',
-                    pathParameters: {'id': id},
-                  );
+                  showModalBottomSheet(
+                    context: context,
+                    useRootNavigator: true,
+                    isScrollControlled: true,
+                    builder: (context) => EditChatScreen(id: id),
+                  ).then((value) {
+                    if (value != null) {
+                      // Invalidate to refresh room data after edit
+                      ref.invalidate(chatroomProvider(id));
+                    }
+                  });
                },
                child: Row(
                  children: [
--- a/lib/screens/creators/hub.dart
+++ b/lib/screens/creators/hub.dart
@@ -177,8 +177,14 @@ class PublisherSelector extends StatelessWidget {
        iconStyleData: IconStyleData(
          icon: Icon(Icons.arrow_drop_down),
          iconSize: 19,
-          iconEnabledColor: Theme.of(context).appBarTheme.foregroundColor!,
-          iconDisabledColor: Theme.of(context).appBarTheme.foregroundColor!,
+          iconEnabledColor:
+              isWideScreen(context)
+                  ? null
+                  : Theme.of(context).appBarTheme.foregroundColor!,
+          iconDisabledColor:
+              isWideScreen(context)
+                  ? null
+                  : Theme.of(context).appBarTheme.foregroundColor!,
        ),
      ),
    );
@@ -255,7 +261,11 @@ class _PublisherUnselectedWidget extends HookConsumerWidget {
            subtitle: Text('createPublisherHint').tr(),
            trailing: const Icon(Symbols.chevron_right),
            onTap: () {
-              context.pushNamed('creatorNew').then((value) {
+              showModalBottomSheet(
+                context: context,
+                isScrollControlled: true,
+                builder: (context) => const NewPublisherScreen(),
+              ).then((value) {
                if (value != null) {
                  ref.invalidate(publishersManagedProvider);
                }
@@ -279,19 +289,18 @@ class CreatorHubScreen extends HookConsumerWidget {
    );

    void updatePublisher() {
-      context
-          .pushNamed(
-            'creatorEdit',
-            pathParameters: {'name': currentPublisher.value!.name},
-          )
-          .then((value) async {
-            if (value == null) return;
-            final data = await ref.refresh(publishersManagedProvider.future);
-            currentPublisher.value =
-                data
-                    .where((e) => e.id == currentPublisher.value!.id)
-                    .firstOrNull;
-          });
+      showModalBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        builder:
+            (context) =>
+                EditPublisherScreen(name: currentPublisher.value!.name),
+      ).then((value) async {
+        if (value == null) return;
+        final data = await ref.refresh(publishersManagedProvider.future);
+        currentPublisher.value =
+            data.where((e) => e.id == currentPublisher.value!.id).firstOrNull;
+      });
    }

    void deletePublisher() {
@@ -561,6 +570,7 @@ class CreatorHubScreen extends HookConsumerWidget {
                              ? Column(
                                spacing: 8,
                                children: [
+                                  const SizedBox.shrink(),
                                  PublisherSelector(
                                    currentPublisher: currentPublisher.value,
                                    publishersMenu: publishersMenu,
@@ -821,7 +831,7 @@ class _PublisherMemberListSheet extends HookConsumerWidget {
      try {
        final apiClient = ref.watch(apiClientProvider);
        await apiClient.post(
-          '/publishers/$publisherUname/invites',
+          '/sphere/publishers/$publisherUname/invites',
          data: {'related_user_id': result.id, 'role': 0},
        );
        // Refresh both providers
@@ -952,7 +962,7 @@ class _PublisherMemberListSheet extends HookConsumerWidget {
                                      apiClientProvider,
                                    );
                                    await apiClient.delete(
-                                      '/publishers/$publisherUname/members/${member.accountId}',
+                                      '/sphere/publishers/$publisherUname/members/${member.accountId}',
                                    );
                                    // Refresh both providers
                                    memberNotifier.reset();
@@ -1077,7 +1087,7 @@ class _PublisherMemberRoleSheet extends HookConsumerWidget {

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

--- a/lib/screens/creators/poll/poll_list.dart
+++ b/lib/screens/creators/poll/poll_list.dart
@@ -1,10 +1,10 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/poll.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/screens/poll/poll_editor.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/poll/poll_feedback.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -73,10 +73,14 @@ class CreatorPollListScreen extends HookConsumerWidget {
  final String pubName;

  Future<void> _createPoll(BuildContext context) async {
-    final result = await GoRouter.of(
-      context,
-    ).pushNamed('creatorPollNew', pathParameters: {'name': pubName});
-    if (result is SnPollWithStats && context.mounted) {
+    final result = await showModalBottomSheet<SnPollWithStats>(
+      context: context,
+      isScrollControlled: true,
+      isDismissible: false,
+      enableDrag: false,
+      builder: (context) => PollEditorScreen(initialPublisher: pubName),
+    );
+    if (result != null && context.mounted) {
      Navigator.of(context).maybePop(result);
    }
  }
@@ -176,11 +180,20 @@ class _CreatorPollItem extends HookConsumerWidget {
                      Text('edit').tr(),
                    ],
                  ),
-                  onTap: () {
-                    GoRouter.of(context).pushNamed(
-                      'creatorPollEdit',
-                      pathParameters: {'name': pubName, 'id': pollWithStats.id},
+                  onTap: () async {
+                    final result = await showModalBottomSheet<SnPoll>(
+                      context: context,
+                      isScrollControlled: true,
+                      isDismissible: false,
+                      builder:
+                          (context) => PollEditorScreen(
+                            initialPublisher: pubName,
+                            initialPollId: pollWithStats.id,
+                          ),
                    );
+                    if (result != null && context.mounted) {
+                      ref.invalidate(pollListNotifierProvider(pubName));
+                    }
                  },
                ),
                PopupMenuItem(
--- a/lib/screens/creators/publishers_form.dart
+++ b/lib/screens/creators/publishers_form.dart
@@ -16,8 +16,8 @@ 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:island/widgets/content/sheet.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
@@ -95,11 +95,11 @@ class EditPublisherScreen extends HookConsumerWidget {
      try {
        final cloudFile =
            await FileUploader.createCloudFile(
+              ref: ref,
              fileData: UniversalFile(
                data: result,
                type: UniversalFileType.image,
              ),
-              client: ref.read(apiClientProvider),
            ).future;
        if (cloudFile == null) {
          throw ArgumentError('Failed to upload the file...');
@@ -177,13 +177,11 @@ class EditPublisherScreen extends HookConsumerWidget {
      }
    }

-    return AppScaffold(
-      isNoBackground: false,
-      appBar: AppBar(
-        title: Text(name == null ? 'createPublisher' : 'editPublisher').tr(),
-        leading: const PageBackButton(),
-      ),
-      body: SingleChildScrollView(
+    final titleText = (name == null ? 'createPublisher' : 'editPublisher').tr();
+
+    return SheetScaffold(
+      titleText: titleText,
+      child: SingleChildScrollView(
        padding: EdgeInsets.only(bottom: 16),
        child: Column(
          children: [
--- a/lib/screens/developers/apps.dart
+++ b/lib/screens/developers/apps.dart
@@ -1,12 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/custom_app.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/screens/developers/edit_app.dart';
+import 'package:island/screens/developers/new_app.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:island/widgets/extended_refresh_indicator.dart';
 import 'package:island/widgets/response.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -68,12 +73,18 @@ class CustomAppsScreen extends HookConsumerWidget {
                const SizedBox(height: 16),
                ElevatedButton.icon(
                  onPressed: () {
-                    context.pushNamed(
-                      'developerAppNew',
-                      pathParameters: {
-                        'name': publisherName,
-                        'projectId': projectId,
-                      },
+                    showModalBottomSheet(
+                      context: context,
+                      isScrollControlled: true,
+                      builder:
+                          (context) => SheetScaffold(
+                            titleText: 'createCustomApp'.tr(),
+                            child: NewCustomAppScreen(
+                              publisherName: publisherName,
+                              projectId: projectId,
+                              isModal: true,
+                            ),
+                          ),
                    );
                  },
                  icon: const Icon(Symbols.add),
@@ -83,129 +94,171 @@ class CustomAppsScreen extends HookConsumerWidget {
            ),
          );
        }
-        return RefreshIndicator(
+        return ExtendedRefreshIndicator(
          onRefresh:
              () => ref.refresh(
                customAppsProvider(publisherName, projectId).future,
              ),
-          child: ListView.builder(
-            padding: EdgeInsets.only(top: 4),
-            itemCount: data.length,
-            itemBuilder: (context, index) {
-              final app = data[index];
-              return Card(
-                margin: const EdgeInsets.all(8.0),
-                clipBehavior: Clip.antiAlias,
-                child: InkWell(
-                  onTap: () {
-                    context.pushNamed(
-                      'developerAppDetail',
-                      pathParameters: {
-                        'name': publisherName,
-                        'projectId': projectId,
-                        'appId': app.id,
-                      },
-                    );
-                  },
-                  child: Column(
-                    children: [
-                      SizedBox(
-                        height: 150,
-                        child: Stack(
-                          fit: StackFit.expand,
-                          children: [
-                            if (app.background != null)
-                              CloudFileWidget(
-                                item: app.background!,
-                                fit: BoxFit.cover,
-                              ).clipRRect(topLeft: 8, topRight: 8),
-                            if (app.picture != null)
-                              Positioned(
-                                left: 16,
-                                bottom: 16,
-                                child: ProfilePictureWidget(
-                                  fileId: app.picture!.id,
-                                  radius: 40,
-                                  fallbackIcon: Symbols.apps,
-                                ),
+          child: Column(
+            children: [
+              const Gap(8),
+              Card(
+                child: ListTile(
+                  title: Text('customApps').tr().padding(horizontal: 8),
+                  trailing: IconButton(
+                    onPressed: () {
+                      showModalBottomSheet(
+                        context: context,
+                        isScrollControlled: true,
+                        builder:
+                            (context) => SheetScaffold(
+                              titleText: 'createCustomApp'.tr(),
+                              child: NewCustomAppScreen(
+                                publisherName: publisherName,
+                                projectId: projectId,
+                                isModal: true,
                              ),
+                            ),
+                      );
+                    },
+                    icon: const Icon(Symbols.add),
+                  ),
+                ),
+              ),
+              Expanded(
+                child: ListView.builder(
+                  padding: EdgeInsets.zero,
+                  itemCount: data.length,
+                  itemBuilder: (context, index) {
+                    final app = data[index];
+                    return Card(
+                      clipBehavior: Clip.antiAlias,
+                      child: InkWell(
+                        onTap: () {
+                          context.pushNamed(
+                            'developerAppDetail',
+                            pathParameters: {
+                              'name': publisherName,
+                              'projectId': projectId,
+                              'appId': app.id,
+                            },
+                          );
+                        },
+                        child: Column(
+                          children: [
+                            SizedBox(
+                              height: 150,
+                              child: Stack(
+                                fit: StackFit.expand,
+                                children: [
+                                  if (app.background != null)
+                                    CloudFileWidget(
+                                      item: app.background!,
+                                      fit: BoxFit.cover,
+                                    ).clipRRect(topLeft: 8, topRight: 8),
+                                  if (app.picture != null)
+                                    Positioned(
+                                      left: 16,
+                                      bottom: 16,
+                                      child: ProfilePictureWidget(
+                                        fileId: app.picture!.id,
+                                        radius: 40,
+                                        fallbackIcon: Symbols.apps,
+                                      ),
+                                    ),
+                                ],
+                              ),
+                            ),
+                            ListTile(
+                              title: Text(app.name),
+                              subtitle: Text(
+                                app.slug,
+                                style: GoogleFonts.robotoMono(fontSize: 12),
+                              ),
+                              contentPadding: EdgeInsets.only(
+                                left: 20,
+                                right: 12,
+                              ),
+                              trailing: PopupMenuButton(
+                                itemBuilder:
+                                    (context) => [
+                                      PopupMenuItem(
+                                        value: 'edit',
+                                        child: Row(
+                                          children: [
+                                            const Icon(Symbols.edit),
+                                            const SizedBox(width: 12),
+                                            Text('edit').tr(),
+                                          ],
+                                        ),
+                                      ),
+                                      PopupMenuItem(
+                                        value: 'delete',
+                                        child: Row(
+                                          children: [
+                                            const Icon(
+                                              Symbols.delete,
+                                              color: Colors.red,
+                                            ),
+                                            const SizedBox(width: 12),
+                                            Text(
+                                              'delete',
+                                              style: TextStyle(
+                                                color: Colors.red,
+                                              ),
+                                            ).tr(),
+                                          ],
+                                        ),
+                                      ),
+                                    ],
+                                onSelected: (value) {
+                                  if (value == 'edit') {
+                                    showModalBottomSheet(
+                                      context: context,
+                                      isScrollControlled: true,
+                                      builder:
+                                          (context) => SheetScaffold(
+                                            titleText: 'editCustomApp'.tr(),
+                                            child: EditAppScreen(
+                                              publisherName: publisherName,
+                                              projectId: projectId,
+                                              id: app.id,
+                                              isModal: true,
+                                            ),
+                                          ),
+                                    );
+                                  } else if (value == 'delete') {
+                                    showConfirmAlert(
+                                      'deleteCustomAppHint'.tr(),
+                                      'deleteCustomApp'.tr(),
+                                    ).then((confirm) {
+                                      if (confirm) {
+                                        final client = ref.read(
+                                          apiClientProvider,
+                                        );
+                                        client.delete(
+                                          '/develop/developers/$publisherName/projects/$projectId/apps/${app.id}',
+                                        );
+                                        ref.invalidate(
+                                          customAppsProvider(
+                                            publisherName,
+                                            projectId,
+                                          ),
+                                        );
+                                      }
+                                    });
+                                  }
+                                },
+                              ),
+                            ),
                          ],
                        ),
                      ),
-                      ListTile(
-                        title: Text(app.name),
-                        subtitle: Text(
-                          app.slug,
-                          style: GoogleFonts.robotoMono(fontSize: 12),
-                        ),
-                        contentPadding: EdgeInsets.only(left: 20, right: 12),
-                        trailing: PopupMenuButton(
-                          itemBuilder:
-                              (context) => [
-                                PopupMenuItem(
-                                  value: 'edit',
-                                  child: Row(
-                                    children: [
-                                      const Icon(Symbols.edit),
-                                      const SizedBox(width: 12),
-                                      Text('edit').tr(),
-                                    ],
-                                  ),
-                                ),
-                                PopupMenuItem(
-                                  value: 'delete',
-                                  child: Row(
-                                    children: [
-                                      const Icon(
-                                        Symbols.delete,
-                                        color: Colors.red,
-                                      ),
-                                      const SizedBox(width: 12),
-                                      Text(
-                                        'delete',
-                                        style: TextStyle(color: Colors.red),
-                                      ).tr(),
-                                    ],
-                                  ),
-                                ),
-                              ],
-                          onSelected: (value) {
-                            if (value == 'edit') {
-                              context.pushNamed(
-                                'developerAppEdit',
-                                pathParameters: {
-                                  'name': publisherName,
-                                  'projectId': projectId,
-                                  'id': app.id,
-                                },
-                              );
-                            } else if (value == 'delete') {
-                              showConfirmAlert(
-                                'deleteCustomAppHint'.tr(),
-                                'deleteCustomApp'.tr(),
-                              ).then((confirm) {
-                                if (confirm) {
-                                  final client = ref.read(apiClientProvider);
-                                  client.delete(
-                                    '/develop/developers/$publisherName/projects/$projectId/apps/${app.id}',
-                                  );
-                                  ref.invalidate(
-                                    customAppsProvider(
-                                      publisherName,
-                                      projectId,
-                                    ),
-                                  );
-                                }
-                              });
-                            }
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
+                    );
+                  },
                ),
-              );
-            },
+              ),
+            ],
          ),
        );
      },
--- a/lib/screens/developers/bots.dart
+++ b/lib/screens/developers/bots.dart
@@ -1,15 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/bot.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/screens/developers/edit_bot.dart';
+import 'package:island/screens/developers/new_bot.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/response.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:island/widgets/extended_refresh_indicator.dart';
+import 'package:styled_widget/styled_widget.dart';

 part 'bots.g.dart';

@@ -46,12 +51,18 @@ class BotsScreen extends HookConsumerWidget {
                const SizedBox(height: 16),
                ElevatedButton.icon(
                  onPressed: () {
-                    context.pushNamed(
-                      'developerBotNew',
-                      pathParameters: {
-                        'name': publisherName,
-                        'projectId': projectId,
-                      },
+                    showModalBottomSheet(
+                      context: context,
+                      isScrollControlled: true,
+                      builder:
+                          (context) => SheetScaffold(
+                            titleText: 'createBot'.tr(),
+                            child: NewBotScreen(
+                              publisherName: publisherName,
+                              projectId: projectId,
+                              isModal: true,
+                            ),
+                          ),
                    );
                  },
                  icon: const Icon(Symbols.add),
@@ -64,95 +75,133 @@ class BotsScreen extends HookConsumerWidget {
        return ExtendedRefreshIndicator(
          onRefresh:
              () => ref.refresh(botsProvider(publisherName, projectId).future),
-          child: ListView.builder(
-            padding: const EdgeInsets.only(top: 4),
-            itemCount: data.length,
-            itemBuilder: (context, index) {
-              final bot = data[index];
-              return Card(
-                margin: const EdgeInsets.all(8.0),
+          child: Column(
+            children: [
+              const Gap(8),
+              Card(
                child: ListTile(
-                  shape: const RoundedRectangleBorder(
-                    borderRadius: BorderRadius.all(Radius.circular(8.0)),
-                  ),
-                  leading: CircleAvatar(
-                    child:
-                        bot.account.profile.picture != null
-                            ? ProfilePictureWidget(
-                              file: bot.account.profile.picture!,
-                            )
-                            : const Icon(Symbols.smart_toy),
-                  ),
-                  title: Text(bot.account.nick),
-                  subtitle: Text(bot.account.name),
-                  trailing: PopupMenuButton(
-                    itemBuilder:
-                        (context) => [
-                          PopupMenuItem(
-                            value: 'edit',
-                            child: Row(
-                              children: [
-                                const Icon(Symbols.edit),
-                                const SizedBox(width: 12),
-                                Text('edit').tr(),
-                              ],
+                  title: Text('bots').tr().padding(horizontal: 8),
+                  trailing: IconButton(
+                    onPressed: () {
+                      showModalBottomSheet(
+                        context: context,
+                        isScrollControlled: true,
+                        builder:
+                            (context) => SheetScaffold(
+                              titleText: 'createBot'.tr(),
+                              child: NewBotScreen(
+                                publisherName: publisherName,
+                                projectId: projectId,
+                                isModal: true,
+                              ),
                            ),
-                          ),
-                          PopupMenuItem(
-                            value: 'delete',
-                            child: Row(
-                              children: [
-                                const Icon(Symbols.delete, color: Colors.red),
-                                const SizedBox(width: 12),
-                                Text(
-                                  'delete',
-                                  style: TextStyle(color: Colors.red),
-                                ).tr(),
-                              ],
-                            ),
-                          ),
-                        ],
-                    onSelected: (value) {
-                      if (value == 'edit') {
-                        context.pushNamed(
-                          'developerBotEdit',
-                          pathParameters: {
-                            'name': publisherName,
-                            'projectId': projectId,
-                            'id': bot.id,
-                          },
-                        );
-                      } else if (value == 'delete') {
-                        showConfirmAlert(
-                          'deleteBotHint'.tr(),
-                          'deleteBot'.tr(),
-                        ).then((confirm) {
-                          if (confirm) {
-                            final client = ref.read(apiClientProvider);
-                            client.delete(
-                              '/develop/developers/$publisherName/projects/$projectId/bots/${bot.id}',
-                            );
-                            ref.invalidate(
-                              botsProvider(publisherName, projectId),
-                            );
-                          }
-                        });
-                      }
+                      );
                    },
+                    icon: const Icon(Symbols.add),
                  ),
-                  onTap: () {
-                    context.pushNamed(
-                      'developerBotDetail',
-                      pathParameters: {
-                        'name': publisherName,
-                        'projectId': projectId,
-                        'botId': bot.id,
-                      },
+                ),
+              ),
+              Expanded(
+                child: ListView.builder(
+                  padding: EdgeInsets.zero,
+                  itemCount: data.length,
+                  itemBuilder: (context, index) {
+                    final bot = data[index];
+                    return Card(
+                      child: ListTile(
+                        shape: const RoundedRectangleBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(8.0)),
+                        ),
+                        leading: CircleAvatar(
+                          child:
+                              bot.account.profile.picture != null
+                                  ? ProfilePictureWidget(
+                                    file: bot.account.profile.picture!,
+                                  )
+                                  : const Icon(Symbols.smart_toy),
+                        ),
+                        title: Text(bot.account.nick),
+                        subtitle: Text(bot.account.name),
+                        trailing: PopupMenuButton(
+                          itemBuilder:
+                              (context) => [
+                                PopupMenuItem(
+                                  value: 'edit',
+                                  child: Row(
+                                    children: [
+                                      const Icon(Symbols.edit),
+                                      const SizedBox(width: 12),
+                                      Text('edit').tr(),
+                                    ],
+                                  ),
+                                ),
+                                PopupMenuItem(
+                                  value: 'delete',
+                                  child: Row(
+                                    children: [
+                                      const Icon(
+                                        Symbols.delete,
+                                        color: Colors.red,
+                                      ),
+                                      const SizedBox(width: 12),
+                                      Text(
+                                        'delete',
+                                        style: TextStyle(color: Colors.red),
+                                      ).tr(),
+                                    ],
+                                  ),
+                                ),
+                              ],
+                          onSelected: (value) {
+                            if (value == 'edit') {
+                              showModalBottomSheet(
+                                context: context,
+                                isScrollControlled: true,
+                                builder:
+                                    (context) => SheetScaffold(
+                                      titleText: 'editBot'.tr(),
+                                      child: EditBotScreen(
+                                        publisherName: publisherName,
+                                        projectId: projectId,
+                                        id: bot.id,
+                                        isModal: true,
+                                      ),
+                                    ),
+                              );
+                            } else if (value == 'delete') {
+                              showConfirmAlert(
+                                'deleteBotHint'.tr(),
+                                'deleteBot'.tr(),
+                              ).then((confirm) {
+                                if (confirm) {
+                                  final client = ref.read(apiClientProvider);
+                                  client.delete(
+                                    '/develop/developers/$publisherName/projects/$projectId/bots/${bot.id}',
+                                  );
+                                  ref.invalidate(
+                                    botsProvider(publisherName, projectId),
+                                  );
+                                }
+                              });
+                            }
+                          },
+                        ),
+                        onTap: () {
+                          context.pushNamed(
+                            'developerBotDetail',
+                            pathParameters: {
+                              'name': publisherName,
+                              'projectId': projectId,
+                              'botId': bot.id,
+                            },
+                          );
+                        },
+                      ),
                    );
                  },
                ),
-              );
-            },
+              ),
+            ],
          ),
        );
      },
--- a/lib/screens/developers/edit_app.dart
+++ b/lib/screens/developers/edit_app.dart
@@ -39,11 +39,13 @@ class EditAppScreen extends HookConsumerWidget {
  final String publisherName;
  final String projectId;
  final String? id;
+  final bool isModal;
  const EditAppScreen({
    super.key,
    required this.publisherName,
    required this.projectId,
    this.id,
+    this.isModal = false,
  });

  @override
@@ -139,7 +141,7 @@ class EditAppScreen extends HookConsumerWidget {
      try {
        final cloudFile =
            await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
              fileData: UniversalFile(
                data: result,
                type: UniversalFileType.image,
@@ -177,7 +179,12 @@ class EditAppScreen extends HookConsumerWidget {
                  children: [
                    TextFormField(
                      controller: scopeController,
-                      decoration: InputDecoration(labelText: 'scopeName'.tr()),
+                      decoration: InputDecoration(
+                        labelText: 'scopeName'.tr(),
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(12)),
+                        ),
+                      ),
                    ),
                    const SizedBox(height: 20),
                    FilledButton.tonalIcon(
@@ -220,6 +227,9 @@ class EditAppScreen extends HookConsumerWidget {
                        hintText: 'https://example.com/auth/callback',
                        helperText: 'redirectUriHint'.tr(),
                        helperMaxLines: 3,
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(12)),
+                        ),
                      ),
                      keyboardType: TextInputType.url,
                      validator: (value) {
@@ -316,270 +326,298 @@ class EditAppScreen extends HookConsumerWidget {
      }
    }

+    final bodyContent =
+        app == null && !isNew
+            ? const Center(child: CircularProgressIndicator())
+            : app?.hasError == true && !isNew
+            ? ResponseErrorWidget(
+              error: app!.error,
+              onRetry:
+                  () => ref.invalidate(
+                    customAppProvider(publisherName, projectId, id!),
+                  ),
+            )
+            : 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.apps,
+                            ),
+                            onTap: () {
+                              setPicture('picture');
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                  ).padding(bottom: 32),
+                  Form(
+                    key: formKey,
+                    child: Column(
+                      children: [
+                        TextFormField(
+                          controller: nameController,
+                          decoration: InputDecoration(
+                            labelText: 'name'.tr(),
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12),
+                              ),
+                            ),
+                          ),
+                          onTapOutside:
+                              (_) =>
+                                  FocusManager.instance.primaryFocus?.unfocus(),
+                        ),
+                        const SizedBox(height: 16),
+                        TextFormField(
+                          controller: slugController,
+                          decoration: InputDecoration(
+                            labelText: 'slug'.tr(),
+                            helperText: 'slugHint'.tr(),
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12),
+                              ),
+                            ),
+                          ),
+                          onTapOutside:
+                              (_) =>
+                                  FocusManager.instance.primaryFocus?.unfocus(),
+                        ),
+                        const SizedBox(height: 16),
+                        TextFormField(
+                          controller: descriptionController,
+                          decoration: InputDecoration(
+                            labelText: 'description'.tr(),
+                            alignLabelWithHint: true,
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12),
+                              ),
+                            ),
+                          ),
+                          maxLines: 3,
+                          onTapOutside:
+                              (_) =>
+                                  FocusManager.instance.primaryFocus?.unfocus(),
+                        ),
+                        const SizedBox(height: 16),
+                        ExpansionPanelList(
+                          expansionCallback: (index, isExpanded) {
+                            switch (index) {
+                              case 0:
+                                enableLinks.value = isExpanded;
+                                break;
+                              case 1:
+                                oauthEnabled.value = isExpanded;
+                                break;
+                            }
+                          },
+                          children: [
+                            ExpansionPanel(
+                              headerBuilder:
+                                  (context, isExpanded) =>
+                                      ListTile(title: Text('appLinks').tr()),
+                              body: Column(
+                                spacing: 16,
+                                children: [
+                                  TextFormField(
+                                    controller: homePageController,
+                                    decoration: InputDecoration(
+                                      labelText: 'homePageUrl'.tr(),
+                                      hintText: 'https://example.com',
+                                      border: OutlineInputBorder(
+                                        borderRadius: BorderRadius.all(
+                                          Radius.circular(12),
+                                        ),
+                                      ),
+                                    ),
+                                    keyboardType: TextInputType.url,
+                                  ),
+                                  TextFormField(
+                                    controller: privacyPolicyController,
+                                    decoration: InputDecoration(
+                                      labelText: 'privacyPolicyUrl'.tr(),
+                                      hintText: 'https://example.com/privacy',
+                                      border: OutlineInputBorder(
+                                        borderRadius: BorderRadius.all(
+                                          Radius.circular(12),
+                                        ),
+                                      ),
+                                    ),
+                                    keyboardType: TextInputType.url,
+                                  ),
+                                  TextFormField(
+                                    controller: termsController,
+                                    decoration: InputDecoration(
+                                      labelText: 'termsOfServiceUrl'.tr(),
+                                      hintText: 'https://example.com/terms',
+                                      border: OutlineInputBorder(
+                                        borderRadius: BorderRadius.all(
+                                          Radius.circular(12),
+                                        ),
+                                      ),
+                                    ),
+                                    keyboardType: TextInputType.url,
+                                  ),
+                                ],
+                              ).padding(horizontal: 16, bottom: 24),
+                              isExpanded: enableLinks.value,
+                            ),
+                            ExpansionPanel(
+                              headerBuilder:
+                                  (context, isExpanded) =>
+                                      ListTile(title: Text('oauthConfig').tr()),
+                              body: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text('redirectUris'.tr()),
+                                  Card(
+                                    margin: const EdgeInsets.symmetric(
+                                      vertical: 8,
+                                    ),
+                                    child: Column(
+                                      children: [
+                                        ...redirectUris.value.map(
+                                          (uri) => ListTile(
+                                            title: Text(uri),
+                                            trailing: IconButton(
+                                              icon: const Icon(Symbols.delete),
+                                              onPressed: () {
+                                                redirectUris.value =
+                                                    redirectUris.value
+                                                        .where((u) => u != uri)
+                                                        .toList();
+                                              },
+                                            ),
+                                          ),
+                                        ),
+                                        if (redirectUris.value.isNotEmpty)
+                                          const Divider(height: 1),
+                                        ListTile(
+                                          leading: const Icon(Symbols.add),
+                                          title: Text('addRedirectUri'.tr()),
+                                          onTap: showAddRedirectUriDialog,
+                                          shape: RoundedRectangleBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              8,
+                                            ),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                  const SizedBox(height: 16),
+                                  Text('allowedScopes'.tr()),
+                                  Card(
+                                    margin: const EdgeInsets.symmetric(
+                                      vertical: 8,
+                                    ),
+                                    child: Column(
+                                      children: [
+                                        ...allowedScopes.value.map(
+                                          (scope) => ListTile(
+                                            title: Text(scope),
+                                            trailing: IconButton(
+                                              icon: const Icon(Symbols.delete),
+                                              onPressed: () {
+                                                allowedScopes.value =
+                                                    allowedScopes.value
+                                                        .where(
+                                                          (s) => s != scope,
+                                                        )
+                                                        .toList();
+                                              },
+                                            ),
+                                          ),
+                                        ),
+                                        if (allowedScopes.value.isNotEmpty)
+                                          const Divider(height: 1),
+                                        ListTile(
+                                          leading: const Icon(Symbols.add),
+                                          title: Text('add').tr(),
+                                          onTap: showAddScopeDialog,
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                  const SizedBox(height: 16),
+                                  SwitchListTile(
+                                    title: Text('requirePkce'.tr()),
+                                    value: requirePkce.value,
+                                    onChanged:
+                                        (value) => requirePkce.value = value,
+                                  ),
+                                  SwitchListTile(
+                                    title: Text('allowOfflineAccess'.tr()),
+                                    value: allowOfflineAccess.value,
+                                    onChanged:
+                                        (value) =>
+                                            allowOfflineAccess.value = value,
+                                  ),
+                                ],
+                              ).padding(horizontal: 16, bottom: 24),
+                              isExpanded: oauthEnabled.value,
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 16),
+                        Align(
+                          alignment: Alignment.centerRight,
+                          child: TextButton.icon(
+                            onPressed: submitting.value ? null : performAction,
+                            label: Text('saveChanges'.tr()),
+                            icon: const Icon(Symbols.save),
+                          ),
+                        ),
+                      ],
+                    ).padding(all: 24),
+                  ),
+                ],
+              ),
+            );
+
+    if (isModal) {
+      return bodyContent;
+    }
+
    return AppScaffold(
      isNoBackground: false,
      appBar: AppBar(
        title: Text(isNew ? 'createCustomApp'.tr() : 'editCustomApp'.tr()),
      ),
-      body:
-          app == null && !isNew
-              ? const Center(child: CircularProgressIndicator())
-              : app?.hasError == true && !isNew
-              ? ResponseErrorWidget(
-                error: app!.error,
-                onRetry:
-                    () => ref.invalidate(
-                      customAppProvider(publisherName, projectId, id!),
-                    ),
-              )
-              : 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.apps,
-                              ),
-                              onTap: () {
-                                setPicture('picture');
-                              },
-                            ),
-                          ),
-                        ],
-                      ),
-                    ).padding(bottom: 32),
-                    Form(
-                      key: formKey,
-                      child: Column(
-                        children: [
-                          TextFormField(
-                            controller: nameController,
-                            decoration: InputDecoration(labelText: 'name'.tr()),
-                            onTapOutside:
-                                (_) =>
-                                    FocusManager.instance.primaryFocus
-                                        ?.unfocus(),
-                          ),
-                          const SizedBox(height: 16),
-                          TextFormField(
-                            controller: slugController,
-                            decoration: InputDecoration(
-                              labelText: 'slug'.tr(),
-                              helperText: 'slugHint'.tr(),
-                            ),
-                            onTapOutside:
-                                (_) =>
-                                    FocusManager.instance.primaryFocus
-                                        ?.unfocus(),
-                          ),
-                          const SizedBox(height: 16),
-                          TextFormField(
-                            controller: descriptionController,
-                            decoration: InputDecoration(
-                              labelText: 'description'.tr(),
-                              alignLabelWithHint: true,
-                            ),
-                            maxLines: 3,
-                            onTapOutside:
-                                (_) =>
-                                    FocusManager.instance.primaryFocus
-                                        ?.unfocus(),
-                          ),
-                          const SizedBox(height: 16),
-                          ExpansionPanelList(
-                            expansionCallback: (index, isExpanded) {
-                              switch (index) {
-                                case 0:
-                                  enableLinks.value = isExpanded;
-                                  break;
-                                case 1:
-                                  oauthEnabled.value = isExpanded;
-                                  break;
-                              }
-                            },
-                            children: [
-                              ExpansionPanel(
-                                headerBuilder:
-                                    (context, isExpanded) =>
-                                        ListTile(title: Text('appLinks').tr()),
-                                body: Column(
-                                  spacing: 16,
-                                  children: [
-                                    TextFormField(
-                                      controller: homePageController,
-                                      decoration: InputDecoration(
-                                        labelText: 'homePageUrl'.tr(),
-                                        hintText: 'https://example.com',
-                                      ),
-                                      keyboardType: TextInputType.url,
-                                    ),
-                                    TextFormField(
-                                      controller: privacyPolicyController,
-                                      decoration: InputDecoration(
-                                        labelText: 'privacyPolicyUrl'.tr(),
-                                        hintText: 'https://example.com/privacy',
-                                      ),
-                                      keyboardType: TextInputType.url,
-                                    ),
-                                    TextFormField(
-                                      controller: termsController,
-                                      decoration: InputDecoration(
-                                        labelText: 'termsOfServiceUrl'.tr(),
-                                        hintText: 'https://example.com/terms',
-                                      ),
-                                      keyboardType: TextInputType.url,
-                                    ),
-                                  ],
-                                ).padding(horizontal: 16, bottom: 24),
-                                isExpanded: enableLinks.value,
-                              ),
-                              ExpansionPanel(
-                                headerBuilder:
-                                    (context, isExpanded) => ListTile(
-                                      title: Text('oauthConfig').tr(),
-                                    ),
-                                body: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    Text('redirectUris'.tr()),
-                                    Card(
-                                      margin: const EdgeInsets.symmetric(
-                                        vertical: 8,
-                                      ),
-                                      child: Column(
-                                        children: [
-                                          ...redirectUris.value.map(
-                                            (uri) => ListTile(
-                                              title: Text(uri),
-                                              trailing: IconButton(
-                                                icon: const Icon(
-                                                  Symbols.delete,
-                                                ),
-                                                onPressed: () {
-                                                  redirectUris.value =
-                                                      redirectUris.value
-                                                          .where(
-                                                            (u) => u != uri,
-                                                          )
-                                                          .toList();
-                                                },
-                                              ),
-                                            ),
-                                          ),
-                                          if (redirectUris.value.isNotEmpty)
-                                            const Divider(height: 1),
-                                          ListTile(
-                                            leading: const Icon(Symbols.add),
-                                            title: Text('addRedirectUri'.tr()),
-                                            onTap: showAddRedirectUriDialog,
-                                            shape: RoundedRectangleBorder(
-                                              borderRadius:
-                                                  BorderRadius.circular(8),
-                                            ),
-                                          ),
-                                        ],
-                                      ),
-                                    ),
-                                    const SizedBox(height: 16),
-                                    Text('allowedScopes'.tr()),
-                                    Card(
-                                      margin: const EdgeInsets.symmetric(
-                                        vertical: 8,
-                                      ),
-                                      child: Column(
-                                        children: [
-                                          ...allowedScopes.value.map(
-                                            (scope) => ListTile(
-                                              title: Text(scope),
-                                              trailing: IconButton(
-                                                icon: const Icon(
-                                                  Symbols.delete,
-                                                ),
-                                                onPressed: () {
-                                                  allowedScopes.value =
-                                                      allowedScopes.value
-                                                          .where(
-                                                            (s) => s != scope,
-                                                          )
-                                                          .toList();
-                                                },
-                                              ),
-                                            ),
-                                          ),
-                                          if (allowedScopes.value.isNotEmpty)
-                                            const Divider(height: 1),
-                                          ListTile(
-                                            leading: const Icon(Symbols.add),
-                                            title: Text('add').tr(),
-                                            onTap: showAddScopeDialog,
-                                          ),
-                                        ],
-                                      ),
-                                    ),
-                                    const SizedBox(height: 16),
-                                    SwitchListTile(
-                                      title: Text('requirePkce'.tr()),
-                                      value: requirePkce.value,
-                                      onChanged:
-                                          (value) => requirePkce.value = value,
-                                    ),
-                                    SwitchListTile(
-                                      title: Text('allowOfflineAccess'.tr()),
-                                      value: allowOfflineAccess.value,
-                                      onChanged:
-                                          (value) =>
-                                              allowOfflineAccess.value = value,
-                                    ),
-                                  ],
-                                ).padding(horizontal: 16, bottom: 24),
-                                isExpanded: oauthEnabled.value,
-                              ),
-                            ],
-                          ),
-                          const SizedBox(height: 16),
-                          Align(
-                            alignment: Alignment.centerRight,
-                            child: TextButton.icon(
-                              onPressed:
-                                  submitting.value ? null : performAction,
-                              label: Text('saveChanges'.tr()),
-                              icon: const Icon(Symbols.save),
-                            ),
-                          ),
-                        ],
-                      ).padding(all: 24),
-                    ),
-                  ],
-                ),
-              ),
+      body: bodyContent,
    );
  }
 }
--- a/lib/screens/developers/edit_bot.dart
+++ b/lib/screens/developers/edit_bot.dart
@@ -38,11 +38,13 @@ class EditBotScreen extends HookConsumerWidget {
  final String publisherName;
  final String projectId;
  final String? id;
+  final bool isModal;
  const EditBotScreen({
    super.key,
    required this.publisherName,
    required this.projectId,
    this.id,
+    this.isModal = false,
  });

  @override
@@ -125,11 +127,11 @@ class EditBotScreen extends HookConsumerWidget {
      try {
        final cloudFile =
            await FileUploader.createCloudFile(
+              ref: ref,
              fileData: UniversalFile(
                data: result,
                type: UniversalFileType.image,
              ),
-              client: ref.read(apiClientProvider),
            ).future;
        if (cloudFile == null) {
          throw ArgumentError('Failed to upload the file...');
@@ -191,230 +193,293 @@ class EditBotScreen extends HookConsumerWidget {
      }
    }

+    final bodyContent =
+        botData == null && !isNew
+            ? const Center(child: CircularProgressIndicator())
+            : botData?.hasError == true && !isNew
+            ? ResponseErrorWidget(
+              error: botData!.error,
+              onRetry:
+                  () => ref.invalidate(
+                    botProvider(publisherName, projectId, id!),
+                  ),
+            )
+            : 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.smart_toy,
+                            ),
+                            onTap: () {
+                              setPicture('picture');
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                  ).padding(bottom: 32),
+                  Form(
+                    key: formKey,
+                    child: Column(
+                      children: [
+                        TextFormField(
+                          controller: nameController,
+                          decoration: InputDecoration(
+                            labelText: 'name'.tr(),
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12),
+                              ),
+                            ),
+                          ),
+                        ),
+                        const SizedBox(height: 16),
+                        TextFormField(
+                          controller: nickController,
+                          decoration: InputDecoration(
+                            labelText: 'nickname'.tr(),
+                            alignLabelWithHint: true,
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12),
+                              ),
+                            ),
+                          ),
+                        ),
+                        const SizedBox(height: 16),
+                        TextFormField(
+                          controller: slugController,
+                          decoration: InputDecoration(
+                            labelText: 'slug'.tr(),
+                            helperText: 'slugHint'.tr(),
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12),
+                              ),
+                            ),
+                          ),
+                        ),
+                        const SizedBox(height: 16),
+                        TextFormField(
+                          controller: bioController,
+                          decoration: InputDecoration(
+                            labelText: 'bio'.tr(),
+                            alignLabelWithHint: true,
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12),
+                              ),
+                            ),
+                          ),
+                          maxLines: 3,
+                        ),
+                        const SizedBox(height: 16),
+                        Row(
+                          spacing: 16,
+                          children: [
+                            Expanded(
+                              child: TextFormField(
+                                controller: firstNameController,
+                                decoration: InputDecoration(
+                                  labelText: 'firstName'.tr(),
+                                  border: OutlineInputBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(12),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                            Expanded(
+                              child: TextFormField(
+                                controller: middleNameController,
+                                decoration: InputDecoration(
+                                  labelText: 'middleName'.tr(),
+                                  border: OutlineInputBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(12),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                            Expanded(
+                              child: TextFormField(
+                                controller: lastNameController,
+                                decoration: InputDecoration(
+                                  labelText: 'lastName'.tr(),
+                                  border: OutlineInputBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(12),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 16),
+                        Row(
+                          spacing: 16,
+                          children: [
+                            Expanded(
+                              child: TextFormField(
+                                controller: genderController,
+                                decoration: InputDecoration(
+                                  labelText: 'gender'.tr(),
+                                  border: OutlineInputBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(12),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                            Expanded(
+                              child: TextFormField(
+                                controller: pronounsController,
+                                decoration: InputDecoration(
+                                  labelText: 'pronouns'.tr(),
+                                  border: OutlineInputBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(12),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 16),
+                        Row(
+                          spacing: 16,
+                          children: [
+                            Expanded(
+                              child: TextFormField(
+                                controller: locationController,
+                                decoration: InputDecoration(
+                                  labelText: 'location'.tr(),
+                                  border: OutlineInputBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(12),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                            Expanded(
+                              child: TextFormField(
+                                controller: timeZoneController,
+                                decoration: InputDecoration(
+                                  labelText: 'timeZone'.tr(),
+                                  border: OutlineInputBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(12),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 16),
+                        GestureDetector(
+                          onTap: () async {
+                            final date = await showDatePicker(
+                              context: context,
+                              initialDate: birthday.value ?? DateTime.now(),
+                              firstDate: DateTime(1900),
+                              lastDate: DateTime.now(),
+                            );
+                            if (date != null) {
+                              birthday.value = date;
+                            }
+                          },
+                          child: Container(
+                            padding: const EdgeInsets.all(16),
+                            decoration: BoxDecoration(
+                              border: Border.all(
+                                color: Theme.of(context).dividerColor,
+                                width: 1,
+                              ),
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12),
+                              ),
+                            ),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.stretch,
+                              children: [
+                                Text(
+                                  'birthday'.tr(),
+                                  style: TextStyle(
+                                    color: Theme.of(context).hintColor,
+                                  ),
+                                ),
+                                Text(
+                                  birthday.value != null
+                                      ? DateFormat.yMMMd().format(
+                                        birthday.value!,
+                                      )
+                                      : 'Select a date'.tr(),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        const SizedBox(height: 16),
+                        Align(
+                          alignment: Alignment.centerRight,
+                          child: TextButton.icon(
+                            onPressed: submitting.value ? null : performAction,
+                            label: Text('saveChanges').tr(),
+                            icon: const Icon(Symbols.save),
+                          ),
+                        ),
+                      ],
+                    ).padding(all: 24),
+                  ),
+                ],
+              ),
+            );
+
+    if (isModal) {
+      return bodyContent;
+    }
+
    return AppScaffold(
      isNoBackground: false,
      appBar: AppBar(title: Text(isNew ? 'createBot'.tr() : 'editBot'.tr())),
-      body:
-          botData == null && !isNew
-              ? const Center(child: CircularProgressIndicator())
-              : botData?.hasError == true && !isNew
-              ? ResponseErrorWidget(
-                error: botData!.error,
-                onRetry:
-                    () => ref.invalidate(
-                      botProvider(publisherName, projectId, id!),
-                    ),
-              )
-              : 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.smart_toy,
-                              ),
-                              onTap: () {
-                                setPicture('picture');
-                              },
-                            ),
-                          ),
-                        ],
-                      ),
-                    ).padding(bottom: 32),
-                    Form(
-                      key: formKey,
-                      child: Column(
-                        children: [
-                          TextFormField(
-                            controller: nameController,
-                            decoration: InputDecoration(labelText: 'name'.tr()),
-                          ),
-                          const SizedBox(height: 16),
-                          TextFormField(
-                            controller: nickController,
-                            decoration: InputDecoration(
-                              labelText: 'nickname'.tr(),
-                              alignLabelWithHint: true,
-                            ),
-                          ),
-                          const SizedBox(height: 16),
-                          TextFormField(
-                            controller: slugController,
-                            decoration: InputDecoration(
-                              labelText: 'slug'.tr(),
-                              helperText: 'slugHint'.tr(),
-                            ),
-                          ),
-                          const SizedBox(height: 16),
-                          TextFormField(
-                            controller: bioController,
-                            decoration: InputDecoration(
-                              labelText: 'bio'.tr(),
-                              alignLabelWithHint: true,
-                            ),
-                            maxLines: 3,
-                          ),
-                          const SizedBox(height: 16),
-                          Row(
-                            spacing: 16,
-                            children: [
-                              Expanded(
-                                child: TextFormField(
-                                  controller: firstNameController,
-                                  decoration: InputDecoration(
-                                    labelText: 'firstName'.tr(),
-                                  ),
-                                ),
-                              ),
-                              Expanded(
-                                child: TextFormField(
-                                  controller: middleNameController,
-                                  decoration: InputDecoration(
-                                    labelText: 'middleName'.tr(),
-                                  ),
-                                ),
-                              ),
-                              Expanded(
-                                child: TextFormField(
-                                  controller: lastNameController,
-                                  decoration: InputDecoration(
-                                    labelText: 'lastName'.tr(),
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-                          const SizedBox(height: 16),
-                          Row(
-                            spacing: 16,
-                            children: [
-                              Expanded(
-                                child: TextFormField(
-                                  controller: genderController,
-                                  decoration: InputDecoration(
-                                    labelText: 'gender'.tr(),
-                                  ),
-                                ),
-                              ),
-                              Expanded(
-                                child: TextFormField(
-                                  controller: pronounsController,
-                                  decoration: InputDecoration(
-                                    labelText: 'pronouns'.tr(),
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-                          const SizedBox(height: 16),
-                          Row(
-                            spacing: 16,
-                            children: [
-                              Expanded(
-                                child: TextFormField(
-                                  controller: locationController,
-                                  decoration: InputDecoration(
-                                    labelText: 'location'.tr(),
-                                  ),
-                                ),
-                              ),
-                              Expanded(
-                                child: TextFormField(
-                                  controller: timeZoneController,
-                                  decoration: InputDecoration(
-                                    labelText: 'timeZone'.tr(),
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-                          const SizedBox(height: 16),
-                          GestureDetector(
-                            onTap: () async {
-                              final date = await showDatePicker(
-                                context: context,
-                                initialDate: birthday.value ?? DateTime.now(),
-                                firstDate: DateTime(1900),
-                                lastDate: DateTime.now(),
-                              );
-                              if (date != null) {
-                                birthday.value = date;
-                              }
-                            },
-                            child: Container(
-                              padding: const EdgeInsets.symmetric(vertical: 8),
-                              decoration: BoxDecoration(
-                                border: Border(
-                                  bottom: BorderSide(
-                                    color: Theme.of(context).dividerColor,
-                                    width: 1,
-                                  ),
-                                ),
-                              ),
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.stretch,
-                                children: [
-                                  Text(
-                                    'birthday'.tr(),
-                                    style: TextStyle(
-                                      color: Theme.of(context).hintColor,
-                                    ),
-                                  ),
-                                  Text(
-                                    birthday.value != null
-                                        ? DateFormat.yMMMd().format(
-                                          birthday.value!,
-                                        )
-                                        : 'Select a date'.tr(),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                          const SizedBox(height: 16),
-                          Align(
-                            alignment: Alignment.centerRight,
-                            child: TextButton.icon(
-                              onPressed:
-                                  submitting.value ? null : performAction,
-                              label: Text('saveChanges').tr(),
-                              icon: const Icon(Symbols.save),
-                            ),
-                          ),
-                        ],
-                      ).padding(all: 24),
-                    ),
-                  ],
-                ),
-              ),
+      body: bodyContent,
    );
  }
 }
--- a/lib/screens/developers/hub.dart
+++ b/lib/screens/developers/hub.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -21,7 +19,6 @@ import 'package:island/widgets/response.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:url_launcher/url_launcher_string.dart';

 part 'hub.g.dart';

@@ -100,15 +97,6 @@ class DeveloperHubScreen extends HookConsumerWidget {
      ),
      body: Column(
        children: [
-          if (currentProject.value == null)
-            ...([
-              // Welcome Section
-              _WelcomeSection(currentDeveloper: currentDeveloper.value),
-
-              // Navigation Tabs
-              _NavigationTabs(),
-            ]),
-
          // Main Content
          if (currentProject.value != null)
            Expanded(
@@ -190,174 +178,12 @@ class _ConsoleAppBar extends StatelessWidget implements PreferredSizeWidget {
            currentProject: currentProject,
            onProjectChanged: onProjectChanged,
          ),
-        IconButton(
-          icon: const Icon(Symbols.help, color: Color(0xFF5F6368)),
-          onPressed: () {
-            launchUrlString('https://kb.solsynth.dev');
-          },
-        ),
-        const Gap(12),
+        const Gap(8),
      ],
    );
  }
 }

-// Welcome Section
-class _WelcomeSection extends StatelessWidget {
-  final SnDeveloper? currentDeveloper;
-
-  const _WelcomeSection({required this.currentDeveloper});
-
-  @override
-  Widget build(BuildContext context) {
-    final isDark = Theme.of(context).brightness == Brightness.dark;
-    return Stack(
-      children: [
-        Positioned.fill(
-          child: Container(
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                colors:
-                    isDark
-                        ? [
-                          Theme.of(context).colorScheme.surfaceContainerHighest,
-                          Theme.of(context).colorScheme.surfaceContainerLow,
-                        ]
-                        : [const Color(0xFFE8F0FE), const Color(0xFFF1F3F4)],
-                begin: Alignment.topLeft,
-                end: Alignment.bottomRight,
-              ),
-            ),
-          ),
-        ),
-        Positioned(
-          right: 16,
-          top: 0,
-          bottom: 0,
-          child: _RandomStickerImage(
-            width: 180,
-            height: 180,
-          ).opacity(isWideScreen(context) ? 1 : 0.5),
-        ),
-        Container(
-          height: 180,
-          width: double.infinity,
-          padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 16),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Text(
-                'Good morning!',
-                style: TextStyle(
-                  fontSize: 32,
-                  fontWeight: FontWeight.w400,
-                  color: Theme.of(context).colorScheme.onSurface,
-                ),
-              ),
-              const Gap(4),
-              Text(
-                currentDeveloper != null
-                    ? "You're working as ${currentDeveloper!.publisher!.nick}"
-                    : "Choose a developer and continue.",
-                style: TextStyle(
-                  fontSize: 16,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-// Random Sticker Image Widget
-class _RandomStickerImage extends StatelessWidget {
-  final double? width;
-  final double? height;
-
-  const _RandomStickerImage({this.width, this.height});
-
-  static const List<String> _stickers = [
-    'assets/images/stickers/clap.png',
-    'assets/images/stickers/confuse.png',
-    'assets/images/stickers/pray.png',
-    'assets/images/stickers/thumb_up.png',
-  ];
-
-  String _getRandomSticker() {
-    final random = Random();
-    return _stickers[random.nextInt(_stickers.length)];
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Image.asset(
-      _getRandomSticker(),
-      width: width ?? 80,
-      height: height ?? 80,
-      fit: BoxFit.contain,
-    );
-  }
-}
-
-// Navigation Tabs
-class _NavigationTabs extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(color: Theme.of(context).colorScheme.surface),
-      child: Row(
-        children: [
-          const Gap(24),
-          _NavTabItem(title: 'Dashboard', isActive: true),
-        ],
-      ),
-    );
-  }
-}
-
-class _NavTabItem extends StatelessWidget {
-  final String title;
-  final bool isActive;
-
-  const _NavTabItem({required this.title, this.isActive = false});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-      decoration: BoxDecoration(
-        border: Border(
-          bottom: BorderSide(
-            color:
-                isActive
-                    ? Theme.of(context).colorScheme.primary
-                    : Colors.transparent,
-            width: 2,
-          ),
-        ),
-      ),
-      child: Row(
-        children: [
-          Text(
-            title,
-            style: TextStyle(
-              color:
-                  isActive
-                      ? Theme.of(context).colorScheme.primary
-                      : Theme.of(context).colorScheme.onSurface,
-              fontWeight: isActive ? FontWeight.w500 : FontWeight.w400,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
 // Main Content Section
 class _MainContentSection extends HookConsumerWidget {
  final SnDeveloper? currentDeveloper;
--- a/lib/screens/developers/new_app.dart
+++ b/lib/screens/developers/new_app.dart
@@ -4,10 +4,20 @@ import 'package:island/screens/developers/edit_app.dart';
 class NewCustomAppScreen extends StatelessWidget {
  final String publisherName;
  final String projectId;
-  const NewCustomAppScreen({super.key, required this.publisherName, required this.projectId});
+  final bool isModal;
+  const NewCustomAppScreen({
+    super.key,
+    required this.publisherName,
+    required this.projectId,
+    this.isModal = false,
+  });

  @override
  Widget build(BuildContext context) {
-    return EditAppScreen(publisherName: publisherName, projectId: projectId);
+    return EditAppScreen(
+      publisherName: publisherName,
+      projectId: projectId,
+      isModal: isModal,
+    );
  }
 }
--- a/lib/screens/developers/new_bot.dart
+++ b/lib/screens/developers/new_bot.dart
@@ -1,14 +1,23 @@
-
 import 'package:flutter/material.dart';
 import 'package:island/screens/developers/edit_bot.dart';

 class NewBotScreen extends StatelessWidget {
  final String publisherName;
  final String projectId;
-  const NewBotScreen({super.key, required this.publisherName, required this.projectId});
+  final bool isModal;
+  const NewBotScreen({
+    super.key,
+    required this.publisherName,
+    required this.projectId,
+    this.isModal = false,
+  });

  @override
  Widget build(BuildContext context) {
-    return EditBotScreen(publisherName: publisherName, projectId: projectId);
+    return EditBotScreen(
+      publisherName: publisherName,
+      projectId: projectId,
+      isModal: isModal,
+    );
  }
 }
--- a/lib/screens/developers/project_detail_view.dart
+++ b/lib/screens/developers/project_detail_view.dart
@@ -1,11 +1,13 @@
 import 'package:easy_localization/easy_localization.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/dev_project.dart';
 import 'package:island/screens/developers/apps.dart';
 import 'package:island/screens/developers/bots.dart';
 import 'package:island/services/responsive.dart';
+import 'package:styled_widget/styled_widget.dart';

 class ProjectDetailView extends HookConsumerWidget {
  final String publisherName;
@@ -54,6 +56,37 @@ class ProjectDetailView extends HookConsumerWidget {
                    label: Text('bots'.tr()),
                  ),
                ],
+                leading: Container(
+                  width: isWiderScreen(context) ? 256 : 80,
+                  padding: const EdgeInsets.only(
+                    left: 24,
+                    right: 24,
+                    bottom: 8,
+                    top: 2,
+                  ),
+                  decoration: BoxDecoration(
+                    border: Border(
+                      bottom: BorderSide(
+                        color: Theme.of(
+                          context,
+                        ).colorScheme.onSurface.withOpacity(0.12),
+                      ),
+                    ),
+                  ),
+                  child: Row(
+                    spacing: 8,
+                    children: [
+                      IconButton(
+                        onPressed: onBackToHub,
+                        icon: const Icon(Icons.arrow_back),
+                        iconSize: 16,
+                        visualDensity: VisualDensity.compact,
+                      ),
+                      if (isWiderScreen(context))
+                        Expanded(child: Text("backToHub").tr()),
+                    ],
+                  ),
+                ),
              ),
            ),
          ),
@@ -69,6 +102,7 @@ class ProjectDetailView extends HookConsumerWidget {
              ],
            ),
          ),
+          const Gap(4),
        ],
      );
    } else {
@@ -97,7 +131,7 @@ class ProjectDetailView extends HookConsumerWidget {
                ),
                BotsScreen(publisherName: publisherName, projectId: project.id),
              ],
-            ),
+            ).padding(horizontal: 8),
          ),
        ],
      );
--- a/lib/screens/explore.dart
+++ b/lib/screens/explore.dart
@@ -11,14 +11,16 @@ import 'package:island/models/realm.dart';
 import 'package:island/models/webfeed.dart';
 import 'package:island/pods/event_calendar.dart';
 import 'package:island/pods/userinfo.dart';
+import 'package:island/screens/auth/login_modal.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/widgets/account/friends_overview.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/navigation/fab_menu.dart';
 import 'package:island/widgets/post/post_featured.dart';
 import 'package:island/widgets/post/post_item.dart';
-import 'package:island/widgets/post/compose_card.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
@@ -72,6 +74,22 @@ class ExploreScreen extends HookConsumerWidget {
    final tabController = useTabController(initialLength: 3);
    final currentFilter = useState<String?>(null);

+    useEffect(() {
+      // Set FAB type to chat
+      final fabMenuNotifier = ref.read(fabMenuTypeProvider.notifier);
+      Future(() {
+        fabMenuNotifier.state = FabMenuType.compose;
+      });
+      return () {
+        // Clean up: reset FAB type to main
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (fabMenuNotifier.state == FabMenuType.compose) {
+            fabMenuNotifier.state = FabMenuType.main;
+          }
+        });
+      };
+    }, []);
+
    useEffect(() {
      void listener() {
        switch (tabController.index) {
@@ -130,6 +148,7 @@ class ExploreScreen extends HookConsumerWidget {
              tabAlignment: TabAlignment.start,
              isScrollable: true,
              dividerColor: Colors.transparent,
+              labelPadding: const EdgeInsets.symmetric(horizontal: 12),
              tabs: [
                Tab(
                  icon: Tooltip(
@@ -323,7 +342,7 @@ class ExploreScreen extends HookConsumerWidget {
                        margin: EdgeInsets.zero,
                      ),
                    PostFeaturedList(),
-                    const PostComposeCard(),
+                    FriendsOverviewWidget(),
                  ],
                ),
              ),
@@ -332,21 +351,39 @@ class ExploreScreen extends HookConsumerWidget {
        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),
+            child:
+                Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    const Icon(Symbols.emoji_people_rounded, size: 40),
+                    const Gap(8),
+                    Text(
+                      'Welcome to\nthe Solar Network',
+                      style: Theme.of(context).textTheme.titleLarge,
+                      textAlign: TextAlign.center,
+                    ).bold(),
+                    const Gap(2),
+                    Text(
+                      'Login to explore more!',
+                      style: Theme.of(context).textTheme.bodyLarge,
+                      textAlign: TextAlign.center,
+                    ),
+                    const Gap(4),
+                    TextButton.icon(
+                      onPressed: () {
+                        showModalBottomSheet(
+                          context: context,
+                          useRootNavigator: true,
+                          isScrollControlled: true,
+                          builder: (context) => LoginModal(),
+                        );
+                      },
+                      icon: const Icon(Symbols.login),
+                      label: Text('login').tr(),
+                    ),
+                  ],
+                ).padding(horizontal: 36, vertical: 16).center(),
          ),
      ],
    ).padding(horizontal: 12);
@@ -375,6 +412,7 @@ class ExploreScreen extends HookConsumerWidget {
                tabAlignment: TabAlignment.start,
                isScrollable: true,
                dividerColor: Colors.transparent,
+                labelPadding: const EdgeInsets.symmetric(horizontal: 12),
                tabs: [
                  Tab(
                    icon: Tooltip(
@@ -504,6 +542,11 @@ class ExploreScreen extends HookConsumerWidget {
                  child: PostFeaturedList(),
                ),
              ),
+              SliverToBoxAdapter(
+                child: FriendsOverviewWidget(
+                  padding: const EdgeInsets.only(bottom: 8),
+                ),
+              ),
              if (notificationCount.value != null &&
                  notificationCount.value! > 0)
                SliverToBoxAdapter(
@@ -634,7 +677,7 @@ class _DiscoveryActivityItem extends StatelessWidget {
 }

 class _ActivityListView extends HookConsumerWidget {
-  final CursorPagingData<SnActivity> data;
+  final CursorPagingData<SnTimelineEvent> data;
  final int widgetCount;
  final Widget endItemView;
  final ActivityListNotifier activitiesNotifier;
@@ -697,13 +740,15 @@ class _ActivityListView extends HookConsumerWidget {

@riverpod
 class ActivityListNotifier extends _$ActivityListNotifier
-    with CursorPagingNotifierMixin<SnActivity> {
+    with CursorPagingNotifierMixin<SnTimelineEvent> {
  @override
-  Future<CursorPagingData<SnActivity>> build(String? filter) =>
+  Future<CursorPagingData<SnTimelineEvent>> build(String? filter) =>
      fetch(cursor: null);

  @override
-  Future<CursorPagingData<SnActivity>> fetch({required String? cursor}) async {
+  Future<CursorPagingData<SnTimelineEvent>> fetch({
+    required String? cursor,
+  }) async {
    final client = ref.read(apiClientProvider);
    final take = 20;

@@ -716,13 +761,13 @@ class ActivityListNotifier extends _$ActivityListNotifier
    };

    final response = await client.get(
-      '/sphere/activities',
+      '/sphere/timeline',
      queryParameters: queryParameters,
    );

-    final List<SnActivity> items =
+    final List<SnTimelineEvent> items =
        (response.data as List)
-            .map((e) => SnActivity.fromJson(e as Map<String, dynamic>))
+            .map((e) => SnTimelineEvent.fromJson(e as Map<String, dynamic>))
            .toList();

    final hasMore = (items.firstOrNull?.type ?? 'empty') != 'empty';
@@ -742,7 +787,7 @@ class ActivityListNotifier extends _$ActivityListNotifier
    );
  }

-  void updateOne(int index, SnActivity activity) {
+  void updateOne(int index, SnTimelineEvent activity) {
    final currentState = state.valueOrNull;
    if (currentState == null) return;

--- a/lib/screens/explore.g.dart
+++ b/lib/screens/explore.g.dart
@@ -7,7 +7,7 @@ part of 'explore.dart';
 // **************************************************************************

 String _$activityListNotifierHash() =>
-    r'167021cada54da7c8d8437eef1ffb387a92ea2e3';
+    r'77ffc7852feffa5438b56fa26123d453b7c310cf';

 /// Copied from Dart SDK
 class _SystemHash {
@@ -31,10 +31,11 @@ class _SystemHash {
 }

 abstract class _$ActivityListNotifier
-    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnActivity>> {
+    extends
+        BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnTimelineEvent>> {
  late final String? filter;

-  FutureOr<CursorPagingData<SnActivity>> build(String? filter);
+  FutureOr<CursorPagingData<SnTimelineEvent>> build(String? filter);
 }

 /// See also [ActivityListNotifier].
@@ -43,7 +44,7 @@ const activityListNotifierProvider = ActivityListNotifierFamily();

 /// See also [ActivityListNotifier].
 class ActivityListNotifierFamily
-    extends Family<AsyncValue<CursorPagingData<SnActivity>>> {
+    extends Family<AsyncValue<CursorPagingData<SnTimelineEvent>>> {
  /// See also [ActivityListNotifier].
  const ActivityListNotifierFamily();

@@ -79,7 +80,7 @@ class ActivityListNotifierProvider
    extends
        AutoDisposeAsyncNotifierProviderImpl<
          ActivityListNotifier,
-          CursorPagingData<SnActivity>
+          CursorPagingData<SnTimelineEvent>
        > {
  /// See also [ActivityListNotifier].
  ActivityListNotifierProvider(String? filter)
@@ -110,7 +111,7 @@ class ActivityListNotifierProvider
  final String? filter;

  @override
-  FutureOr<CursorPagingData<SnActivity>> runNotifierBuild(
+  FutureOr<CursorPagingData<SnTimelineEvent>> runNotifierBuild(
    covariant ActivityListNotifier notifier,
  ) {
    return notifier.build(filter);
@@ -135,7 +136,7 @@ class ActivityListNotifierProvider
  @override
  AutoDisposeAsyncNotifierProviderElement<
    ActivityListNotifier,
-    CursorPagingData<SnActivity>
+    CursorPagingData<SnTimelineEvent>
  >
  createElement() {
    return _ActivityListNotifierProviderElement(this);
@@ -158,7 +159,7 @@ class ActivityListNotifierProvider
@Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 mixin ActivityListNotifierRef
-    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnActivity>> {
+    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnTimelineEvent>> {
  /// The parameter `filter` of this provider.
  String? get filter;
 }
@@ -167,7 +168,7 @@ class _ActivityListNotifierProviderElement
    extends
        AutoDisposeAsyncNotifierProviderElement<
          ActivityListNotifier,
-          CursorPagingData<SnActivity>
+          CursorPagingData<SnTimelineEvent>
        >
    with ActivityListNotifierRef {
  _ActivityListNotifierProviderElement(super.provider);
--- a/lib/screens/files/file_detail.dart
+++ b/lib/screens/files/file_detail.dart
@@ -0,0 +1,231 @@
+import 'dart:io';
+
+import 'package:file_saver/file_saver.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gal/gal.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/services/responsive.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/file_info_sheet.dart';
+import 'package:island/widgets/content/file_viewer_contents.dart';
+import 'package:path/path.dart' show extension;
+import 'package:path_provider/path_provider.dart';
+
+class FileDetailScreen extends HookConsumerWidget {
+  final SnCloudFile item;
+
+  const FileDetailScreen({super.key, required this.item});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final serverUrl = ref.watch(serverUrlProvider);
+    final isWide = isWideScreen(context);
+
+    // Animation controller for the drawer
+    final animationController = useAnimationController(
+      duration: const Duration(milliseconds: 300),
+    );
+    final animation = useMemoized(
+      () => Tween<double>(begin: 0, end: 1).animate(
+        CurvedAnimation(parent: animationController, curve: Curves.easeInOut),
+      ),
+      [animationController],
+    );
+
+    final showDrawer = useState(false);
+
+    void showInfoSheet() {
+      if (isWide) {
+        // Show as animated right panel on wide screens
+        showDrawer.value = !showDrawer.value;
+        if (showDrawer.value) {
+          animationController.forward();
+        } else {
+          animationController.reverse();
+        }
+      } else {
+        // Show as bottom sheet on narrow screens
+        showModalBottomSheet(
+          useRootNavigator: true,
+          context: context,
+          isScrollControlled: true,
+          builder: (context) => FileInfoSheet(item: item),
+        );
+      }
+    }
+
+    // Listen to drawer state changes
+    useEffect(() {
+      void listener() {
+        if (!animationController.isAnimating) {
+          if (animationController.value == 0) {
+            showDrawer.value = false;
+          }
+        }
+      }
+
+      animationController.addListener(listener);
+      return () => animationController.removeListener(listener);
+    }, [animationController]);
+
+    return AppScaffold(
+      isNoBackground: true,
+      appBar: AppBar(
+        elevation: 0,
+        leading: IconButton(
+          icon: Icon(Icons.close),
+          onPressed: () => Navigator.of(context).pop(),
+        ),
+        title: Text(item.name.isEmpty ? 'File Details' : item.name),
+        actions: _buildAppBarActions(context, ref, showInfoSheet),
+      ),
+      body: AnimatedBuilder(
+        animation: animation,
+        builder: (context, child) {
+          return Row(
+            children: [
+              // Main content area
+              Expanded(child: _buildContent(context, ref, serverUrl)),
+              // Animated drawer panel
+              if (isWide)
+                SizedBox(
+                  height: double.infinity,
+                  width: animation.value * 400, // Max width of 400px
+                  child: Container(
+                    child:
+                        animation.value > 0.1
+                            ? FileInfoSheet(item: item, onClose: showInfoSheet)
+                            : const SizedBox.shrink(),
+                  ),
+                ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+
+  List<Widget> _buildAppBarActions(
+    BuildContext context,
+    WidgetRef ref,
+    VoidCallback showInfoSheet,
+  ) {
+    final actions = <Widget>[];
+
+    // Add content-specific actions
+    switch (item.mimeType?.split('/').firstOrNull) {
+      case 'image':
+        if (!kIsWeb) {
+          actions.add(
+            IconButton(
+              icon: Icon(Icons.save_alt),
+              onPressed: () async => _saveToGallery(ref),
+            ),
+          );
+        }
+        // HD/SD toggle will be handled in the image content overlay
+        break;
+      default:
+        if (!kIsWeb) {
+          actions.add(
+            IconButton(
+              icon: Icon(Icons.save_alt),
+              onPressed: () async => _downloadFile(ref),
+            ),
+          );
+        }
+        break;
+    }
+
+    // Always add info button
+    actions.add(
+      IconButton(icon: Icon(Icons.info_outline), onPressed: showInfoSheet),
+    );
+
+    actions.add(const Gap(8));
+
+    return actions;
+  }
+
+  Future<void> _saveToGallery(WidgetRef ref) async {
+    try {
+      showSnackBar('Saving image...');
+
+      final client = ref.read(apiClientProvider);
+      final tempDir = await getTemporaryDirectory();
+      var extName = extension(item.name).trim();
+      if (extName.isEmpty) {
+        extName = item.mimeType?.split('/').lastOrNull ?? 'jpeg';
+      }
+      final filePath = '${tempDir.path}/${item.id}.$extName';
+
+      await client.download(
+        '/drive/files/${item.id}',
+        filePath,
+        queryParameters: {'original': true},
+      );
+      if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
+        await Gal.putImage(filePath, album: 'Solar Network');
+        showSnackBar('Image saved to gallery');
+      } else {
+        await FileSaver.instance.saveFile(
+          name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
+          file: File(filePath),
+        );
+        showSnackBar('Image saved to $filePath');
+      }
+    } catch (e) {
+      showErrorAlert(e);
+    }
+  }
+
+  Future<void> _downloadFile(WidgetRef ref) async {
+    try {
+      showSnackBar('Downloading file...');
+
+      final client = ref.read(apiClientProvider);
+      final tempDir = await getTemporaryDirectory();
+      var extName = extension(item.name).trim();
+      if (extName.isEmpty) {
+        extName = item.mimeType?.split('/').lastOrNull ?? 'bin';
+      }
+      final filePath = '${tempDir.path}/${item.id}.$extName';
+
+      await client.download(
+        '/drive/files/${item.id}',
+        filePath,
+        queryParameters: {'original': true},
+      );
+
+      await FileSaver.instance.saveFile(
+        name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
+        file: File(filePath),
+      );
+      showSnackBar('File saved to downloads');
+    } catch (e) {
+      showErrorAlert(e);
+    }
+  }
+
+  Widget _buildContent(BuildContext context, WidgetRef ref, String serverUrl) {
+    final uri = '$serverUrl/drive/files/${item.id}';
+
+    return switch (item.mimeType?.split('/').firstOrNull) {
+      'image' => ImageFileContent(item: item, uri: uri),
+      'video' => VideoFileContent(item: item, uri: uri),
+      'audio' => AudioFileContent(item: item, uri: uri),
+      _ when item.mimeType == 'application/pdf' => PdfFileContent(uri: uri),
+      _ when item.mimeType?.startsWith('text/') == true => TextFileContent(
+        uri: uri,
+      ),
+      _ => GenericFileContent(item: item),
+    };
+  }
+}
--- a/lib/screens/files/file_list.dart
+++ b/lib/screens/files/file_list.dart
@@ -1,122 +1,65 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:fl_chart/fl_chart.dart';
+import 'package:cross_file/cross_file.dart';
+import 'package:file_picker/file_picker.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/pods/file_list.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/content/file_info_sheet.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:island/widgets/file_list_view.dart';
+import 'package:island/widgets/usage_overview.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);
+    // Path navigation state
+    final currentPath = useState<String>('/');
+    final mode = useState<FileListMode>(FileListMode.normal);

    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]);
+    final viewMode = useState(FileListViewMode.list);

    return AppScaffold(
-      appBar: AppBar(title: Text('Files'), leading: const PageBackButton()),
+      isNoBackground: false,
+      appBar: AppBar(
+        title: Text('Files'),
+        leading: const PageBackButton(),
+        actions: [
+          IconButton(
+            icon: const Icon(Symbols.bar_chart),
+            onPressed:
+                () => _showUsageSheet(
+                  context,
+                  usageAsync.value,
+                  quotaAsync.value,
+                ),
+          ),
+          const Gap(8),
+        ],
+      ),
      body: usageAsync.when(
        data:
            (usage) => quotaAsync.when(
              data:
-                  (quota) => _buildQuotaUI(
-                    usage,
-                    quota,
-                    ref,
-                    selectedPool,
-                    includeRecycled,
+                  (quota) => FileListView(
+                    usage: usage,
+                    quota: quota,
+                    currentPath: currentPath,
+                    onPickAndUpload:
+                        () => _pickAndUploadFile(ref, currentPath.value),
+                    onShowCreateDirectory: _showCreateDirectoryDialog,
+                    mode: mode,
+                    viewMode: viewMode,
                  ),
              loading: () => const Center(child: CircularProgressIndicator()),
              error: (e, _) => Center(child: Text('Error loading quota')),
@@ -127,430 +70,138 @@ class FileListScreen extends HookConsumerWidget {
    );
  }

-  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);
+  Future<void> _pickAndUploadFile(WidgetRef ref, String currentPath) async {
    try {
-      final client = ref.read(apiClientProvider);
-      await client.delete('/drive/files/recycled');
-      ref.invalidate(cloudFileListNotifierProvider);
-      showSnackBar('recycledFilesDeleted'.tr());
+      final result = await FilePicker.platform.pickFiles(
+        allowMultiple: true,
+        withData: false,
+      );
+
+      if (result != null && result.files.isNotEmpty) {
+        for (final file in result.files) {
+          if (file.path != null) {
+            // Create UniversalFile from the picked file
+            final universalFile = UniversalFile(
+              data: XFile(file.path!),
+              type: UniversalFileType.file,
+              displayName: file.name,
+            );
+
+            // Upload the file with the current path
+            final completer = FileUploader.createCloudFile(
+              fileData: universalFile,
+              ref: ref,
+              path: currentPath,
+              onProgress: (progress, _) {
+                // Progress is handled by the upload tasks system
+                if (progress != null) {
+                  debugPrint('Upload progress: ${(progress * 100).toInt()}%');
+                }
+              },
+            );
+
+            completer.future
+                .then((uploadedFile) {
+                  if (uploadedFile != null) {
+                    ref.invalidate(cloudFileListNotifierProvider);
+                  }
+                })
+                .catchError((error) {
+                  showSnackBar('Failed to upload file: $error');
+                });
+          }
+        }
+      }
    } catch (e) {
-      showSnackBar('failedToDeleteRecycledFiles'.tr());
-    } finally {
-      if (ref.context.mounted) hideLoadingModal(ref.context);
+      showSnackBar('Error picking file: $e');
    }
  }

-  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,
+  Future<void> _showCreateDirectoryDialog(
+    BuildContext context,
+    ValueNotifier<String> currentPath,
+  ) async {
+    final controller = TextEditingController(text: currentPath.value);
+    String? newPath;
+
+    void handleChangeDirectory(BuildContext context) {
+      newPath = controller.text.trim();
+      if (newPath!.isNotEmpty) {
+        // Normalize the path
+        String fullPath = newPath!;
+
+        // Ensure it starts with /
+        if (!fullPath.startsWith('/')) {
+          fullPath = '/$fullPath';
+        }
+
+        // Remove double slashes and normalize
+        fullPath = fullPath.replaceAll(RegExp(r'/+'), '/');
+
+        currentPath.value = fullPath;
+        Navigator.of(context).pop();
+      }
+    }
+
+    await showDialog(
+      context: context,
+      builder:
+          (context) => AlertDialog(
+            title: const Text('Navigate to Directory'),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
-                Text(
-                  value,
-                  style: const TextStyle(
-                    fontSize: 24,
-                    fontWeight: FontWeight.bold,
+                const Gap(8),
+                TextField(
+                  controller: controller,
+                  decoration: const InputDecoration(
+                    labelText: 'Directory path',
+                    hintText: 'e.g., documents, projects/my-app',
+                    helperText:
+                        'Enter a directory path. The directory will be created when you upload files to it.',
+                    helperMaxLines: 3,
+                    border: OutlineInputBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(12)),
+                    ),
                  ),
+                  onSubmitted: (_) {
+                    handleChangeDirectory(context);
+                  },
                ),
-                if (progress != null) ...[
-                  const SizedBox(height: 8),
-                  SizedBox(
-                    width: 28,
-                    height: 28,
-                    child: CircularProgressIndicator(value: progress),
-                  ),
-                ],
              ],
            ),
-          ],
-        ),
-      ),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.of(context).pop(),
+                child: const Text('Cancel'),
+              ),
+              TextButton.icon(
+                onPressed: () => handleChangeDirectory(context),
+                label: const Text('Go to Directory'),
+                icon: const Icon(Symbols.arrow_right_alt),
+              ),
+            ],
+          ),
+    );
+  }
+
+  void _showUsageSheet(
+    BuildContext context,
+    Map<String, dynamic>? usage,
+    Map<String, dynamic>? quota,
+  ) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder:
+          (context) => SheetScaffold(
+            titleText: 'Usage Overview',
+            child: UsageOverviewWidget(
+              usage: usage,
+              quota: quota,
+            ).padding(horizontal: 8, vertical: 16),
+          ),
    );
  }
 }
--- a/lib/screens/poll/poll_editor.dart
+++ b/lib/screens/poll/poll_editor.dart
@@ -8,7 +8,7 @@ import 'package:island/pods/network.dart';
 import 'package:island/talker.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/models/poll.dart';
-import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/sheet.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:uuid/uuid.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -393,7 +393,7 @@ class PollEditorScreen extends ConsumerWidget {
      showSnackBar(isUpdate ? 'pollUpdated'.tr() : 'pollCreated'.tr());

      if (!context.mounted) return;
-      Navigator.of(context).maybePop(res.data);
+      Navigator.of(context).maybePop(SnPoll.fromJson(res.data));
    } catch (e) {
      showErrorAlert(e);
    }
@@ -415,23 +415,46 @@ class PollEditorScreen extends ConsumerWidget {
      });
    }

-    return AppScaffold(
-      isNoBackground: false,
-      appBar: AppBar(
-        title: Text(model.id == null ? 'pollCreate'.tr() : 'pollEdit'.tr()),
-        actions: [
-          if (kDebugMode)
-            IconButton(
-              tooltip: 'pollPreviewJsonDebug'.tr(),
-              onPressed: () {
-                _showDebugPreview(context, model);
-              },
-              icon: const Icon(Icons.visibility_outlined),
-            ),
-          const Gap(8),
-        ],
-      ),
-      body: Column(
+    return SheetScaffold(
+      titleText: model.id == null ? 'pollCreate'.tr() : 'pollEdit'.tr(),
+      actions: [
+        if (kDebugMode)
+          IconButton(
+            tooltip: 'pollPreviewJsonDebug'.tr(),
+            onPressed: () {
+              _showDebugPreview(context, model);
+            },
+            icon: const Icon(Icons.visibility_outlined),
+          ),
+      ],
+      heightFactor: 0.9,
+      onClose: () async {
+        final confirmed = await showDialog<bool>(
+          context: context,
+          builder:
+              (ctx) => AlertDialog(
+                title: Text('confirm'.tr()),
+                content: Text('pollConfirmDiscard'.tr()),
+                actions: [
+                  TextButton(
+                    onPressed: () => Navigator.of(ctx).pop(false),
+                    child: Text('cancel'.tr()),
+                  ),
+                  TextButton(
+                    onPressed: () => Navigator.of(ctx).pop(true),
+                    style: TextButton.styleFrom(
+                      foregroundColor: Theme.of(ctx).colorScheme.error,
+                    ),
+                    child: Text('discard'.tr()),
+                  ),
+                ],
+              ),
+        );
+        if (confirmed == true) {
+          Navigator.of(context).pop();
+        }
+      },
+      child: Column(
        children: [
          Expanded(
            child: ConstrainedBox(
--- a/lib/screens/posts/compose.dart
+++ b/lib/screens/posts/compose.dart
@@ -1,27 +1,6 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:gap/gap.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/post.dart';
-import 'package:island/screens/creators/publishers_form.dart';
-import 'package:island/screens/posts/compose_article.dart';
-import 'package:island/screens/posts/post_detail.dart';
-import 'package:island/services/compose_storage_db.dart';
-import 'package:island/widgets/app_scaffold.dart';
-import 'package:island/widgets/content/cloud_files.dart';
-import 'package:island/widgets/post/compose_attachments.dart';
-import 'package:island/widgets/post/compose_form_fields.dart';
-import 'package:island/widgets/post/compose_info_banner.dart';
-import 'package:island/widgets/post/compose_settings_sheet.dart';
-import 'package:island/widgets/post/compose_shared.dart';
-import 'package:island/widgets/post/compose_toolbar.dart';
-import 'package:island/widgets/post/post_item.dart';
-import 'package:island/widgets/post/publishers_modal.dart';
-import 'package:material_symbols_icons/symbols.dart';
-import 'package:styled_widget/styled_widget.dart';

 part 'compose.freezed.dart';
 part 'compose.g.dart';
@@ -41,358 +20,3 @@ sealed class PostComposeInitialState with _$PostComposeInitialState {
  factory PostComposeInitialState.fromJson(Map<String, dynamic> json) =>
      _$PostComposeInitialStateFromJson(json);
 }
-
-class PostEditScreen extends HookConsumerWidget {
-  final String id;
-  const PostEditScreen({super.key, required this.id});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final post = ref.watch(postProvider(id));
-    return post.when(
-      data: (post) => PostComposeScreen(originalPost: post),
-      loading:
-          () => AppScaffold(
-            isNoBackground: false,
-            appBar: AppBar(leading: const PageBackButton()),
-            body: const Center(child: CircularProgressIndicator()),
-          ),
-      error:
-          (e, _) => AppScaffold(
-            isNoBackground: false,
-            appBar: AppBar(leading: const PageBackButton()),
-            body: Text('Error: $e', textAlign: TextAlign.center),
-          ),
-    );
-  }
-}
-
-class PostComposeScreen extends HookConsumerWidget {
-  final SnPost? originalPost;
-  final int? type;
-  final PostComposeInitialState? initialState;
-  const PostComposeScreen({
-    super.key,
-    this.type,
-    this.initialState,
-    this.originalPost,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    // Determine the compose type: auto-detect from edited post or use query parameter
-    final composeType = originalPost?.type ?? type ?? 0;
-    final repliedPost = initialState?.replyingTo ?? originalPost?.repliedPost;
-    final forwardedPost =
-        initialState?.forwardingTo ?? originalPost?.forwardedPost;
-
-    // If type is 1 (article), return ArticleComposeScreen
-    if (composeType == 1) {
-      return ArticleComposeScreen(originalPost: originalPost);
-    }
-
-    // When editing, preserve the original replied/forwarded post references
-    final effectiveRepliedPost = repliedPost ?? originalPost?.repliedPost;
-    final effectiveForwardedPost = forwardedPost ?? originalPost?.forwardedPost;
-
-    final publishers = ref.watch(publishersManagedProvider);
-    final state = useMemoized(
-      () => ComposeLogic.createState(
-        originalPost: originalPost,
-        forwardedPost: effectiveForwardedPost,
-        repliedPost: effectiveRepliedPost,
-        postType: 0, // Regular post type
-      ),
-      [originalPost, effectiveForwardedPost, effectiveRepliedPost],
-    );
-
-    // Add a listener to the entire state to trigger rebuilds
-    final stateNotifier = useMemoized(
-      () => Listenable.merge([
-        state.titleController,
-        state.descriptionController,
-        state.contentController,
-        state.visibility,
-        state.attachments,
-        state.attachmentProgress,
-        state.currentPublisher,
-        state.submitting,
-      ]),
-      [state],
-    );
-    useListenable(stateNotifier);
-
-    // Start auto-save when component mounts
-    useEffect(() {
-      if (originalPost == null) {
-        // Only auto-save for new posts, not edits
-        state.startAutoSave(ref);
-      }
-      return () => state.stopAutoSave();
-    }, [state]);
-
-    // Initialize publisher once when data is available
-    useEffect(() {
-      if (publishers.value?.isNotEmpty ?? false) {
-        if (state.currentPublisher.value == null) {
-          // If no publisher is set, use the first available one
-          state.currentPublisher.value = publishers.value!.first;
-        }
-      }
-      return null;
-    }, [publishers]);
-
-    // Load initial state if provided (for sharing functionality)
-    useEffect(() {
-      if (initialState != null) {
-        state.titleController.text = initialState!.title ?? '';
-        state.descriptionController.text = initialState!.description ?? '';
-        state.contentController.text = initialState!.content ?? '';
-        if (initialState!.visibility != null) {
-          state.visibility.value = initialState!.visibility!;
-        }
-        if (initialState!.attachments.isNotEmpty) {
-          state.attachments.value = List.from(initialState!.attachments);
-        }
-      }
-      return null;
-    }, [initialState]);
-
-    // Load draft if available (only for new posts without initial state)
-    useEffect(() {
-      if (originalPost == null &&
-          effectiveForwardedPost == null &&
-          effectiveRepliedPost == null &&
-          initialState == null) {
-        // Try to load the most recent draft
-        final drafts = ref.read(composeStorageNotifierProvider);
-        if (drafts.isNotEmpty) {
-          final mostRecentDraft = drafts.values.reduce(
-            (a, b) =>
-                (a.updatedAt ?? DateTime(0)).isAfter(b.updatedAt ?? DateTime(0))
-                    ? a
-                    : b,
-          );
-
-          // Only load if the draft has meaningful content
-          if (mostRecentDraft.content?.isNotEmpty == true ||
-              mostRecentDraft.title?.isNotEmpty == true) {
-            state.titleController.text = mostRecentDraft.title ?? '';
-            state.descriptionController.text =
-                mostRecentDraft.description ?? '';
-            state.contentController.text = mostRecentDraft.content ?? '';
-            state.visibility.value = mostRecentDraft.visibility;
-          }
-        }
-      }
-      return null;
-    }, []);
-
-    // Dispose state when widget is disposed
-    useEffect(() {
-      return () {
-        state.stopAutoSave();
-        ComposeLogic.dispose(state);
-      };
-    }, []);
-
-    // Helper methods
-
-    void showSettingsSheet() {
-      showModalBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        builder: (context) => ComposeSettingsSheet(state: state),
-      );
-    }
-
-    return PopScope(
-      onPopInvoked: (_) {
-        if (originalPost == null) {
-          ComposeLogic.saveDraft(ref, state);
-        }
-      },
-      child: AppScaffold(
-        isNoBackground: false,
-        appBar: AppBar(
-          leading: const PageBackButton(),
-          actions: [
-            IconButton(
-              icon: const Icon(Symbols.settings),
-              onPressed: showSettingsSheet,
-              tooltip: 'postSettings'.tr(),
-            ),
-            IconButton(
-              onPressed:
-                  state.submitting.value
-                      ? null
-                      : () => ComposeLogic.performAction(
-                        ref,
-                        state,
-                        context,
-                        originalPost: originalPost,
-                        repliedPost: repliedPost,
-                        forwardedPost: forwardedPost,
-                      ),
-              icon:
-                  state.submitting.value
-                      ? SizedBox(
-                        width: 28,
-                        height: 28,
-                        child: const CircularProgressIndicator(
-                          color: Colors.white,
-                          strokeWidth: 2.5,
-                        ),
-                      ).center()
-                      : Icon(
-                        originalPost != null ? Symbols.edit : Symbols.upload,
-                      ),
-            ),
-            const Gap(8),
-          ],
-        ),
-        body: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            // Reply/Forward info section
-            ComposeInfoBanner(
-              originalPost: originalPost,
-              replyingTo: repliedPost,
-              forwardingTo: forwardedPost,
-              onReferencePostTap: (context, post) {
-                showModalBottomSheet(
-                  context: context,
-                  isScrollControlled: true,
-                  backgroundColor: Colors.transparent,
-                  builder:
-                      (context) => DraggableScrollableSheet(
-                        initialChildSize: 0.7,
-                        maxChildSize: 0.9,
-                        minChildSize: 0.5,
-                        builder:
-                            (context, scrollController) => Container(
-                              decoration: BoxDecoration(
-                                color:
-                                    Theme.of(context).scaffoldBackgroundColor,
-                                borderRadius: const BorderRadius.vertical(
-                                  top: Radius.circular(16),
-                                ),
-                              ),
-                              child: Column(
-                                children: [
-                                  Container(
-                                    width: 40,
-                                    height: 4,
-                                    margin: const EdgeInsets.symmetric(
-                                      vertical: 8,
-                                    ),
-                                    decoration: BoxDecoration(
-                                      color:
-                                          Theme.of(context).colorScheme.outline,
-                                      borderRadius: BorderRadius.circular(2),
-                                    ),
-                                  ),
-                                  Expanded(
-                                    child: SingleChildScrollView(
-                                      controller: scrollController,
-                                      padding: const EdgeInsets.all(16),
-                                      child: PostItem(item: post),
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                      ),
-                );
-              },
-            ),
-
-            // Main content area
-            Expanded(
-              child: ConstrainedBox(
-                constraints: const BoxConstraints(maxWidth: 560),
-                child: Row(
-                  spacing: 12,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    // Publisher profile picture
-                    GestureDetector(
-                      child: ProfilePictureWidget(
-                        fileId: state.currentPublisher.value?.picture?.id,
-                        radius: 20,
-                        fallbackIcon:
-                            state.currentPublisher.value == null
-                                ? Symbols.question_mark
-                                : null,
-                      ),
-                      onTap: () {
-                        showModalBottomSheet(
-                          isScrollControlled: true,
-                          context: context,
-                          builder: (context) => const PublisherModal(),
-                        ).then((value) {
-                          if (value != null) {
-                            state.currentPublisher.value = value;
-                          }
-                        });
-                      },
-                    ).padding(top: 16),
-
-                    // Post content form
-                    Expanded(
-                      child: KeyboardListener(
-                        focusNode: FocusNode(),
-                        onKeyEvent:
-                            (event) => ComposeLogic.handleKeyPress(
-                              event,
-                              state,
-                              ref,
-                              context,
-                              originalPost: originalPost,
-                              repliedPost: repliedPost,
-                              forwardedPost: forwardedPost,
-                            ),
-                        child: SingleChildScrollView(
-                          padding: const EdgeInsets.symmetric(vertical: 16),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              ComposeFormFields(
-                                state: state,
-                                showPublisherAvatar: false,
-                                onPublisherTap: () {
-                                  showModalBottomSheet(
-                                    isScrollControlled: true,
-                                    context: context,
-                                    builder:
-                                        (context) => const PublisherModal(),
-                                  ).then((value) {
-                                    if (value != null) {
-                                      state.currentPublisher.value = value;
-                                    }
-                                  });
-                                },
-                              ),
-                              const Gap(8),
-                              ComposeAttachments(
-                                state: state,
-                                isCompact: false,
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ).padding(horizontal: 16),
-              ).alignment(Alignment.topCenter),
-            ),
-
-            // Bottom toolbar
-            ComposeToolbar(state: state, originalPost: originalPost),
-          ],
-        ),
-      ),
-    );
-  }
-}
--- a/lib/screens/posts/compose_article.dart
+++ b/lib/screens/posts/compose_article.dart
@@ -8,6 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/post.dart';
 import 'package:island/screens/creators/publishers_form.dart';
+import 'package:island/screens/posts/compose.dart';
 import 'package:island/screens/posts/post_detail.dart';
 import 'package:island/services/compose_storage_db.dart';
 import 'package:island/services/responsive.dart';
@@ -49,8 +50,9 @@ class ArticleEditScreen extends HookConsumerWidget {

 class ArticleComposeScreen extends HookConsumerWidget {
  final SnPost? originalPost;
+  final PostComposeInitialState? initialState;

-  const ArticleComposeScreen({super.key, this.originalPost});
+  const ArticleComposeScreen({super.key, this.originalPost, this.initialState});

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -100,9 +102,25 @@ class ArticleComposeScreen extends HookConsumerWidget {
      return null;
    }, [publishers]);

+    // Load initial state if provided (for sharing functionality)
+    useEffect(() {
+      if (initialState != null) {
+        state.titleController.text = initialState!.title ?? '';
+        state.descriptionController.text = initialState!.description ?? '';
+        state.contentController.text = initialState!.content ?? '';
+        if (initialState!.visibility != null) {
+          state.visibility.value = initialState!.visibility!;
+        }
+        if (initialState!.attachments.isNotEmpty) {
+          state.attachments.value = List.from(initialState!.attachments);
+        }
+      }
+      return null;
+    }, [initialState]);
+
    // Load draft if available (only for new articles)
    useEffect(() {
-      if (originalPost == null) {
+      if (originalPost == null && initialState == null) {
        // Try to load the most recent article draft
        final drafts = ref.read(composeStorageNotifierProvider);
        if (drafts.isNotEmpty) {
@@ -199,6 +217,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
          border: Border.all(color: colorScheme.outline.withOpacity(0.3)),
          borderRadius: BorderRadius.circular(8),
        ),
+        margin: const EdgeInsets.symmetric(vertical: 8),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
@@ -219,7 +238,12 @@ class ArticleComposeScreen extends HookConsumerWidget {
                ],
              ),
            ),
-            Expanded(child: widgetItem),
+            Expanded(
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 8),
+                child: widgetItem,
+              ),
+            ),
          ],
        ),
      );
@@ -246,7 +270,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
                    }
                  });
                },
-              ),
+              ).padding(top: 16),

              // Attachments preview
              ValueListenableBuilder<List<UniversalFile>>(
@@ -282,7 +306,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
                        ],
                      ),
                      children: [
-                        ValueListenableBuilder<Map<int, double>>(
+                        ValueListenableBuilder<Map<int, double?>>(
                          valueListenable: state.attachmentProgress,
                          builder: (context, progressMap, _) {
                            return Wrap(
--- a/lib/screens/posts/post_category_detail.dart
+++ b/lib/screens/posts/post_category_detail.dart
@@ -201,7 +201,7 @@ class PostCategoryDetailScreen extends HookConsumerWidget {
                                                  );
                                                },
                                                icon: const Icon(
-                                                  Symbols.add_circle,
+                                                  Symbols.remove_circle,
                                                ),
                                                label: Text('unsubscribe'.tr()),
                                              )
@@ -214,7 +214,7 @@ class PostCategoryDetailScreen extends HookConsumerWidget {
                                                  );
                                                },
                                                icon: const Icon(
-                                                  Symbols.remove_circle,
+                                                  Symbols.add_circle,
                                                ),
                                                label: Text('subscribe'.tr()),
                                              ),
--- a/lib/screens/posts/post_detail.dart
+++ b/lib/screens/posts/post_detail.dart
@@ -18,6 +18,7 @@ import 'package:island/widgets/post/post_award_history_sheet.dart';
 import 'package:island/widgets/post/post_pin_sheet.dart';
 import 'package:island/widgets/post/post_quick_reply.dart';
 import 'package:island/widgets/post/post_replies.dart';
+import 'package:island/widgets/post/compose_sheet.dart';
 import 'package:island/widgets/response.dart';
 import 'package:island/utils/share_utils.dart';
 import 'package:island/widgets/safety/abuse_report_helper.dart';
@@ -107,13 +108,21 @@ class PostActionButtons extends HookConsumerWidget {
      final editButtons = <Widget>[
        FilledButton.tonal(
          onPressed: () {
-            context.pushNamed('postEdit', pathParameters: {'id': post.id}).then(
-              (value) {
-                if (value != null) {
+            if (post.type == 1) {
+              context
+                  .pushNamed('articleEdit', pathParameters: {'id': post.id})
+                  .then((value) {
+                    if (value != null) {
+                      onRefresh?.call();
+                    }
+                  });
+            } else {
+              PostComposeSheet.show(context, originalPost: post).then((value) {
+                if (value == true) {
                  onRefresh?.call();
                }
-              },
-            );
+              });
+            }
          },
          style: FilledButton.styleFrom(
            shape: const RoundedRectangleBorder(
@@ -229,9 +238,9 @@ class PostActionButtons extends HookConsumerWidget {
    final replyButtons = <Widget>[
      FilledButton.tonal(
        onPressed: () {
-          context.pushNamed(
-            'postCompose',
-            extra: PostComposeInitialState(replyingTo: post),
+          PostComposeSheet.show(
+            context,
+            initialState: PostComposeInitialState(replyingTo: post),
          );
        },
        style: FilledButton.styleFrom(
@@ -255,9 +264,9 @@ class PostActionButtons extends HookConsumerWidget {
        message: 'forward'.tr(),
        child: FilledButton.tonal(
          onPressed: () {
-            context.pushNamed(
-              'postCompose',
-              extra: PostComposeInitialState(forwardingTo: post),
+            PostComposeSheet.show(
+              context,
+              initialState: PostComposeInitialState(forwardingTo: post),
            );
          },
          style: FilledButton.styleFrom(
--- a/lib/screens/posts/post_search.dart
+++ b/lib/screens/posts/post_search.dart
@@ -237,7 +237,9 @@ class PostSearchScreen extends HookConsumerWidget {
                controller: pubNameController,
                decoration: InputDecoration(
                  labelText: 'pubName'.tr(),
-                  border: OutlineInputBorder(),
+                  border: OutlineInputBorder(
+                    borderRadius: const BorderRadius.all(Radius.circular(12)),
+                  ),
                ),
                onChanged:
                    (value) => onSearchWithFilters(searchController.text),
@@ -247,7 +249,9 @@ class PostSearchScreen extends HookConsumerWidget {
                controller: realmController,
                decoration: InputDecoration(
                  labelText: 'realm'.tr(),
-                  border: OutlineInputBorder(),
+                  border: OutlineInputBorder(
+                    borderRadius: const BorderRadius.all(Radius.circular(12)),
+                  ),
                ),
                onChanged:
                    (value) => onSearchWithFilters(searchController.text),
--- a/lib/screens/posts/pub_profile.dart
+++ b/lib/screens/posts/pub_profile.dart
@@ -1,599 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gap/gap.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/post.dart';
-import 'package:island/models/publisher.dart';
-import 'package:island/models/account.dart';
-import 'package:island/models/heatmap.dart';
-import 'package:island/pods/config.dart';
-import 'package:island/pods/network.dart';
-import 'package:island/services/color.dart';
-import 'package:island/services/responsive.dart';
-import 'package:island/widgets/account/account_name.dart';
-import 'package:island/widgets/account/badge.dart';
-import 'package:island/widgets/account/status.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/markdown.dart';
-import 'package:island/widgets/post/post_list.dart';
-import 'package:island/widgets/activity_heatmap.dart';
-import 'package:material_symbols_icons/symbols.dart';
-import 'package:island/services/color_extraction.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:styled_widget/styled_widget.dart';
-
-part 'pub_profile.g.dart';
-
-class _PublisherBasisWidget extends StatelessWidget {
-  final SnPublisher data;
-  final AsyncValue<SnSubscriptionStatus> subStatus;
-  final ValueNotifier<bool> subscribing;
-  final VoidCallback subscribe;
-  final VoidCallback unsubscribe;
-
-  const _PublisherBasisWidget({
-    required this.data,
-    required this.subStatus,
-    required this.subscribing,
-    required this.subscribe,
-    required this.unsubscribe,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      spacing: 20,
-      children: [
-        GestureDetector(
-          child: Badge(
-            isLabelVisible: data.type == 0,
-            padding: EdgeInsets.all(4),
-            label: Icon(
-              Symbols.launch,
-              size: 16,
-              color: Theme.of(context).colorScheme.onPrimary,
-            ),
-            backgroundColor: Theme.of(context).colorScheme.primary,
-            offset: Offset(0, 48),
-            child: ProfilePictureWidget(
-              file: data.picture,
-              radius: 32,
-              borderRadius: data.type == 0 ? null : 12,
-            ),
-          ),
-          onTap: () {
-            if (data.account?.name != null) {
-              Navigator.pop(context, true);
-              context.pushNamed(
-                'accountProfile',
-                pathParameters: {'name': data.account!.name},
-              );
-            }
-          },
-        ),
-        Expanded(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              Row(
-                spacing: 6,
-                children: [
-                  Text(data.nick).fontSize(20),
-                  if (data.verification != null)
-                    VerificationMark(mark: data.verification!),
-                  Expanded(
-                    child: Text(
-                      '@${data.name}',
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ).fontSize(14).opacity(0.85),
-                  ),
-                ],
-              ),
-              if (data.type == 0 && data.account != null)
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  spacing: 6,
-                  children: [
-                    Icon(
-                      data.type == 0 ? Symbols.person : Symbols.workspaces,
-                      fill: 1,
-                      size: 17,
-                    ),
-                    Text(
-                      'publisherBelongsTo'.tr(args: ['@${data.account!.name}']),
-                    ).fontSize(14),
-                  ],
-                ).opacity(0.85),
-              const Gap(4),
-              if (data.type == 0 && data.account != null)
-                AccountStatusWidget(
-                  uname: data.account!.name,
-                  padding: EdgeInsets.zero,
-                ),
-              subStatus
-                  .when(
-                    data:
-                        (status) => FilledButton.icon(
-                          onPressed:
-                              subscribing.value
-                                  ? null
-                                  : (status.isSubscribed
-                                      ? unsubscribe
-                                      : subscribe),
-                          icon: Icon(
-                            status.isSubscribed
-                                ? Symbols.remove_circle
-                                : Symbols.add_circle,
-                          ),
-                          label:
-                              Text(
-                                status.isSubscribed
-                                    ? 'unsubscribe'
-                                    : 'subscribe',
-                              ).tr(),
-                          style: ButtonStyle(
-                            visualDensity: VisualDensity(vertical: -2),
-                          ),
-                        ),
-                    error: (_, _) => const SizedBox(),
-                    loading:
-                        () => const SizedBox(
-                          height: 36,
-                          child: Center(
-                            child: SizedBox(
-                              width: 20,
-                              height: 20,
-                              child: CircularProgressIndicator(strokeWidth: 2),
-                            ),
-                          ),
-                        ),
-                  )
-                  .padding(top: 8),
-            ],
-          ),
-        ),
-      ],
-    ).padding(horizontal: 24, top: 24);
-  }
-}
-
-class _PublisherBadgesWidget extends StatelessWidget {
-  final SnPublisher data;
-  final AsyncValue<List<SnAccountBadge>> badges;
-
-  const _PublisherBadgesWidget({required this.data, required this.badges});
-
-  @override
-  Widget build(BuildContext context) {
-    return (badges.value?.isNotEmpty ?? false)
-        ? Card(
-          child: BadgeList(
-            badges: badges.value!,
-          ).padding(horizontal: 26, vertical: 20),
-        ).padding(horizontal: 4)
-        : const SizedBox.shrink();
-  }
-}
-
-class _PublisherVerificationWidget extends StatelessWidget {
-  final SnPublisher data;
-
-  const _PublisherVerificationWidget({required this.data});
-
-  @override
-  Widget build(BuildContext context) {
-    return (data.verification != null)
-        ? Card(
-          margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-          child: VerificationStatusCard(mark: data.verification!),
-        )
-        : const SizedBox.shrink();
-  }
-}
-
-class _PublisherBioWidget extends StatelessWidget {
-  final SnPublisher data;
-
-  const _PublisherBioWidget({required this.data});
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          Text('bio').tr().bold().fontSize(15).padding(bottom: 8),
-          if (data.bio.isEmpty)
-            Text('descriptionNone').tr().italic()
-          else
-            MarkdownTextContent(
-              content: data.bio,
-              linesMargin: EdgeInsets.zero,
-            ),
-        ],
-      ).padding(horizontal: 20, vertical: 16),
-    );
-  }
-}
-
-class _PublisherHeatmapWidget extends StatelessWidget {
-  final AsyncValue<SnHeatmap?> heatmap;
-  final bool forceDense;
-
-  const _PublisherHeatmapWidget({
-    required this.heatmap,
-    this.forceDense = false,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return heatmap.when(
-      data:
-          (data) =>
-              data != null
-                  ? ActivityHeatmapWidget(
-                    heatmap: data,
-                    forceDense: forceDense,
-                  ).padding(horizontal: 8)
-                  : const SizedBox.shrink(),
-      loading: () => const SizedBox.shrink(),
-      error: (_, _) => const SizedBox.shrink(),
-    );
-  }
-}
-
-class _PublisherCategoryTabWidget extends StatelessWidget {
-  final TabController categoryTabController;
-
-  const _PublisherCategoryTabWidget({required this.categoryTabController});
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-      child: TabBar(
-        controller: categoryTabController,
-        dividerColor: Colors.transparent,
-        splashBorderRadius: const BorderRadius.all(Radius.circular(8)),
-        tabs: [
-          Tab(text: 'all'.tr()),
-          Tab(text: 'postTypePost'.tr()),
-          Tab(text: 'postArticle'.tr()),
-        ],
-      ),
-    );
-  }
-}
-
-@riverpod
-Future<SnPublisher> publisher(Ref ref, String uname) async {
-  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get("/sphere/publishers/$uname");
-  return SnPublisher.fromJson(resp.data);
-}
-
-@riverpod
-Future<List<SnAccountBadge>> publisherBadges(Ref ref, String pubName) async {
-  final pub = await ref.watch(publisherProvider(pubName).future);
-  if (pub.type != 0 || pub.account == null) return [];
-  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get(
-    "/pass/accounts/${pub.account!.name}/badges",
-  );
-  return List<SnAccountBadge>.from(
-    resp.data.map((x) => SnAccountBadge.fromJson(x)),
-  );
-}
-
-@riverpod
-Future<SnSubscriptionStatus> publisherSubscriptionStatus(
-  Ref ref,
-  String pubName,
-) async {
-  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get("/sphere/publishers/$pubName/subscription");
-  return SnSubscriptionStatus.fromJson(resp.data);
-}
-
-@riverpod
-Future<Color?> publisherAppbarForcegroundColor(Ref ref, String pubName) async {
-  try {
-    final publisher = await ref.watch(publisherProvider(pubName).future);
-    if (publisher.background == null) return null;
-    final colors = await ColorExtractionService.getColorsFromImage(
-      CloudImageWidget.provider(
-        fileId: publisher.background!.id,
-        serverUrl: ref.watch(serverUrlProvider),
-      ),
-    );
-    if (colors.isEmpty) return null;
-    final dominantColor = colors.first;
-    return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
-  } catch (_) {
-    return null;
-  }
-}
-
-@riverpod
-Future<SnHeatmap?> publisherHeatmap(Ref ref, String uname) async {
-  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get('/sphere/publishers/$uname/heatmap');
-  return SnHeatmap.fromJson(resp.data);
-}
-
-class PublisherProfileScreen extends HookConsumerWidget {
-  final String name;
-  const PublisherProfileScreen({super.key, required this.name});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final publisher = ref.watch(publisherProvider(name));
-    final badges = ref.watch(publisherBadgesProvider(name));
-    final subStatus = ref.watch(publisherSubscriptionStatusProvider(name));
-    final heatmap = ref.watch(publisherHeatmapProvider(name));
-    final appbarColor = ref.watch(
-      publisherAppbarForcegroundColorProvider(name),
-    );
-
-    final categoryTabController = useTabController(initialLength: 3);
-    final categoryTab = useState(0);
-    categoryTabController.addListener(() {
-      categoryTab.value = categoryTabController.index;
-    });
-
-    final subscribing = useState(false);
-
-    Future<void> subscribe() async {
-      final apiClient = ref.watch(apiClientProvider);
-      subscribing.value = true;
-      try {
-        await apiClient.post(
-          "/sphere/publishers/$name/subscribe",
-          data: {'tier': 0},
-        );
-        ref.invalidate(publisherSubscriptionStatusProvider(name));
-        HapticFeedback.heavyImpact();
-      } catch (err) {
-        showErrorAlert(err);
-      } finally {
-        subscribing.value = false;
-      }
-    }
-
-    Future<void> unsubscribe() async {
-      final apiClient = ref.watch(apiClientProvider);
-      subscribing.value = true;
-      try {
-        await apiClient.post("/sphere/publishers/$name/unsubscribe");
-        ref.invalidate(publisherSubscriptionStatusProvider(name));
-        HapticFeedback.heavyImpact();
-      } catch (err) {
-        showErrorAlert(err);
-      } finally {
-        subscribing.value = false;
-      }
-    }
-
-    final appbarShadow = Shadow(
-      color: appbarColor.value?.invert ?? Colors.transparent,
-      blurRadius: 5.0,
-      offset: Offset(1.0, 1.0),
-    );
-
-    return publisher.when(
-      data:
-          (data) => AppScaffold(
-            isNoBackground: false,
-            appBar:
-                isWideScreen(context)
-                    ? AppBar(
-                      foregroundColor: appbarColor.value,
-                      leading: PageBackButton(
-                        color: appbarColor.value,
-                        shadows: [appbarShadow],
-                      ),
-                      flexibleSpace: Stack(
-                        children: [
-                          Positioned.fill(
-                            child:
-                                data.background?.id != null
-                                    ? CloudImageWidget(file: data.background)
-                                    : Container(
-                                      color:
-                                          Theme.of(
-                                            context,
-                                          ).appBarTheme.backgroundColor,
-                                    ),
-                          ),
-                          FlexibleSpaceBar(
-                            title: Text(
-                              data.nick,
-                              style: TextStyle(
-                                color:
-                                    appbarColor.value ??
-                                    Theme.of(
-                                      context,
-                                    ).appBarTheme.foregroundColor,
-                                shadows: [appbarShadow],
-                              ),
-                            ),
-                            background:
-                                Container(), // Empty container since background is handled by Stack
-                          ),
-                        ],
-                      ),
-                    )
-                    : null,
-            body:
-                isWideScreen(context)
-                    ? Row(
-                      children: [
-                        Flexible(
-                          flex: 4,
-                          child: CustomScrollView(
-                            slivers: [
-                              SliverGap(16),
-                              SliverPostList(pubName: name, pinned: true),
-                              SliverToBoxAdapter(
-                                child: _PublisherCategoryTabWidget(
-                                  categoryTabController: categoryTabController,
-                                ),
-                              ),
-                              SliverPostList(
-                                key: ValueKey(categoryTab.value),
-                                pubName: name,
-                                pinned: false,
-                                type: switch (categoryTab.value) {
-                                  1 => 0,
-                                  2 => 1,
-                                  _ => null,
-                                },
-                              ),
-                              SliverGap(
-                                MediaQuery.of(context).padding.bottom + 16,
-                              ),
-                            ],
-                          ).padding(left: 8),
-                        ),
-                        Flexible(
-                          flex: 3,
-                          child: Align(
-                            alignment: Alignment.topLeft,
-                            child: SingleChildScrollView(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.stretch,
-                                children: [
-                                  _PublisherBasisWidget(
-                                    data: data,
-                                    subStatus: subStatus,
-                                    subscribing: subscribing,
-                                    subscribe: subscribe,
-                                    unsubscribe: unsubscribe,
-                                  ).padding(bottom: 8),
-                                  _PublisherBadgesWidget(
-                                    data: data,
-                                    badges: badges,
-                                  ),
-                                  _PublisherVerificationWidget(data: data),
-                                  _PublisherBioWidget(data: data),
-                                  _PublisherHeatmapWidget(
-                                    heatmap: heatmap,
-                                    forceDense: true,
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ),
-                      ],
-                    )
-                    : CustomScrollView(
-                      slivers: [
-                        SliverAppBar(
-                          foregroundColor: appbarColor.value,
-                          expandedHeight: 180,
-                          pinned: true,
-                          leading: PageBackButton(
-                            color: appbarColor.value,
-                            shadows: [appbarShadow],
-                          ),
-                          flexibleSpace: Stack(
-                            children: [
-                              Positioned.fill(
-                                child:
-                                    data.background?.id != null
-                                        ? CloudImageWidget(
-                                          file: data.background,
-                                        )
-                                        : Container(
-                                          color:
-                                              Theme.of(
-                                                context,
-                                              ).appBarTheme.backgroundColor,
-                                        ),
-                              ),
-                              FlexibleSpaceBar(
-                                title: Text(
-                                  data.nick,
-                                  style: TextStyle(
-                                    color:
-                                        appbarColor.value ??
-                                        Theme.of(
-                                          context,
-                                        ).appBarTheme.foregroundColor,
-                                    shadows: [appbarShadow],
-                                  ),
-                                ),
-                                background:
-                                    Container(), // Empty container since background is handled by Stack
-                              ),
-                            ],
-                          ),
-                        ),
-                        SliverToBoxAdapter(
-                          child: _PublisherBasisWidget(
-                            data: data,
-                            subStatus: subStatus,
-                            subscribing: subscribing,
-                            subscribe: subscribe,
-                            unsubscribe: unsubscribe,
-                          ).padding(bottom: 8),
-                        ),
-                        SliverToBoxAdapter(
-                          child: _PublisherBadgesWidget(
-                            data: data,
-                            badges: badges,
-                          ),
-                        ),
-                        SliverToBoxAdapter(
-                          child: _PublisherVerificationWidget(data: data),
-                        ),
-                        SliverToBoxAdapter(
-                          child: _PublisherBioWidget(data: data),
-                        ),
-                        SliverToBoxAdapter(
-                          child: _PublisherHeatmapWidget(heatmap: heatmap),
-                        ),
-                        SliverPostList(pubName: name, pinned: true),
-                        SliverToBoxAdapter(
-                          child: _PublisherCategoryTabWidget(
-                            categoryTabController: categoryTabController,
-                          ),
-                        ),
-                        SliverPostList(
-                          key: ValueKey(categoryTab.value),
-                          pubName: name,
-                          pinned: false,
-                          type: switch (categoryTab.value) {
-                            1 => 0,
-                            2 => 1,
-                            _ => null,
-                          },
-                        ),
-                        SliverGap(MediaQuery.of(context).padding.bottom + 16),
-                      ],
-                    ),
-          ),
-      error:
-          (error, stackTrace) => AppScaffold(
-            isNoBackground: false,
-            appBar: AppBar(leading: const PageBackButton()),
-            body: Center(child: Text(error.toString())),
-          ),
-      loading:
-          () => AppScaffold(
-            isNoBackground: false,
-            appBar: AppBar(leading: const PageBackButton()),
-            body: Center(child: CircularProgressIndicator()),
-          ),
-    );
-  }
-}
--- a/lib/screens/posts/publisher_profile.dart
+++ b/lib/screens/posts/publisher_profile.dart
--- a/lib/screens/posts/publisher_profile.g.dart
+++ b/lib/screens/posts/publisher_profile.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND

-part of 'pub_profile.dart';
+part of 'publisher_profile.dart';

 // **************************************************************************
 // RiverpodGenerator
--- a/lib/screens/realm/realm_form.dart
+++ b/lib/screens/realm/realm_form.dart
@@ -92,7 +92,7 @@ class EditRealmScreen extends HookConsumerWidget {
      try {
        final cloudFile =
            await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
              fileData: UniversalFile(
                data: result,
                type: UniversalFileType.image,
--- a/lib/screens/tabs.dart
+++ b/lib/screens/tabs.dart
@@ -5,8 +5,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/navigation/conditional_bottom_nav.dart';
 import 'package:island/widgets/navigation/fab_menu.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -21,6 +23,8 @@ const kTabRoutes = [
  '/chat',
  '/realms',
  '/account',
+  '/files',
+  '/thought',
  '/creators',
  '/developers',
 ];
@@ -51,34 +55,55 @@ class TabsScreen extends HookConsumerWidget {
    final destinations = [
      NavigationDestination(
        label: 'explore'.tr(),
-        icon: const Icon(Symbols.explore),
+        icon: const Icon(Symbols.explore_rounded),
      ),
      NavigationDestination(
        label: 'chat'.tr(),
-        icon: const Icon(Symbols.chat_rounded),
+        icon: const Icon(Symbols.forum_rounded),
      ),
      NavigationDestination(
        label: 'realms'.tr(),
-        icon: const Icon(Symbols.group),
+        icon: const Icon(Symbols.group_rounded),
      ),
      NavigationDestination(
        label: 'account'.tr(),
        icon: Badge.count(
          count: notificationUnreadCount.value ?? 0,
          isLabelVisible: (notificationUnreadCount.value ?? 0) > 0,
-          child: const Icon(Symbols.account_circle),
+          child: Consumer(
+            child: const Icon(Symbols.account_circle_rounded),
+            builder: (context, ref, fallbackChild) {
+              final userInfo = ref.watch(userInfoProvider);
+              if (userInfo.value?.profile.picture != null) {
+                return ProfilePictureWidget(
+                  file: userInfo.value!.profile.picture,
+                  radius: 12,
+                );
+              }
+              return fallbackChild!;
+            },
+          ),
        ),
      ),
      if (wideScreen)
-        NavigationDestination(
-          label: 'creatorHub'.tr(),
-          icon: const Icon(Symbols.ink_pen),
-        ),
-      if (wideScreen)
-        NavigationDestination(
-          label: 'developerHub'.tr(),
-          icon: const Icon(Symbols.data_object),
-        ),
+        ...([
+          NavigationDestination(
+            label: 'files'.tr(),
+            icon: const Icon(Symbols.folder_rounded),
+          ),
+          NavigationDestination(
+            label: 'aiThought'.tr(),
+            icon: const Icon(Symbols.bubble_chart),
+          ),
+          NavigationDestination(
+            label: 'creatorHub'.tr(),
+            icon: const Icon(Symbols.design_services_rounded),
+          ),
+          NavigationDestination(
+            label: 'developerHub'.tr(),
+            icon: const Icon(Symbols.data_object_rounded),
+          ),
+        ]),
    ];

    int getCurrentIndex() {
--- a/lib/screens/thought/think.dart
+++ b/lib/screens/thought/think.dart
@@ -1,5 +1,3 @@
-import "dart:convert";
-import "package:dio/dio.dart";
 import "package:easy_localization/easy_localization.dart";
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
@@ -8,18 +6,22 @@ import "package:riverpod_annotation/riverpod_annotation.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:island/models/thought.dart";
 import "package:island/pods/network.dart";
-import "package:island/pods/userinfo.dart";
 import "package:island/widgets/alert.dart";
 import "package:island/widgets/app_scaffold.dart";
 import "package:island/widgets/response.dart";
 import "package:island/widgets/thought/thought_sequence_list.dart";
 import "package:island/widgets/thought/thought_shared.dart";
 import "package:material_symbols_icons/material_symbols_icons.dart";
-import "package:super_sliver_list/super_sliver_list.dart";
-import "package:collection/collection.dart";

 part 'think.g.dart';

+@riverpod
+Future<bool> thoughtAvailableStaus(Ref ref) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final response = await apiClient.get('/insight/billing/status');
+  return response.data['status'] == 'ok';
+}
+
@riverpod
 Future<List<SnThinkingThought>> thoughtSequence(
  Ref ref,
@@ -34,6 +36,13 @@ Future<List<SnThinkingThought>> thoughtSequence(
      .toList();
 }

+@riverpod
+Future<ThoughtServicesResponse> thoughtServices(Ref ref) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final response = await apiClient.get('/insight/thought/services');
+  return ThoughtServicesResponse.fromJson(response.data);
+}
+
 class ThoughtScreen extends HookConsumerWidget {
  const ThoughtScreen({super.key});

@@ -45,186 +54,32 @@ class ThoughtScreen extends HookConsumerWidget {
            ? ref.watch(thoughtSequenceProvider(selectedSequenceId.value!))
            : const AsyncValue<List<SnThinkingThought>>.data([]);

-    final localThoughts = useState<List<SnThinkingThought>>([]);
-    final currentTopic = useState<String?>('aiThought'.tr());
-
-    final messageController = useTextEditingController();
-    final scrollController = useScrollController();
-    final isStreaming = useState(false);
-    final streamingText = useState<String>('');
-    final functionCalls = useState<List<String>>([]);
-    final reasoningChunks = useState<List<String>>([]);
-
-    final listController = useMemoized(() => ListController(), []);
-
-    // Update local thoughts when provider data changes
-    useEffect(() {
-      thoughts.whenData((data) {
-        // Server returns messages in DESC order (newest first), keep as-is for UI
-        localThoughts.value = data;
-        // Update topic from the first thought's sequence
-        if (data.isNotEmpty && data.first.sequence?.topic != null) {
-          currentTopic.value = data.first.sequence!.topic;
-        } else {
-          currentTopic.value = 'aiThought'.tr();
+    // Extract sequence ID from loaded thoughts for the chat interface
+    final sequenceIdFromThoughts = thoughts.maybeWhen(
+      data: (thoughts) {
+        if (thoughts.isNotEmpty && thoughts.first.sequenceId.isNotEmpty) {
+          return thoughts.first.sequenceId;
        }
-      });
-      return null;
-    }, [thoughts]);
+        return null;
+      },
+      orElse: () => null,
+    );

-    // Scroll to bottom when thoughts change or streaming state changes
-    useEffect(() {
-      if (localThoughts.value.isNotEmpty || isStreaming.value) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          scrollController.animateTo(
-            0,
-            duration: const Duration(milliseconds: 300),
-            curve: Curves.easeOut,
-          );
-        });
-      }
-      return null;
-    }, [localThoughts.value.length, isStreaming.value]);
+    // Get initial thoughts and topic from provider
+    final initialThoughts = thoughts.valueOrNull;
+    final initialTopic =
+        (initialThoughts?.isNotEmpty ?? false) &&
+                initialThoughts!.first.sequence?.topic != null
+            ? initialThoughts.first.sequence!.topic
+            : 'aiThought'.tr();

-    void sendMessage() async {
-      if (messageController.text.trim().isEmpty) return;
-
-      final userMessage = messageController.text.trim();
-
-      // Add user message to local thoughts
-      final userInfo = ref.read(userInfoProvider);
-      final now = DateTime.now();
-      final userThought = SnThinkingThought(
-        id: 'user-${DateTime.now().millisecondsSinceEpoch}',
-        content: userMessage,
-        files: [],
-        role: ThinkingThoughtRole.user,
-        sequenceId: selectedSequenceId.value ?? '',
-        createdAt: now,
-        updatedAt: now,
-        sequence:
-            selectedSequenceId.value != null
-                ? thoughts.value?.firstOrNull?.sequence ??
-                    SnThinkingSequence(
-                      id: selectedSequenceId.value!,
-                      accountId: '',
-                      createdAt: now,
-                      updatedAt: now,
-                    )
-                : SnThinkingSequence(
-                  id: '',
-                  accountId: userInfo.value!.id,
-                  createdAt: now,
-                  updatedAt: now,
-                ),
-      );
-      localThoughts.value = [userThought, ...localThoughts.value];
-
-      final request = StreamThinkingRequest(
-        userMessage: userMessage,
-        sequenceId: selectedSequenceId.value,
-        accpetProposals: ['post_create'],
-        attachedMessages: [], // Message datas
-        attachedPosts: [], // ID list for posts
-      );
-
-      try {
-        isStreaming.value = true;
-        streamingText.value = '';
-        functionCalls.value = [];
-        reasoningChunks.value = [];
-
-        final apiClient = ref.read(apiClientProvider);
-        final response = await apiClient.post(
-          '/insight/thought',
-          data: request.toJson(),
-          options: Options(
-            responseType: ResponseType.stream,
-            sendTimeout: Duration(minutes: 1),
-            receiveTimeout: Duration(minutes: 1),
-          ),
-        );
-
-        final stream = response.data.stream;
-        final lineBuffer = StringBuffer();
-
-        stream.listen(
-          (data) {
-            final chunk = utf8.decode(data);
-            lineBuffer.write(chunk);
-            final lines = lineBuffer.toString().split('\n');
-            lineBuffer.clear();
-            lineBuffer.write(lines.last); // keep incomplete line
-
-            for (final line in lines.sublist(0, lines.length - 1)) {
-              if (line.trim().isEmpty) continue;
-              try {
-                if (line.startsWith('data: ')) {
-                  final jsonStr = line.substring(6);
-                  final event = jsonDecode(jsonStr);
-                  final type = event['type'];
-                  final eventData = event['data'];
-                  if (type == 'text') {
-                    streamingText.value += eventData;
-                  } else if (type == 'function_call') {
-                    functionCalls.value = [
-                      ...functionCalls.value,
-                      JsonEncoder.withIndent('  ').convert(eventData),
-                    ];
-                  } else if (type == 'reasoning') {
-                    reasoningChunks.value = [
-                      ...reasoningChunks.value,
-                      eventData,
-                    ];
-                  }
-                } else if (line.startsWith('topic: ')) {
-                  final jsonStr = line.substring(7);
-                  final event = jsonDecode(jsonStr);
-                  currentTopic.value = event['data'];
-                } else if (line.startsWith('thought: ')) {
-                  final jsonStr = line.substring(9);
-                  final event = jsonDecode(jsonStr);
-                  final aiThought = SnThinkingThought.fromJson(event['data']);
-                  localThoughts.value = [aiThought, ...localThoughts.value];
-                  if (selectedSequenceId.value == null &&
-                      aiThought.sequenceId.isNotEmpty) {
-                    selectedSequenceId.value = aiThought.sequenceId;
-                  }
-                  isStreaming.value = false;
-                }
-              } catch (e) {
-                // Ignore parsing errors for individual events
-              }
-            }
-          },
-          onDone: () {
-            if (isStreaming.value) {
-              isStreaming.value = false;
-              showErrorAlert('thoughtParseError'.tr());
-            }
-          },
-          onError: (error) {
-            isStreaming.value = false;
-            if (error is DioException && error.response?.data is ResponseBody) {
-              showErrorAlert('toughtParseError'.tr());
-            } else {
-              showErrorAlert(error);
-            }
-          },
-        );
-
-        messageController.clear();
-        FocusManager.instance.primaryFocus?.unfocus();
-      } catch (error) {
-        isStreaming.value = false;
-        showErrorAlert(error);
-      }
-    }
+    final statusAsync = ref.watch(thoughtAvailableStausProvider);

    return AppScaffold(
      isNoBackground: false,
      appBar: AppBar(
-        title: Text(currentTopic.value ?? 'aiThought'.tr()),
+        title: Text(initialTopic ?? 'aiThought'.tr()),
+        leading: const PageBackButton(),
        actions: [
          IconButton(
            icon: const Icon(Symbols.history),
@@ -241,82 +96,96 @@ class ThoughtScreen extends HookConsumerWidget {
              );
            },
          ),
-          if (localThoughts.value.isNotEmpty &&
-              !isStreaming.value &&
-              localThoughts.value.last.role == ThinkingThoughtRole.assistant)
-            IconButton(
-              icon: const Icon(Symbols.add),
-              tooltip: 'thoughtNewConversation'.tr(),
-              onPressed: () {
-                // Clear current conversation and start new one
-                selectedSequenceId.value = null;
-                localThoughts.value = [];
-                currentTopic.value = 'aiThought'.tr();
-                messageController.clear();
-              },
-            ),
          const Gap(8),
        ],
      ),
-      body: Center(
-        child: Container(
-          constraints: BoxConstraints(maxWidth: 640),
-          child: Column(
-            children: [
-              Expanded(
-                child: thoughts.when(
-                  data:
-                      (thoughtList) => SuperListView.builder(
-                        listController: listController,
-                        controller: scrollController,
-                        padding: const EdgeInsets.only(top: 16, bottom: 16),
-                        reverse: true,
-                        itemCount:
-                            localThoughts.value.length +
-                            (isStreaming.value ? 1 : 0),
-                        itemBuilder: (context, index) {
-                          if (isStreaming.value && index == 0) {
-                            return ThoughtItem(
-                              isStreaming: true,
-                              streamingText: streamingText.value,
-                              reasoningChunks: reasoningChunks.value,
-                              streamingFunctionCalls: functionCalls.value,
-                            );
-                          }
-                          final thoughtIndex =
-                              isStreaming.value ? index - 1 : index;
-                          final thought = localThoughts.value[thoughtIndex];
-                          return ThoughtItem(
-                            thought: thought,
-                            thoughtIndex: thoughtIndex,
-                          );
-                        },
-                      ),
-                  loading:
-                      () => const Center(child: CircularProgressIndicator()),
-                  error:
-                      (error, _) => ResponseErrorWidget(
-                        error: error,
-                        onRetry:
-                            () =>
-                                selectedSequenceId.value != null
-                                    ? ref.invalidate(
-                                      thoughtSequenceProvider(
-                                        selectedSequenceId.value!,
-                                      ),
-                                    )
-                                    : null,
-                      ),
+      body: statusAsync.maybeWhen(
+        data: (status) {
+          final retry = useMemoized(
+            () => () async {
+              showLoadingModal(context);
+              try {
+                await ref
+                    .read(apiClientProvider)
+                    .post('/insight/billing/retry');
+                showSnackBar('Retried billing process');
+                ref.invalidate(thoughtAvailableStausProvider);
+              } catch (e) {
+                showSnackBar('Failed to retry billing');
+              }
+              if (context.mounted) hideLoadingModal(context);
+            },
+            [context, ref],
+          );
+
+          final thoughtsBody = thoughts.when(
+            data:
+                (thoughtList) => ThoughtChatInterface(
+                  initialThoughts: thoughtList,
+                  initialSequenceId: sequenceIdFromThoughts,
+                  initialTopic: initialTopic,
+                  isDisabled: !status,
                ),
-              ),
-              ThoughtInput(
-                messageController: messageController,
-                isStreaming: isStreaming.value,
-                onSend: sendMessage,
-              ),
-            ],
-          ),
-        ),
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error:
+                (error, _) => ResponseErrorWidget(
+                  error: error,
+                  onRetry:
+                      () =>
+                          selectedSequenceId.value != null
+                              ? ref.invalidate(
+                                thoughtSequenceProvider(
+                                  selectedSequenceId.value!,
+                                ),
+                              )
+                              : null,
+                ),
+          );
+          return status
+              ? thoughtsBody
+              : Column(
+                children: [
+                  MaterialBanner(
+                    leading: const Icon(Symbols.error),
+                    content: const Text(
+                      'You have unpaid orders. Please settle your payment to continue using the service.',
+                      style: TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                    actions: [
+                      TextButton(
+                        onPressed: () {
+                          retry();
+                        },
+                        child: Text('retry'.tr()),
+                      ),
+                    ],
+                  ),
+                  Expanded(child: thoughtsBody),
+                ],
+              );
+        },
+        orElse:
+            () => thoughts.when(
+              data:
+                  (thoughtList) => ThoughtChatInterface(
+                    initialThoughts: thoughtList,
+                    initialTopic: initialTopic,
+                  ),
+              loading: () => const Center(child: CircularProgressIndicator()),
+              error:
+                  (error, _) => ResponseErrorWidget(
+                    error: error,
+                    onRetry:
+                        () =>
+                            selectedSequenceId.value != null
+                                ? ref.invalidate(
+                                  thoughtSequenceProvider(
+                                    selectedSequenceId.value!,
+                                  ),
+                                )
+                                : null,
+                  ),
+            ),
      ),
    );
  }
--- a/lib/screens/thought/think.g.dart
+++ b/lib/screens/thought/think.g.dart
@@ -6,6 +6,25 @@ part of 'think.dart';
 // RiverpodGenerator
 // **************************************************************************

+String _$thoughtAvailableStausHash() =>
+    r'720e04e56bff8c4d4ca6854ce997da4e7926c84c';
+
+/// See also [thoughtAvailableStaus].
+@ProviderFor(thoughtAvailableStaus)
+final thoughtAvailableStausProvider = AutoDisposeFutureProvider<bool>.internal(
+  thoughtAvailableStaus,
+  name: r'thoughtAvailableStausProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$thoughtAvailableStausHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef ThoughtAvailableStausRef = AutoDisposeFutureProviderRef<bool>;
 String _$thoughtSequenceHash() => r'2a93c0a04f9a720ba474c02a36502940fb7f3ed7';

 /// Copied from Dart SDK
@@ -152,5 +171,25 @@ class _ThoughtSequenceProviderElement
  String get sequenceId => (origin as ThoughtSequenceProvider).sequenceId;
 }

+String _$thoughtServicesHash() => r'0ddeaec713ecfcdc9786c197f3d4cb41d36c26a5';
+
+/// See also [thoughtServices].
+@ProviderFor(thoughtServices)
+final thoughtServicesProvider =
+    AutoDisposeFutureProvider<ThoughtServicesResponse>.internal(
+      thoughtServices,
+      name: r'thoughtServicesProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$thoughtServicesHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef ThoughtServicesRef =
+    AutoDisposeFutureProviderRef<ThoughtServicesResponse>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
--- a/lib/screens/thought/think_sheet.dart
+++ b/lib/screens/thought/think_sheet.dart
@@ -1,16 +1,13 @@
-import "dart:convert";
-import "package:dio/dio.dart";
 import "package:easy_localization/easy_localization.dart";
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:island/models/thought.dart";
 import "package:island/pods/network.dart";
-import "package:island/pods/userinfo.dart";
+import "package:island/screens/thought/think.dart";
 import "package:island/widgets/alert.dart";
 import "package:island/widgets/content/sheet.dart";
 import "package:island/widgets/thought/thought_shared.dart";
-import "package:super_sliver_list/super_sliver_list.dart";
+import "package:material_symbols_icons/material_symbols_icons.dart";

 class ThoughtSheet extends HookConsumerWidget {
  final List<Map<String, dynamic>> attachedMessages;
@@ -41,202 +38,68 @@ class ThoughtSheet extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final sequenceId = useState<String?>(null);
-    final localThoughts = useState<List<SnThinkingThought>>([]);
-    final currentTopic = useState<String?>('aiThought'.tr());
+    final chatState = useThoughtChat(
+      ref,
+      attachedMessages: attachedMessages,
+      attachedPosts: attachedPosts,
+    );

-    final messageController = useTextEditingController();
-    final scrollController = useScrollController();
-    final isStreaming = useState(false);
-    final streamingText = useState<String>('');
-    final functionCalls = useState<List<String>>([]);
-    final reasoningChunks = useState<List<String>>([]);
-
-    final listController = useMemoized(() => ListController(), []);
-
-    // Scroll to bottom when thoughts change or streaming state changes
-    useEffect(() {
-      if (localThoughts.value.isNotEmpty || isStreaming.value) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          scrollController.animateTo(
-            0,
-            duration: const Duration(milliseconds: 300),
-            curve: Curves.easeOut,
-          );
-        });
-      }
-      return null;
-    }, [localThoughts.value.length, isStreaming.value]);
-
-    void sendMessage() async {
-      if (messageController.text.trim().isEmpty) return;
-
-      final userMessage = messageController.text.trim();
-
-      // Add user message to local thoughts
-      final userInfo = ref.read(userInfoProvider);
-      final now = DateTime.now();
-      final userThought = SnThinkingThought(
-        id: 'user-${DateTime.now().millisecondsSinceEpoch}',
-        content: userMessage,
-        files: [],
-        role: ThinkingThoughtRole.user,
-        sequenceId: sequenceId.value ?? '',
-        createdAt: now,
-        updatedAt: now,
-        sequence: SnThinkingSequence(
-          id: sequenceId.value ?? '',
-          accountId: userInfo.value!.id,
-          createdAt: now,
-          updatedAt: now,
-        ),
-      );
-      localThoughts.value = [userThought, ...localThoughts.value];
-
-      final request = StreamThinkingRequest(
-        userMessage: userMessage,
-        sequenceId: sequenceId.value,
-        accpetProposals: ['post_create'],
-        attachedMessages: attachedMessages,
-        attachedPosts: attachedPosts,
-      );
-
-      try {
-        isStreaming.value = true;
-        streamingText.value = '';
-        functionCalls.value = [];
-        reasoningChunks.value = [];
-
-        final apiClient = ref.read(apiClientProvider);
-        final response = await apiClient.post(
-          '/insight/thought',
-          data: request.toJson(),
-          options: Options(
-            responseType: ResponseType.stream,
-            sendTimeout: Duration(minutes: 1),
-            receiveTimeout: Duration(minutes: 1),
-          ),
-        );
-
-        final stream = response.data.stream;
-        final lineBuffer = StringBuffer();
-
-        stream.listen(
-          (data) {
-            final chunk = utf8.decode(data);
-            lineBuffer.write(chunk);
-            final lines = lineBuffer.toString().split('\n');
-            lineBuffer.clear();
-            lineBuffer.write(lines.last); // keep incomplete line
-
-            for (final line in lines.sublist(0, lines.length - 1)) {
-              if (line.trim().isEmpty) continue;
-              try {
-                if (line.startsWith('data: ')) {
-                  final jsonStr = line.substring(6);
-                  final event = jsonDecode(jsonStr);
-                  final type = event['type'];
-                  final eventData = event['data'];
-                  if (type == 'text') {
-                    streamingText.value += eventData;
-                  } else if (type == 'function_call') {
-                    functionCalls.value = [
-                      ...functionCalls.value,
-                      JsonEncoder.withIndent('  ').convert(eventData),
-                    ];
-                  } else if (type == 'reasoning') {
-                    reasoningChunks.value = [
-                      ...reasoningChunks.value,
-                      eventData,
-                    ];
-                  }
-                } else if (line.startsWith('topic: ')) {
-                  final jsonStr = line.substring(7);
-                  final event = jsonDecode(jsonStr);
-                  currentTopic.value = event['data'];
-                } else if (line.startsWith('thought: ')) {
-                  final jsonStr = line.substring(9);
-                  final event = jsonDecode(jsonStr);
-                  final aiThought = SnThinkingThought.fromJson(event['data']);
-                  localThoughts.value = [aiThought, ...localThoughts.value];
-                  if (sequenceId.value == null &&
-                      aiThought.sequenceId.isNotEmpty) {
-                    sequenceId.value = aiThought.sequenceId;
-                  }
-                  isStreaming.value = false;
-                }
-              } catch (e) {
-                // Ignore parsing errors for individual events
-              }
-            }
-          },
-          onDone: () {
-            if (isStreaming.value) {
-              isStreaming.value = false;
-              showErrorAlert('thoughtParseError'.tr());
-            }
-          },
-          onError: (error) {
-            isStreaming.value = false;
-            if (error is DioException && error.response?.data is ResponseBody) {
-              showErrorAlert('toughtParseError'.tr());
-            } else {
-              showErrorAlert(error);
-            }
-          },
-        );
-
-        messageController.clear();
-        FocusManager.instance.primaryFocus?.unfocus();
-      } catch (error) {
-        isStreaming.value = false;
-        showErrorAlert(error);
-      }
-    }
+    final statusAsync = ref.watch(thoughtAvailableStausProvider);

    return SheetScaffold(
-      titleText: currentTopic.value ?? 'aiThought'.tr(),
-      child: Center(
-        child: Container(
-          constraints: BoxConstraints(maxWidth: 640),
-          child: Column(
-            children: [
-              Expanded(
-                child: SuperListView.builder(
-                  listController: listController,
-                  controller: scrollController,
-                  padding: const EdgeInsets.only(top: 16, bottom: 16),
-                  reverse: true,
-                  itemCount:
-                      localThoughts.value.length + (isStreaming.value ? 1 : 0),
-                  itemBuilder: (context, index) {
-                    if (isStreaming.value && index == 0) {
-                      return ThoughtItem(
-                        isStreaming: true,
-                        streamingText: streamingText.value,
-                        reasoningChunks: reasoningChunks.value,
-                        streamingFunctionCalls: functionCalls.value,
-                      );
-                    }
-                    final thoughtIndex = isStreaming.value ? index - 1 : index;
-                    final thought = localThoughts.value[thoughtIndex];
-                    return ThoughtItem(
-                      thought: thought,
-                      thoughtIndex: thoughtIndex,
-                    );
-                  },
-                ),
-              ),
-              ThoughtInput(
-                messageController: messageController,
-                isStreaming: isStreaming.value,
-                onSend: sendMessage,
-                attachedMessages: attachedMessages,
-                attachedPosts: attachedPosts,
-              ),
-            ],
-          ),
-        ),
+      titleText: chatState.currentTopic.value ?? 'aiThought'.tr(),
+      child: statusAsync.maybeWhen(
+        data: (status) {
+          final retry = useMemoized(
+            () => () async {
+              showLoadingModal(context);
+              try {
+                await ref
+                    .read(apiClientProvider)
+                    .post('/insight/billing/retry');
+                showSnackBar('Retried billing process');
+                ref.invalidate(thoughtAvailableStausProvider);
+              } catch (e) {
+                showSnackBar('Failed to retry billing');
+              }
+              if (context.mounted) hideLoadingModal(context);
+            },
+            [context, ref],
+          );
+
+          final chatInterface = ThoughtChatInterface(
+            attachedMessages: attachedMessages,
+            attachedPosts: attachedPosts,
+            isDisabled: !status,
+          );
+          return status
+              ? chatInterface
+              : Column(
+                children: [
+                  MaterialBanner(
+                    leading: const Icon(Symbols.error),
+                    content: const Text(
+                      'You have unpaid orders. Please settle your payment to continue using the service.',
+                      style: TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                    actions: [
+                      TextButton(
+                        onPressed: () {
+                          retry();
+                        },
+                        child: Text('retry'.tr()),
+                      ),
+                    ],
+                  ),
+                  Expanded(child: chatInterface),
+                ],
+              );
+        },
+        orElse:
+            () => ThoughtChatInterface(
+              attachedMessages: attachedMessages,
+              attachedPosts: attachedPosts,
+            ),
      ),
    );
  }
--- a/lib/screens/tray_manager.dart
+++ b/lib/screens/tray_manager.dart
@@ -22,7 +22,8 @@ class TrayService {
    await trayManager.setIcon(
      Platform.isWindows
          ? 'assets/icons/icon.ico'
-          : 'assets/icons/icon-outline.svg',
+          : 'assets/icons/icon-tray.png',
+      isTemplate: Platform.isMacOS,
    );

    final menu = Menu(
--- a/lib/screens/wallet.dart
+++ b/lib/screens/wallet.dart
@@ -55,6 +55,7 @@ class CreateFundSheet extends StatefulWidget {

 class _CreateFundSheetState extends State<CreateFundSheet> {
  final amountController = TextEditingController();
+  final splitsController = TextEditingController(text: '1');
  final messageController = TextEditingController();
  String selectedCurrency = 'golds';
  int selectedSplitType = 0; // 0: even, 1: random
@@ -64,6 +65,7 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
  void dispose() {
    amountController.dispose();
    messageController.dispose();
+    splitsController.dispose();
    super.dispose();
  }

@@ -103,17 +105,9 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
                      labelText: 'enterAmount'.tr(),
                      hintText: '0.00',
                      prefixIcon: Icon(kCurrencyIconData[selectedCurrency]),
-                      border: OutlineInputBorder(),
-                      enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(
-                            context,
-                          ).colorScheme.outline.withOpacity(0.2),
-                        ),
-                      ),
-                      focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(context).colorScheme.primary,
+                      border: OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
                        ),
                      ),
                    ),
@@ -136,17 +130,9 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
                  DropdownButtonFormField<String>(
                    value: selectedCurrency,
                    decoration: InputDecoration(
-                      border: OutlineInputBorder(),
-                      enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(
-                            context,
-                          ).colorScheme.outline.withOpacity(0.2),
-                        ),
-                      ),
-                      focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(context).colorScheme.primary,
+                      border: OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
                        ),
                      ),
                    ),
@@ -173,49 +159,84 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
                    },
                  ),

-                  // Split Type Section (only show when there are 2+ recipients)
-                  if (selectedRecipients.length >= 2) ...[
-                    const Gap(16),
-                    Text(
-                      'splitType'.tr(),
-                      style: TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w600,
-                        color: Theme.of(context).colorScheme.primary,
+                  const Gap(16),
+
+                  // Amount of Splits Section
+                  Text(
+                    'amountOfSplits'.tr(),
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
+                  ),
+                  const Gap(8),
+                  TextField(
+                    controller: splitsController,
+                    keyboardType: TextInputType.number,
+                    inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+                    decoration: InputDecoration(
+                      labelText: 'enterNumberOfSplits'.tr(),
+                      hintText:
+                          selectedRecipients.isNotEmpty
+                              ? selectedRecipients.length.toString()
+                              : '1',
+                      border: OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
+                        ),
                      ),
                    ),
-                    const Gap(8),
-                    Row(
-                      children: [
-                        Expanded(
-                          child: RadioListTile<int>(
-                            title: Text('evenSplit'.tr()),
-                            subtitle: Text('equalAmountEach'.tr()),
-                            value: 0,
-                            groupValue: selectedSplitType,
-                            onChanged: (value) {
-                              if (value != null) {
-                                setState(() => selectedSplitType = value);
-                              }
-                            },
-                          ),
-                        ),
-                        Expanded(
-                          child: RadioListTile<int>(
-                            title: Text('randomSplit'.tr()),
-                            subtitle: Text('randomAmountEach'.tr()),
-                            value: 1,
-                            groupValue: selectedSplitType,
-                            onChanged: (value) {
-                              if (value != null) {
-                                setState(() => selectedSplitType = value);
-                              }
-                            },
-                          ),
-                        ),
-                      ],
+                    onTapOutside:
+                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    onChanged: (value) {
+                      if (value.isEmpty && selectedRecipients.isNotEmpty) {
+                        splitsController.text =
+                            selectedRecipients.length.toString();
+                      }
+                    },
+                  ),
+
+                  const Gap(16),
+                  Text(
+                    'splitType'.tr(),
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).colorScheme.primary,
                    ),
-                  ],
+                  ),
+                  const Gap(8),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: RadioListTile<int>(
+                          title: Text('evenSplit'.tr()),
+                          subtitle: Text('equalAmountEach'.tr()),
+                          value: 0,
+                          groupValue: selectedSplitType,
+                          onChanged: (value) {
+                            if (value != null) {
+                              setState(() => selectedSplitType = value);
+                            }
+                          },
+                        ),
+                      ),
+                      Expanded(
+                        child: RadioListTile<int>(
+                          title: Text('randomSplit'.tr()),
+                          subtitle: Text('randomAmountEach'.tr()),
+                          value: 1,
+                          groupValue: selectedSplitType,
+                          onChanged: (value) {
+                            if (value != null) {
+                              setState(() => selectedSplitType = value);
+                            }
+                          },
+                        ),
+                      ),
+                    ],
+                  ),

                  const Gap(16),

@@ -370,17 +391,9 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
                      labelText: 'personalMessage'.tr(),
                      hintText: 'addPersonalMessageForRecipients'.tr(),
                      alignLabelWithHint: true,
-                      border: OutlineInputBorder(),
-                      enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(
-                            context,
-                          ).colorScheme.outline.withOpacity(0.2),
-                        ),
-                      ),
-                      focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(context).colorScheme.primary,
+                      border: OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
                        ),
                      ),
                    ),
@@ -520,14 +533,15 @@ class _CreateFundSheetState extends State<CreateFundSheet> {

  Future<void> _createFund() async {
    final amount = double.tryParse(amountController.text);
+    final splits = int.tryParse(splitsController.text);

    if (amount == null || amount <= 0) {
      showErrorAlert('invalidAmount'.tr());
      return;
    }

-    if (selectedRecipients.isEmpty) {
-      showErrorAlert('noRecipientsSelected'.tr());
+    if (splits == null || splits <= 0) {
+      showErrorAlert('invalidNumberOfSplits'.tr());
      return;
    }

@@ -535,6 +549,7 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
      'currency': selectedCurrency,
      'total_amount': amount,
      'split_type': selectedSplitType,
+      'amount_of_splits': splits,
      'recipient_account_ids': selectedRecipients.map((r) => r.id).toList(),
      'message':
          messageController.text.trim().isEmpty
@@ -610,17 +625,9 @@ class _CreateTransferSheetState extends State<CreateTransferSheet> {
                      labelText: 'enterAmount'.tr(),
                      hintText: '0.00',
                      prefixIcon: Icon(kCurrencyIconData[selectedCurrency]),
-                      border: OutlineInputBorder(),
-                      enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(
-                            context,
-                          ).colorScheme.outline.withOpacity(0.2),
-                        ),
-                      ),
-                      focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(context).colorScheme.primary,
+                      border: OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
                        ),
                      ),
                    ),
@@ -643,17 +650,9 @@ class _CreateTransferSheetState extends State<CreateTransferSheet> {
                  DropdownButtonFormField<String>(
                    value: selectedCurrency,
                    decoration: InputDecoration(
-                      border: OutlineInputBorder(),
-                      enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(
-                            context,
-                          ).colorScheme.outline.withOpacity(0.2),
-                        ),
-                      ),
-                      focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(context).colorScheme.primary,
+                      border: OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
                        ),
                      ),
                    ),
@@ -817,17 +816,9 @@ class _CreateTransferSheetState extends State<CreateTransferSheet> {
                      labelText: 'transferRemark'.tr(),
                      hintText: 'addRemarkForTransfer'.tr(),
                      alignLabelWithHint: true,
-                      border: OutlineInputBorder(),
-                      enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(
-                            context,
-                          ).colorScheme.outline.withOpacity(0.2),
-                        ),
-                      ),
-                      focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                          color: Theme.of(context).colorScheme.primary,
+                      border: OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
                        ),
                      ),
                    ),
@@ -1863,6 +1854,6 @@ class WalletScreen extends HookConsumerWidget {
 }

 const Map<String, IconData> kCurrencyIconData = {
-  'points': Symbols.toll,
-  'golds': Symbols.attach_money,
+  'points': Symbols.bolt,
+  'golds': Symbols.diamond,
 };
--- a/lib/screens/wallet.dart.backup
+++ b/lib/screens/wallet.dart.backup
--- a/lib/services/event_bus.dart
+++ b/lib/services/event_bus.dart
@@ -16,3 +16,10 @@ class PostCreatedEvent {
 class ChatRoomsRefreshEvent {
  const ChatRoomsRefreshEvent();
 }
+
+/// Event fired when OIDC auth callback is received
+class OidcAuthCallbackEvent {
+  final String challengeId;
+
+  const OidcAuthCallbackEvent(this.challengeId);
+}
--- a/lib/services/file_uploader.dart
+++ b/lib/services/file_uploader.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:typed_data';
+import 'package:convert/convert.dart';
 import 'package:cross_file/cross_file.dart';
 import 'package:crypto/crypto.dart';
 import 'package:dio/dio.dart';
@@ -7,6 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:island/models/file.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/pods/upload_tasks.dart';
 import 'package:mime/mime.dart';
 import 'package:native_exif/native_exif.dart';
 import 'package:path/path.dart' show extension;
@@ -16,16 +17,57 @@ class FileUploader {

  FileUploader(this._client);

-  /// Calculates the MD5 hash of a file.
-  Future<String> _calculateFileHash(XFile file) async {
-    final bytes = await file.readAsBytes();
+  /// Calculates the MD5 hash of file bytes.
+  String _calculateFileHash(Uint8List bytes) {
    final digest = md5.convert(bytes);
    return digest.toString();
  }

+  /// Calculates the MD5 hash from a stream.
+  Future<String> _calculateFileHashFromStream(Stream<List<int>> stream) async {
+    final accumulator = AccumulatorSink<Digest>();
+    final converter = md5.startChunkedConversion(accumulator);
+    await for (final chunk in stream) {
+      converter.add(chunk);
+    }
+    converter.close();
+    final digest = accumulator.events.single;
+    return digest.toString();
+  }
+
+  /// Reads the next chunk from a stream subscription.
+  Future<Uint8List> _readNextChunk(
+    StreamSubscription<List<int>> subscription,
+    int size,
+  ) async {
+    final completer = Completer<Uint8List>();
+    final buffer = <int>[];
+    int remaining = size;
+
+    void onData(List<int> data) {
+      buffer.addAll(data);
+      remaining -= data.length;
+      if (remaining <= 0) {
+        subscription.pause();
+        completer.complete(Uint8List.fromList(buffer.sublist(0, size)));
+      }
+    }
+
+    void onDone() {
+      if (!completer.isCompleted) {
+        completer.complete(Uint8List.fromList(buffer));
+      }
+    }
+
+    subscription.onData(onData);
+    subscription.onDone(onDone);
+
+    return completer.future;
+  }
+
  /// Creates an upload task for the given file.
  Future<Map<String, dynamic>> createUploadTask({
-    required XFile file,
+    required dynamic fileData,
    required String fileName,
    required String contentType,
    String? poolId,
@@ -33,9 +75,19 @@ class FileUploader {
    String? encryptPassword,
    String? expiredAt,
    int? chunkSize,
+    String? path,
  }) async {
-    final hash = await _calculateFileHash(file);
-    final fileSize = await file.length();
+    String hash;
+    int fileSize;
+    if (fileData is XFile) {
+      fileSize = await fileData.length();
+      hash = await _calculateFileHashFromStream(fileData.openRead());
+    } else if (fileData is Uint8List) {
+      hash = _calculateFileHash(fileData);
+      fileSize = fileData.length;
+    } else {
+      throw ArgumentError('Invalid fileData type');
+    }

    final response = await _client.post(
      '/drive/files/upload/create',
@@ -49,6 +101,7 @@ class FileUploader {
        'encrypt_password': encryptPassword,
        'expired_at': expiredAt,
        'chunk_size': chunkSize,
+        'path': path,
      },
    );

@@ -60,6 +113,7 @@ class FileUploader {
    required String taskId,
    required int chunkIndex,
    required Uint8List chunkData,
+    ProgressCallback? onSendProgress,
  }) async {
    final formData = FormData.fromMap({
      'chunk': MultipartFile.fromBytes(
@@ -71,19 +125,26 @@ class FileUploader {
    await _client.post(
      '/drive/files/upload/chunk/$taskId/$chunkIndex',
      data: formData,
+      onSendProgress: onSendProgress,
    );
  }

  /// Completes the upload and returns the CloudFile object.
  Future<SnCloudFile> completeUpload(String taskId) async {
-    final response = await _client.post('/drive/files/upload/complete/$taskId');
+    final response = await _client.post(
+      '/drive/files/upload/complete/$taskId',
+      options: Options(
+        sendTimeout: Duration(minutes: 1),
+        receiveTimeout: Duration(minutes: 1),
+      ),
+    );

    return SnCloudFile.fromJson(response.data);
  }

  /// Uploads a file in chunks using the multi-part API.
  Future<SnCloudFile> uploadFile({
-    required XFile file,
+    required dynamic fileData,
    required String fileName,
    required String contentType,
    String? poolId,
@@ -91,10 +152,13 @@ class FileUploader {
    String? encryptPassword,
    String? expiredAt,
    int? customChunkSize,
+    String? path,
+    Function(double? progress, Duration estimate)? onProgress,
  }) async {
    // Step 1: Create upload task
+    onProgress?.call(null, Duration.zero);
    final createResponse = await createUploadTask(
-      file: file,
+      fileData: fileData,
      fileName: fileName,
      contentType: contentType,
      poolId: poolId,
@@ -102,6 +166,7 @@ class FileUploader {
      encryptPassword: encryptPassword,
      expiredAt: expiredAt,
      chunkSize: customChunkSize,
+      path: path,
    );

    if (createResponse['file_exists'] == true) {
@@ -112,50 +177,74 @@ class FileUploader {
    final taskId = createResponse['task_id'] as String;
    final chunkSize = createResponse['chunk_size'] as int;
    final chunksCount = createResponse['chunks_count'] as int;
+    int totalSize;
+    if (fileData is XFile) {
+      totalSize = await fileData.length();
+    } else if (fileData is Uint8List) {
+      totalSize = fileData.length;
+    } else {
+      throw ArgumentError('Invalid fileData type');
+    }

    // Step 2: Upload chunks
-    final stream = file.openRead();
-    final chunks = <Uint8List>[];
-    int bytesRead = 0;
-    final buffer = BytesBuilder();
-
-    await for (final chunk in stream) {
-      buffer.add(chunk);
-      bytesRead += chunk.length;
-
-      if (bytesRead >= chunkSize) {
-        chunks.add(buffer.takeBytes());
-        bytesRead = 0;
+    int bytesUploaded = 0;
+    if (fileData is XFile) {
+      // Use stream for XFile
+      final subscription = fileData.openRead().listen(null);
+      subscription.pause();
+      for (int i = 0; i < chunksCount; i++) {
+        subscription.resume();
+        final chunkData = await _readNextChunk(subscription, chunkSize);
+        await uploadChunk(
+          taskId: taskId,
+          chunkIndex: i,
+          chunkData: chunkData,
+          onSendProgress: (sent, total) {
+            final overallProgress = (bytesUploaded + sent) / totalSize;
+            onProgress?.call(overallProgress, Duration.zero);
+          },
+        );
+        bytesUploaded += chunkData.length;
+      }
+      subscription.cancel();
+    } else if (fileData is Uint8List) {
+      // Use old way for Uint8List
+      final chunks = <Uint8List>[];
+      for (int i = 0; i < fileData.length; i += chunkSize) {
+        final end =
+            i + chunkSize > fileData.length ? fileData.length : i + chunkSize;
+        chunks.add(Uint8List.fromList(fileData.sublist(i, end)));
      }
-    }

-    // Add remaining bytes as last chunk
-    if (buffer.length > 0) {
-      chunks.add(buffer.takeBytes());
-    }
-
-    // Ensure we have the correct number of chunks
-    if (chunks.length != chunksCount) {
-      throw Exception(
-        'Chunk count mismatch: expected $chunksCount, got ${chunks.length}',
-      );
-    }
-
-    // Upload each chunk
-    for (int i = 0; i < chunks.length; i++) {
-      await uploadChunk(taskId: taskId, chunkIndex: i, chunkData: chunks[i]);
+      // Upload each chunk
+      for (int i = 0; i < chunks.length; i++) {
+        await uploadChunk(
+          taskId: taskId,
+          chunkIndex: i,
+          chunkData: chunks[i],
+          onSendProgress: (sent, total) {
+            final overallProgress = (bytesUploaded + sent) / totalSize;
+            onProgress?.call(overallProgress, Duration.zero);
+          },
+        );
+        bytesUploaded += chunks[i].length;
+      }
+    } else {
+      throw ArgumentError('Invalid fileData type');
    }

    // Step 3: Complete upload
+    onProgress?.call(null, Duration.zero);
    return await completeUpload(taskId);
  }

  static Completer<SnCloudFile?> createCloudFile({
    required UniversalFile fileData,
-    required Dio client,
+    required WidgetRef ref,
    String? poolId,
+    String? path,
    FileUploadMode? mode,
-    Function(double progress, Duration estimate)? onProgress,
+    Function(double? progress, Duration estimate)? onProgress,
  }) {
    final completer = Completer<SnCloudFile?>();

@@ -191,8 +280,9 @@ class FileUploader {
            .then(
              (_) => _processUpload(
                fileData,
-                client,
+                ref,
                poolId,
+                path,
                onProgress,
                completer,
              ),
@@ -201,8 +291,9 @@ class FileUploader {
              debugPrint('Error removing GPS EXIF data: $e');
              return _processUpload(
                fileData,
-                client,
+                ref,
                poolId,
+                path,
                onProgress,
                completer,
              );
@@ -212,33 +303,41 @@ class FileUploader {
      }
    }

-    _processUpload(fileData, client, poolId, onProgress, completer);
+    _processUpload(fileData, ref, poolId, path, onProgress, completer);
    return completer;
  }

-  // Helper method to process the upload
+  // Helper method to process the upload with enhanced uploader
  static Completer<SnCloudFile?> _processUpload(
    UniversalFile fileData,
-    Dio client,
+    WidgetRef ref,
    String? poolId,
-    Function(double progress, Duration estimate)? onProgress,
+    String? path,
+    Function(double? progress, Duration estimate)? onProgress,
    Completer<SnCloudFile?> completer,
  ) {
    String actualMimetype = getMimeType(fileData);
-    late XFile file;
    String actualFilename = fileData.displayName ?? 'randomly_file';
-    Uint8List? byteData;
+    Uint8List? bytes;

    // Handle the data based on what's in the UniversalFile
    final data = fileData.data;

    if (data is XFile) {
-      file = data;
-      actualFilename = fileData.displayName ?? data.name;
+      _performUpload(
+        fileData: data,
+        fileName: fileData.displayName ?? data.name,
+        path: path,
+        contentType: actualMimetype,
+        ref: ref,
+        poolId: poolId,
+        onProgress: onProgress,
+        completer: completer,
+      );
+      return completer;
    } else if (data is List<int> || data is Uint8List) {
-      byteData = data is List<int> ? Uint8List.fromList(data) : data;
+      bytes = data is List<int> ? Uint8List.fromList(data) : data;
      actualFilename = fileData.displayName ?? 'uploaded_file';
-      file = XFile.fromData(byteData!, mimeType: actualMimetype);
    } else if (data is SnCloudFile) {
      // If the file is already on the cloud, just return it
      completer.complete(data);
@@ -252,28 +351,56 @@ class FileUploader {
      return completer;
    }

-    final uploader = FileUploader(client);
+    if (bytes != null) {
+      _performUpload(
+        fileData: bytes,
+        fileName: actualFilename,
+        contentType: actualMimetype,
+        path: path,
+        ref: ref,
+        poolId: poolId,
+        onProgress: onProgress,
+        completer: completer,
+      );
+    }
+
+    return completer;
+  }
+
+  // Helper method to perform the actual upload with enhanced uploader
+  static void _performUpload({
+    required dynamic fileData,
+    required String fileName,
+    required String contentType,
+    required WidgetRef ref,
+    String? poolId,
+    String? path,
+    Function(double? progress, Duration estimate)? onProgress,
+    required Completer<SnCloudFile?> completer,
+  }) {
+    // Use the enhanced uploader with task tracking
+    final uploader = ref.read(enhancedFileUploaderProvider);

    // Call progress start
-    onProgress?.call(0.0, Duration.zero);
+    onProgress?.call(null, Duration.zero);
    uploader
        .uploadFile(
-          file: file,
-          fileName: actualFilename,
-          contentType: actualMimetype,
+          fileData: fileData,
+          fileName: fileName,
+          contentType: contentType,
          poolId: poolId,
+          path: path,
+          onProgress: onProgress,
        )
        .then((result) {
          // Call progress end
-          onProgress?.call(1.0, Duration.zero);
+          onProgress?.call(null, Duration.zero);
          completer.complete(result);
        })
        .catchError((e) {
          completer.completeError(e);
          throw e;
        });
-
-    return completer;
  }

  /// Gets the MIME type of a UniversalFile.
--- a/lib/services/notify.universal.dart
+++ b/lib/services/notify.universal.dart
@@ -106,20 +106,6 @@ StreamSubscription<WebSocketPacket> setupNotificationListener(
              child: NotificationCard(notification: notification),
            ),
          ),
-          onTap: () {
-            if (notification.meta['action_uri'] != null) {
-              var uri = notification.meta['action_uri'] as String;
-              if (uri.startsWith('/')) {
-                // In-app routes
-                rootNavigatorKey.currentContext?.push(
-                  notification.meta['action_uri'],
-                );
-              } else {
-                // External URLs
-                launchUrlString(uri);
-              }
-            }
-          },
          onDismissed: () {},
          dismissType: DismissType.onSwipe,
          displayDuration: const Duration(seconds: 5),
--- a/lib/utils/file_icon_utils.dart
+++ b/lib/utils/file_icon_utils.dart
@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+import '../models/file.dart';
+import '../widgets/content/cloud_files.dart';
+
+/// Returns an appropriate icon widget for the given file based on its MIME type
+Widget getFileIcon(
+  SnCloudFile file, {
+  required double size,
+  bool tinyPreview = true,
+}) {
+  final itemType = file.mimeType?.split('/').firstOrNull;
+  final mimeType = file.mimeType ?? '';
+  final extension = file.name.split('.').lastOrNull?.toLowerCase() ?? '';
+
+  // For images, show the actual image thumbnail
+  if (itemType == 'image' && tinyPreview) {
+    return CloudImageWidget(file: file);
+  }
+
+  // Return icon based on MIME type or file extension
+  final icon = switch ((itemType, mimeType, extension)) {
+    ('image', _, _) => Symbols.image,
+    ('audio', _, _) => Symbols.audio_file,
+    ('video', _, _) => Symbols.video_file,
+    ('application', 'application/pdf', _) => Symbols.picture_as_pdf,
+    ('application', 'application/zip', _) => Symbols.archive,
+    ('application', 'application/x-rar-compressed', _) => Symbols.archive,
+    (
+      'application',
+      'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+      _,
+    ) ||
+    ('application', 'application/msword', _) => Symbols.description,
+    (
+      'application',
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      _,
+    ) ||
+    ('application', 'application/vnd.ms-excel', _) => Symbols.table_chart,
+    (
+      'application',
+      'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+      _,
+    ) ||
+    ('application', 'application/vnd.ms-powerpoint', _) => Symbols.slideshow,
+    ('text', _, _) => Symbols.article,
+    ('application', _, 'js') ||
+    ('application', _, 'dart') ||
+    ('application', _, 'py') ||
+    ('application', _, 'java') ||
+    ('application', _, 'cpp') ||
+    ('application', _, 'c') ||
+    ('application', _, 'cs') => Symbols.code,
+    ('application', _, 'json') ||
+    ('application', _, 'xml') => Symbols.data_object,
+    (_, _, 'md') => Symbols.article,
+    (_, _, 'html') => Symbols.web,
+    (_, _, 'css') => Symbols.css,
+    _ => Symbols.description, // Default icon
+  };
+
+  return Icon(icon, size: size, fill: 1).center();
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
LittleSheep	24791b3293	🎉 Launch 3.3.0+146	2025-11-17 01:33:34 +08:00
LittleSheep	3ac263d483	🐛 Fix build on web	2025-11-17 01:26:34 +08:00
LittleSheep	2445d8adf8	💄 Optimzations	2025-11-17 01:23:27 +08:00
LittleSheep	d4f95bbbf4	✨ Claim fund	2025-11-17 01:20:49 +08:00
LittleSheep	943e4b7b5c	🐛 Fix edit post didn't inherent poll and fund	2025-11-16 23:58:36 +08:00
LittleSheep	7edc02a1d3	♻️ No longer two submit post function	2025-11-16 23:54:50 +08:00
LittleSheep	3f9881e943	✨ Fund creation and attach found to message	2025-11-16 23:43:28 +08:00
LittleSheep	50c25e919c	🐛 Bug fixes in cloud file collection	2025-11-16 23:00:14 +08:00
LittleSheep	99fb08dd55	✨ Send message with poll	2025-11-16 22:43:18 +08:00
LittleSheep	e43bc6b8a8	💄 Optimize poll	2025-11-16 22:29:24 +08:00
LittleSheep	c247cdf81c	♻️ Refactored poll editor	2025-11-16 22:15:10 +08:00
LittleSheep	3ffa730505	💄 Optimize chat input expand style	2025-11-16 21:49:41 +08:00
LittleSheep	1cc34d3073	✨ Chat input expansiable section basis	2025-11-16 21:42:10 +08:00
LittleSheep	96a919cc4e	💫 Animated height padding in inputs	2025-11-16 20:20:24 +08:00
LittleSheep	e7e3bfcadf	🐛 Fix oidc callback	2025-11-16 18:38:36 +08:00
LittleSheep	a8617a5040	💄 Collspible link embeds	2025-11-16 18:23:24 +08:00
LittleSheep	d94f8d004f	💄 Shows friends overview on mobile as well	2025-11-16 18:10:55 +08:00
LittleSheep	d93b066979	📝 Rename the currencies	2025-11-16 17:59:10 +08:00
LittleSheep	320664a547	💄 Friends overview optimization	2025-11-16 17:50:36 +08:00
LittleSheep	98f4698d5b	🐛 Fixes of serval bugs	2025-11-16 17:40:37 +08:00
LittleSheep	82397dd087	✨ Friends overview basis	2025-11-16 17:26:31 +08:00
LittleSheep	4ec10ceb47	♻️ Rework of the oidc login flow (wip)	2025-11-16 17:07:34 +08:00
LittleSheep	4b03b45a0d	💄 Create account, login modal varaint and more auth check to prevent user from entering certain widget in unauthorized state	2025-11-16 14:53:40 +08:00
LittleSheep	7a72d32649	🐛 Fix publisher page account avatar no gesture detector, close #188	2025-11-16 12:06:48 +08:00
LittleSheep	5152dd13ea	💄 Continue optimize the post reaction sheet	2025-11-16 12:04:13 +08:00
LittleSheep	fd377aa7af	💄 Change the post reaction sheet sticker picker align and close	2025-11-16 11:56:49 +08:00
LittleSheep	67044148f1	💄 Fix chat input overlaps with message sometimes	2025-11-16 11:48:51 +08:00
LittleSheep	92bc43e4df	🐛 Fix chat creation cause stack has no page	2025-11-16 11:48:35 +08:00
LittleSheep	a1a7b34c86	♻️ Use bottom modal sheet for chat creation form	2025-11-16 11:46:31 +08:00
LittleSheep	40c0e052cf	💄 Optimize thought input space to avoid input cover message	2025-11-16 11:22:47 +08:00
LittleSheep	9a75228e38	✨ Multi model support in thought	2025-11-16 02:45:02 +08:00
LittleSheep	a9fd75cc45	✨ Thinking billing check	2025-11-16 01:18:20 +08:00
LittleSheep	a713b30d93	🐛 Fix bugs	2025-11-16 00:52:17 +08:00
LittleSheep	e516f0a862	🐛 Bug fixes	2025-11-16 00:34:10 +08:00
LittleSheep	429b966c4b	🐛 Fix wrong tool call progress status	2025-11-15 23:22:33 +08:00
LittleSheep	f14da0d3a2	💫 Add tool call calling hint animation	2025-11-15 23:22:07 +08:00
LittleSheep	d201182bd2	♻️ Turn thought into a Tab	2025-11-15 23:08:31 +08:00
LittleSheep	6f6422c15e	💄 Optimize thought function call style	2025-11-15 23:02:25 +08:00
LittleSheep	9f6ae639ee	🐛 Fix publisher member management missing service id to use sphere API	2025-11-15 22:40:27 +08:00
LittleSheep	35f4d7d885	♻️ Updated the thought rendering	2025-11-15 22:16:29 +08:00
LittleSheep	a9c8f49797	💄 Optimize thoughts	2025-11-15 21:15:41 +08:00
LittleSheep	5e9341a19c	♻️ Refactored the thinking	2025-11-15 17:10:36 +08:00
LittleSheep	645a6dca93	♻️ Refactor the thought insight to support new API	2025-11-15 16:59:22 +08:00
LittleSheep	ea8e7ead2d	💄 Add go to previous path action in path nav in file list	2025-11-15 16:25:24 +08:00
LittleSheep	5f2f083d72	♻️ Fixes and optimizations in file list	2025-11-15 16:20:05 +08:00
LittleSheep	5cf40e27de	💄 Optimized the waterfall file list style	2025-11-15 16:05:42 +08:00
LittleSheep	1ab7295918	💄 Optimize waterfall file list design	2025-11-15 15:54:13 +08:00
LittleSheep	07f191171c	✨ Waterfall layout in files (w.i.p)	2025-11-15 15:42:09 +08:00
LittleSheep	4a5dac248e	♻️ Dedicated file viewer widget	2025-11-15 15:08:49 +08:00
LittleSheep	3b983a6444	♻️ Refactored the file detail	2025-11-15 15:04:01 +08:00
LittleSheep	4607b77355	♻️ Better file icons	2025-11-15 13:36:00 +08:00
LittleSheep	7957e4894a	✨ File list drag and drop	2025-11-15 13:22:05 +08:00
LittleSheep	f94f80c375	👽 Update the indexed file api calls	2025-11-15 03:06:41 +08:00
LittleSheep	74fa2215a6	✨ Unindexed files	2025-11-15 02:59:20 +08:00
LittleSheep	0d11435feb	⬆️ Upgrade dependecies	2025-11-15 01:44:10 +08:00
LittleSheep	e22598b0a6	🔨 Preview of the watchOS app main screen	2025-11-14 21:41:04 +08:00
LittleSheep	84cfe643f5	👽 Adopt the new folder system (w.i.p)	2025-11-14 01:04:15 +08:00
LittleSheep	05ac04e9a2	✨ Enchaned file detail screen	2025-11-13 01:44:55 +08:00
LittleSheep	66f283d6e8	✨ Renders file folders in drive	2025-11-13 01:31:58 +08:00
LittleSheep	c779c7523c	✨ FIle index	2025-11-12 22:09:22 +08:00
LittleSheep	ac7cb29afe	♻️ Improved the files screen	2025-11-11 00:49:07 +08:00
LittleSheep	935aa77223	♻️ Turn the file screen into a tab	2025-11-11 00:39:49 +08:00
LittleSheep	24e5b3b824	✨ Account tab icon shows pfp	2025-11-11 00:39:35 +08:00
LittleSheep	0391893b32	🐛 Bug fixes in upload task tracking	2025-11-11 00:00:09 +08:00
LittleSheep	b8d24876c8	🚚 Rename upload task to drive task	2025-11-10 01:56:22 +08:00
LittleSheep	0493661f9a	🐛 Fixes and optimizations	2025-11-10 01:49:38 +08:00
LittleSheep	b40afde00f	💫 Animated the upload overlay	2025-11-10 01:40:28 +08:00
LittleSheep	78a4022531	💄 Optimize upload overlay styling	2025-11-10 01:27:06 +08:00
LittleSheep	8a291c80b7	✨ Upload tasks overlay	2025-11-10 01:11:43 +08:00
LittleSheep	1395d65b76	♻️ Refactored publisher creation into sheet	2025-11-09 21:18:34 +08:00
LittleSheep	eb4942e0ed	💄 Optimize account card style when no background	2025-11-09 14:28:53 +08:00
LittleSheep	f254cfa81e	♻️ Refactored the captcha	2025-11-09 14:21:33 +08:00
LittleSheep	4927795260	♻️ Refactored the upload files according to new backend tasks	2025-11-09 14:09:26 +08:00
LittleSheep	e4019dadc8	💄 Optimize file upload prograss indicates	2025-11-09 01:59:24 +08:00
LittleSheep	5e7d77e1a1	🐛 Fix share sheet error	2025-11-08 20:05:18 +08:00
LittleSheep	bfcbed035c	♻️ Refactored file uploading	2025-11-08 20:04:54 +08:00
LittleSheep	5ebefae961	🚀 Launch 3.3.0+145	2025-11-05 22:48:34 +08:00
LittleSheep	d4758674bb	🐛 Trying to fix file chunk issue	2025-11-05 13:13:21 +08:00
LittleSheep	f5f1ddc0ea	✨ Steam connection	2025-11-04 23:53:17 +08:00
LittleSheep	2720b59485	🐛 Fix protocol handling	2025-11-04 23:25:37 +08:00
LittleSheep	29b1ac7fce	🐛 Fix tray icon didn't change color on macOS 26 automatically	2025-11-04 23:22:35 +08:00
LittleSheep	83ca5551ad	♻️ Refactored the app protocol	2025-11-04 23:08:21 +08:00
LittleSheep	611cb024a9	🔨 Update windows version code	2025-11-03 00:20:24 +08:00
LittleSheep	74fb56891d	🐛 Fix web build	2025-11-03 00:12:02 +08:00
LittleSheep	ac4fa5eb85	🚀 Launch 3.3.0+144	2025-11-02 23:57:31 +08:00
LittleSheep	8857718709	🐛 Fix compose toolbar safe area issue	2025-11-02 23:56:48 +08:00
LittleSheep	dd17b2b9c1	✨ Scroll gradiant to think as well	2025-11-02 23:55:00 +08:00
LittleSheep	848439f664	✨ Chat room scroll gradiant	2025-11-02 23:52:03 +08:00
LittleSheep	f83117424d	🐛 Fix tag subscribe used wrong icon	2025-11-02 23:44:11 +08:00
LittleSheep	8c19c32c76	✨ Publisher profile collapsible pinned post	2025-11-02 23:36:42 +08:00
LittleSheep	d62b2bed80	💄 Optimize publisher page filter select date	2025-11-02 23:34:08 +08:00
LittleSheep	5a23eb1768	✨ Stronger filter	2025-11-02 23:30:16 +08:00
LittleSheep	5f6e4763d3	🐛 Fix app notification	2025-11-02 23:12:11 +08:00
LittleSheep	580c36fb89	🐛 Fix mis placed safe area	2025-11-02 22:45:28 +08:00
LittleSheep	6c25af3b30	✨ Show publisher mentioned chip as well	2025-11-02 22:44:09 +08:00
LittleSheep	a1da72d447	✨ Show profile picture in mention chip	2025-11-02 22:41:50 +08:00
LittleSheep	ab4120cc22	💄 Optimize cloud file list	2025-11-02 22:34:32 +08:00
LittleSheep	52eff0fa25	🐛 Fix the NSE again...	2025-11-02 22:14:31 +08:00
LittleSheep	beeb28abf2	💄 Optimize in-app notification style	2025-11-02 21:55:42 +08:00
LittleSheep	c0ab3837ac	👽 Make poll load itself to match server updates	2025-11-02 21:47:37 +08:00
LittleSheep	59d38c0d8d	💄 Refined developer hub	2025-11-02 21:19:58 +08:00
LittleSheep	bd2247ce86	♻️ Refactor the app management to use sheet	2025-11-02 21:12:55 +08:00
LittleSheep	da2d3f7f17	♻️ Make bot management into sheet	2025-11-02 21:04:35 +08:00
LittleSheep	7497b77384	💄 Adjusted developer hub	2025-11-02 17:45:03 +08:00
LittleSheep	f542d9fa97	🐛 Fix timezone error	2025-11-02 17:24:18 +08:00
LittleSheep	e70439870e	♻️ Add event bus to more places	2025-11-02 17:13:10 +08:00
LittleSheep	d764b042fe	✨ Shows account own activities on account page	2025-11-02 16:59:58 +08:00
LittleSheep	a76b97d1d2	💄 Shows listening activities are from spotfiy	2025-11-02 16:55:16 +08:00
LittleSheep	cfbe6e580b	👔 Add rpc prefix for activities generated from activity server	2025-11-02 16:50:31 +08:00
LittleSheep	f08b9e057f	✨ Special display for spotify activity	2025-11-02 16:49:39 +08:00
LittleSheep	0509f37c96	♻️ Use system browser for OIDC	2025-11-02 16:32:29 +08:00
LittleSheep	a7dc9ac6fa	✨ Add spotify in account connection	2025-11-02 15:49:44 +08:00
LittleSheep	caf2f5f1f6	💄 Optimize the link embed	2025-11-02 15:43:40 +08:00
LittleSheep	12b79af3a2	🐛 Fix bugs	2025-11-02 02:21:15 +08:00
LittleSheep	88f149584e	♻️ Removed the post compose screen completely	2025-11-02 01:43:04 +08:00
LittleSheep	877001b802	💄 Optimize publisher profile again	2025-11-02 01:36:14 +08:00
LittleSheep	fec28f6223	💄 Optimize publisher page	2025-11-02 01:30:47 +08:00
LittleSheep	85005ff9c3	💄 Optimize profile page	2025-11-02 01:20:14 +08:00
LittleSheep	e3c92a3c55	💄 Optimize profile page styling	2025-11-02 01:05:40 +08:00
LittleSheep	9e9fbc5d6a	💄 Optimize settings buttons	2025-11-02 01:04:10 +08:00
LittleSheep	8d1d836b52	💄 Optimize the account page	2025-11-02 00:51:16 +08:00
LittleSheep	bc60ce5d42	💄 Optimize the pfc and show the activities	2025-11-02 00:25:08 +08:00
LittleSheep	c093123e3a	✨ Shows images, url from presense	2025-11-02 00:03:16 +08:00
LittleSheep	3de73538c7	🐛 Activity refined	2025-11-01 23:36:05 +08:00
LittleSheep	ba8d5cee09	✨ Refined presense activity	2025-11-01 21:47:34 +08:00
LittleSheep	5ee2e70442	✨ New activity presence	2025-11-01 20:16:54 +08:00
LittleSheep	53a3a32907	🚀 Launch 3.3.0+143 (SNAPSHOT) (HOTFIX)	2025-11-01 15:59:16 +08:00
				`@@ -0,0 +1 @@`
				<svg width="2471" height="2500" viewBox="0 0 256 259" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M127.779 0C60.42 0 5.24 52.412 0 119.014l68.724 28.674a35.812 35.812 0 0 1 20.426-6.366c.682 0 1.356.019 2.02.056l30.566-44.71v-.626c0-26.903 21.69-48.796 48.353-48.796 26.662 0 48.352 21.893 48.352 48.796 0 26.902-21.69 48.804-48.352 48.804-.37 0-.73-.009-1.098-.018l-43.593 31.377c.028.582.046 1.163.046 1.735 0 20.204-16.283 36.636-36.294 36.636-17.566 0-32.263-12.658-35.584-29.412L4.41 164.654c15.223 54.313 64.673 94.132 123.369 94.132 70.818 0 128.221-57.938 128.221-129.393C256 57.93 198.597 0 127.779 0zM80.352 196.332l-15.749-6.568c2.787 5.867 7.621 10.775 14.033 13.47 13.857 5.83 29.836-.803 35.612-14.799a27.555 27.555 0 0 0 .046-21.035c-2.768-6.79-7.999-12.086-14.706-14.909-6.67-2.795-13.811-2.694-20.085-.304l16.275 6.79c10.222 4.3 15.056 16.145 10.794 26.46-4.253 10.314-15.998 15.195-26.22 10.895zm121.957-100.29c0-17.925-14.457-32.52-32.217-32.52-17.769 0-32.226 14.595-32.226 32.52 0 17.926 14.457 32.512 32.226 32.512 17.76 0 32.217-14.586 32.217-32.512zm-56.37-.055c0-13.488 10.84-24.42 24.2-24.42 13.368 0 24.208 10.932 24.208 24.42 0 13.488-10.84 24.421-24.209 24.421-13.359 0-24.2-10.933-24.2-24.42z" fill="#1A1918"/></svg>