Fix small bugs

frontend/src/lib/hooks.ts

@@ -30,6 +30,7 @@ import {
   type UpdateRelayInput,
 } from "@/lib/api"
 import { autopayConfigured } from "@/lib/paymentMethod"
+import { decidePostPaidFlow, type PaidFlowDecision } from "@/lib/relayPlanFlow"
 import { account, eventStore, pool } from "@/lib/state"
 import { useNostr } from "@/lib/nostr"
 
@@ -155,6 +156,8 @@ export const useAdminTenant = (pubkey: () => string) => createResource(pubkey, g
 
 export const useAdminTenantRelays = (pubkey: () => string) => createResource(pubkey, listTenantRelays)
 
+export const useAdminTenantInvoices = (pubkey: () => string) => createResource(pubkey, listTenantInvoices)
+
 export const createRelayForActiveTenant = (input: CreateRelayInput) => {
   const defaults = {
     info_name: "",
@@ -199,5 +202,16 @@ export async function getLatestOpenInvoice(): Promise<Invoice | null> {
   return open[0] ?? null
 }
 
+// Resolve what to do after a paid create/upgrade succeeds: a tenant that already
+// has autopay configured just navigates, otherwise we surface the freshly
+// materialized open invoice to pay directly (or fall back to payment setup when
+// none is available). Shared by RelayNew, Home's signup-and-create path, and the
+// plan-upgrade toggle so the post-paid ladder stays identical across all three.
+export async function resolvePostPaidFlow(): Promise<PaidFlowDecision> {
+  const needsSetup = await tenantNeedsPaymentSetup()
+  const invoice = needsSetup ? await getLatestOpenInvoice() : null
+  return decidePostPaidFlow({ needsSetup, invoice })
+}
+
 export type { Activity, Invoice, Relay, Tenant }
 export type { ProfileContent }

frontend/src/lib/useRelayToggles.ts

@@ -1,7 +1,7 @@
 import { createSignal } from "solid-js"
-import { updateRelayById, deactivateRelayById, reactivateRelayById, getLatestOpenInvoice, tenantNeedsPaymentSetup, type Relay } from "@/lib/hooks"
+import { updateRelayById, deactivateRelayById, reactivateRelayById, resolvePostPaidFlow, type Relay } from "@/lib/hooks"
 import { setToastMessage } from "@/lib/state"
-import { applyPlanToRelay, decidePostPaidFlow, planUpdatePayload, toggleField } from "@/lib/relayPlanFlow"
+import { applyPlanToRelay, planUpdatePayload, toggleField } from "@/lib/relayPlanFlow"
 import type { Invoice, PlanId } from "@/lib/api"
 
 type RelayResource = {
@@ -85,12 +85,10 @@ export default function useRelayToggles(
 
     if (plan_id === "free") return
 
-    // Materialize the invoice for this upgrade (no collection, no DM) so we can
-    // prompt the tenant to pay it directly. listTenantInvoices reconciles first,
-    // so a just-created invoice is visible here.
-    const needsSetup = await tenantNeedsPaymentSetup()
-    const invoice = needsSetup ? await getLatestOpenInvoice() : null
-    const decision = decidePostPaidFlow({ needsSetup, invoice })
+    // Paid upgrades materialize an open invoice; resolvePostPaidFlow reconciles
+    // and decides whether to prompt the tenant to pay it, set up a payment method,
+    // or do nothing when autopay is already configured.
+    const decision = await resolvePostPaidFlow()
     switch (decision.kind) {
       case "pay_invoice":
         setPendingInvoice(decision.invoice)