diff --git a/assets/i18n/en-US.json b/assets/i18n/en-US.json
index c63a559..e076c0b 100644
--- a/assets/i18n/en-US.json
+++ b/assets/i18n/en-US.json
@@ -156,6 +156,7 @@
   "accountConnectionProviderGoogle": "Google",
   "accountConnectionProviderGithub": "GitHub",
   "accountConnectionProviderDiscord": "Discord",
+  "accountConnectionProviderAfdian": "Afdian",
   "checkIn": "Check In",
   "checkInNone": "Not checked-in yet",
   "checkInNoneHint": "Get your fortune tips and daily rewards by checking in.",
diff --git a/assets/images/oidc/afdian.svg b/assets/images/oidc/afdian.svg
new file mode 100644
index 0000000..74bc715
--- /dev/null
+++ b/assets/images/oidc/afdian.svg
@@ -0,0 +1,10 @@
+  <svg
+    viewBox="0 0 160 160"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      d="M134.614 98.3714C133.294 97.5334 131.909 97.1697 130.563 97.02C133.724 89.3002 135.736 79.1949 128.887 69.1574C118.406 53.7998 103.38 45.8198 84.2346 45.4382C78.7809 45.3312 72.3517 45.5844 65.5487 45.8554C57.6493 46.1692 47.1369 46.5793 39.9921 45.9873C41.4161 45.2136 42.9326 44.4719 44.2462 43.8336C49.2728 41.384 53.2314 39.4763 51.9214 36.0925C51.2343 34.117 49.1874 33.0794 45.8233 33.0045C38.7426 32.8441 23.4421 36.9447 20.6903 43.8586C19.1418 47.7524 18.8854 55.2689 34.5668 61.9119C41.0174 64.6503 59.237 67.9879 66.2678 68.6867C68.2542 68.8793 69.7743 69.2822 70.9277 69.7101C69.3151 70.7727 67.6597 71.8888 65.9972 73.0298C63.1102 71.3824 58.3897 69.4391 54.8654 71.846C53.502 72.7695 52.7259 74.1316 52.6903 75.6827C52.6405 77.6117 53.8081 79.498 55.1217 81.017C49.9314 85.1639 45.7343 89.1825 44.2462 92.2811C42.5873 96.0893 41.9109 102.322 45.008 108.402C48.9382 116.118 57.6279 121.499 70.8423 124.394C88.1114 128.17 103.027 124.768 112.895 119.566C118.388 116.671 122.286 113.215 124.18 110.131C124.768 110.317 125.355 110.506 125.96 110.695C126.804 110.951 127.648 111.208 128.438 111.49C131.051 112.395 133.942 112.274 136.167 111.151C136.206 111.133 136.248 111.108 136.291 111.087C137.968 110.202 139.175 108.783 139.705 107.072C141.129 102.458 137.064 99.9082 134.614 98.3714ZM64.9999 90.6681C63.4307 90.6681 62.1621 91.9382 62.1621 93.5091C62.1621 95.0836 63.4307 96.3537 64.9999 96.3537C66.5691 96.3537 67.8378 95.0836 67.8378 93.5091C67.8378 91.9382 66.5691 90.6681 64.9999 90.6681ZM91.7568 99.1965C90.1876 99.1965 88.9189 100.467 88.9189 102.038C88.9189 103.612 90.1876 104.882 91.7568 104.882C93.326 104.882 94.5946 103.612 94.5946 102.038C94.5946 100.467 93.326 99.1965 91.7568 99.1965Z"
+      fill="currentColor"
+    />
+  </svg>
\ No newline at end of file
diff --git a/lib/screens/account/me/settings_connections.dart b/lib/screens/account/me/settings_connections.dart
index 0605837..c85b5a2 100644
--- a/lib/screens/account/me/settings_connections.dart
+++ b/lib/screens/account/me/settings_connections.dart
@@ -28,6 +28,7 @@ Widget getProviderIcon(String provider, {double size = 24, Color? color}) {
     case 'google':
     case 'github':
     case 'discord':
+    case 'afdian':
       return SvgPicture.asset(
         'assets/images/oidc/$providerLower.svg',
         width: size,
@@ -51,6 +52,8 @@ String getLocalizedProviderName(String provider) {
       return 'accountConnectionProviderGithub'.tr();
     case 'discord':
       return 'accountConnectionProviderDiscord'.tr();
+    case 'afdian':
+      return 'accountConnectionProviderAfdian'.tr();
     default:
       return provider;
   }
@@ -141,7 +144,14 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
     final selectedProvider = useState<String>('apple');
 
     // List of available providers
-    final providers = ['apple', 'microsoft', 'google', 'github', 'discord'];
+    final providers = [
+      'apple',
+      'microsoft',
+      'google',
+      'github',
+      'discord',
+      'afdian',
+    ];
 
     Future<void> addConnection() async {
       final client = ref.watch(apiClientProvider);
@@ -182,7 +192,8 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
         case 'google':
         case 'github':
         case 'discord':
-          await Navigator.of(context).push(
+        case 'afdian':
+          await Navigator.of(context, rootNavigator: true).push(
             MaterialPageRoute(
               builder:
                   (context) => OidcScreen(
diff --git a/lib/screens/auth/login.dart b/lib/screens/auth/login.dart
index e045d4a..21d23d9 100644
--- a/lib/screens/auth/login.dart
+++ b/lib/screens/auth/login.dart
@@ -652,7 +652,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
     }
 
     Future<void> withOidc(String provider) async {
-      final challengeId = await Navigator.of(context).push(
+      final challengeId = await Navigator.of(context, rootNavigator: true).push(
         MaterialPageRoute(
           builder: (context) => OidcScreen(provider: provider.toLowerCase()),
         ),
diff --git a/lib/widgets/chat/call_overlay.dart b/lib/widgets/chat/call_overlay.dart
index 8cec63c..552b73d 100644
--- a/lib/widgets/chat/call_overlay.dart
+++ b/lib/widgets/chat/call_overlay.dart
@@ -6,9 +6,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/call.dart';
 import 'package:island/route.gr.dart';
 import 'package:island/widgets/chat/call_participant_tile.dart';
+import 'package:island/widgets/content/sheet.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:livekit_client/livekit_client.dart';
-import '../../widgets/content/sheet.dart';
 
 class CallControlsBar extends HookConsumerWidget {
   const CallControlsBar({super.key});
@@ -150,9 +150,10 @@ class CallControlsBar extends HookConsumerWidget {
         context: context,
         builder: (BuildContext dialogContext) {
           return SheetScaffold(
-            titleText: deviceType == 'videoinput'
-                ? 'selectCamera'.tr()
-                : 'selectMicrophone'.tr(),
+            titleText:
+                deviceType == 'videoinput'
+                    ? 'selectCamera'.tr()
+                    : 'selectMicrophone'.tr(),
             child: ListView.builder(
               itemCount: devices.length,
               itemBuilder: (context, index) {