From 3ce14d49281fe6c8d48e5d4ae01f933f48ecfac8 Mon Sep 17 00:00:00 2001
From: Brandon Li <brandon.seno.li@gmail.com>
Date: Mon, 31 Aug 2026 23:04:48 -0500
Subject: [PATCH] Sink firms with no login to the bottom, and name the account
 type plainly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A firm with no stored Tradovate login can do nothing until someone enters
one, so it no longer interleaves by name with the firms that are actually
running. Sorted at render rather than in /api/firms, which keeps serving the
catalog in the master's own order. Name order is preserved within each group.

The account-type picker showed "Auto — Flex 50k Funded", which put the
mechanism before the answer in the one place the answer is what you are
reading. It shows the type's name now, or Unassigned when nothing matched.
That first entry still clears a manual pin; the dot beside the select is what
says a pin is in effect.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 app/accounts/[id]/page.tsx |  2 +-
 app/page.tsx               | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/accounts/[id]/page.tsx b/app/accounts/[id]/page.tsx
index 3e0d5c5..13601f3 100644
--- a/app/accounts/[id]/page.tsx
+++ b/app/accounts/[id]/page.tsx
@@ -53,7 +53,7 @@ function AccountTypePicker({ account, firm, onAssigned }: {
                 className="border border-slate-200 rounded-md px-1.5 py-1 text-xs bg-white text-slate-700 focus:outline-none focus:ring-1 focus:ring-blue-400"
             >
                 <option value="">
-                    {account.accountTypeLabel ? `Auto — ${account.accountTypeLabel}` : 'Auto — unassigned'}
+                    {account.accountTypeLabel ?? 'Unassigned'}
                 </option>
                 {firm.accounts.map((type) => (
                     <option key={type.id} value={type.id}>
diff --git a/app/page.tsx b/app/page.tsx
index 3b02cfc..1bd7ad5 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -159,7 +159,7 @@ function AccountTypeCell({ account, firm, onAssigned }: {
                 }`}
             >
                 <option value="">
-                    {account.accountTypeLabel ? `Auto — ${account.accountTypeLabel}` : 'Auto — unassigned'}
+                    {account.accountTypeLabel ?? 'Unassigned'}
                 </option>
                 {firm.accounts.map((type) => (
                     <option key={type.id} value={type.id}>
@@ -604,6 +604,12 @@ export default function Home() {
         }
     };
 
+    // A firm with no stored login can do nothing until someone enters one, so it
+    // sits below the ones that are actually running rather than interleaving by
+    // name. Within each group, catalog order (by name) is preserved.
+    const orderedConfig = [...config].sort((a, b) =>
+        Number(b.hasCredentials) - Number(a.hasCredentials) || a.firm.localeCompare(b.firm));
+
     // Count dead accounts across all firms for the toggle button label
     const deadCount = firms.reduce((total, firmState) => {
         const firmCfg = config.find((c) => c.id === firmState.firmId);
@@ -798,7 +804,7 @@ export default function Home() {
                                     </td>
                                 </tr>
                             ) : (
-                                config.map((cfg) => {
+                                orderedConfig.map((cfg) => {
                                     const state = firms.find((f) => f.firmId === cfg.id)
                                         ?? { firmId: cfg.id, firm: cfg.firm, connected: false, accounts: [] };
                                     return (