Merge remote-tracking branch 'origin/main' into feat/pay-v2-integration

# Conflicts:
#	docs/index.html
#	server/cmd/server/main.go

client/lib/screens/account_page.dart

@@ -99,7 +99,7 @@ class AccountPage extends ConsumerWidget {
           _CustomRow(
             icon: PangolinIcons.globe,
             title: t.language,
-            trailing: _LangSwitch(lang: lang, onChange: (l) => ref.read(localeProvider.notifier).state = l),
+            trailing: _LangSwitch(lang: lang, onChange: (l) => ref.read(localeProvider.notifier).set(l)),
           ),
           Divider(height: 1, color: c.border),
           _CustomRow(
@@ -375,31 +375,37 @@ class _LangSwitch extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final c = context.pangolin;
-    Widget seg(AppLang v, String label) {
-      final active = lang == v;
-      return GestureDetector(
-        onTap: () => onChange(v),
-        child: Container(
-          padding: const EdgeInsets.symmetric(horizontal: 13, vertical: 5),
-          decoration: BoxDecoration(
-            color: active ? c.accent : Colors.transparent,
-            borderRadius: BorderRadius.circular(PangolinRadius.full),
+    // 6 种语言用下拉(段控横排会挤)。
+    return PopupMenuButton<AppLang>(
+      initialValue: lang,
+      onSelected: onChange,
+      color: c.surface,
+      elevation: 8,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(PangolinRadius.md)),
+      itemBuilder: (_) => [
+        for (final l in AppLang.values)
+          PopupMenuItem<AppLang>(
+            value: l,
+            height: 42,
+            child: Text(l.nativeLabel,
+                style: PangolinText.caption.copyWith(
+                    color: l == lang ? c.accent : c.fg1,
+                    fontWeight: l == lang ? FontWeight.w700 : FontWeight.w500,
+                    fontSize: 13)),
           ),
-          child: Text(label,
-              style: PangolinText.caption.copyWith(
-                  color: active ? c.fgOnAccent : c.fg3, fontWeight: FontWeight.w700, fontSize: 12.5)),
-        ),
-      );
-    }
-
-    return Container(
-      padding: const EdgeInsets.all(3),
-      decoration: BoxDecoration(color: c.bgSubtle, borderRadius: BorderRadius.circular(PangolinRadius.full)),
-      child: Row(mainAxisSize: MainAxisSize.min, children: [
-        seg(AppLang.zh, '中文'),
-        const SizedBox(width: 2),
-        seg(AppLang.en, 'EN'),
-      ]),
+      ],
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 13, vertical: 6),
+        decoration:
+            BoxDecoration(color: c.bgSubtle, borderRadius: BorderRadius.circular(PangolinRadius.full)),
+        child: Row(mainAxisSize: MainAxisSize.min, children: [
+          Text(lang.nativeLabel,
+              style: PangolinText.caption
+                  .copyWith(color: c.fg2, fontWeight: FontWeight.w700, fontSize: 12.5)),
+          const SizedBox(width: 4),
+          Icon(PangolinIcons.chevronDown, size: 14, color: c.fg3),
+        ]),
+      ),
     );
   }
 }