fix: show user subscription speed override

2026-06-11 02:39:16 -07:00
parent 09c5216f60
commit 64fe23f877
4 changed files with 32 additions and 6 deletions
@@ -54,6 +54,10 @@ function toUserSubscribePayload(values: SubscriptionFormValues) {
  };
 }

+function resolvePlanSpeed(row: API.UserSubscribe) {
+  return row.plan_speed_limit ?? row.subscribe?.speed_limit ?? 0;
+}
+
 export default function UserSubscription({ userId }: { userId: number }) {
  const { t } = useTranslation("user");
  const [loading, setLoading] = useState(false);
@@ -315,10 +319,11 @@ export default function UserSubscription({ userId }: { userId: number }) {
            cell: ({ row }) => {
              const userSpeed = row.original.speed_limit ?? 0;
              const effectiveSpeed = row.original.effective_speed ?? 0;
-              const planSpeed = row.original.subscribe?.speed_limit ?? 0;
+              const planSpeed = resolvePlanSpeed(row.original);
              const speed = effectiveSpeed || userSpeed || planSpeed;
-              const source =
-                userSpeed > 0
+              const source = row.original.is_throttled
+                ? t("effectiveSpeed", "Effective Speed")
+                : userSpeed > 0
                  ? t("userOverride", "User Override")
                  : t("subscriptionDefault", "Subscription Default");

@@ -335,6 +340,16 @@ export default function UserSubscription({ userId }: { userId: number }) {
                  <span className="text-muted-foreground text-xs">
                    {source}
                  </span>
+                  <span className="text-muted-foreground text-xs">
+                    {t("userOverride", "User Override")}:{" "}
+                    <span className="inline-block">
+                      <Display type="trafficSpeed" value={userSpeed} />
+                    </span>{" "}
+                    / {t("subscriptionDefault", "Subscription Default")}:{" "}
+                    <span className="inline-block">
+                      <Display type="trafficSpeed" value={planSpeed} />
+                    </span>
+                  </span>
                </div>
              );
            },