fix(webapp): address review feedback on promo credits

- getPromoCredits returns undefined (not null) on failure so SWR does not
  cache a transient error as "no credits" for the stale TTL
- setPlan always returns a Response (no implicit undefined fall-through)
- prefix unused catch bindings with _ to satisfy no-unused-vars
- drop unused billing-limit schema imports
- clarify the changelog wording (redeemed at plan selection)

Author: matt-aitken

.server-changes/promo-credits.md

@@ -3,4 +3,4 @@ area: webapp
 type: feature
 ---
 
-Promo credits: a /promo signup landing page, applying a promo code when an org is created, and showing remaining credits on the usage page.
+Promo credits: a /promo signup landing page, redeeming a promo code when a new org selects a plan, and showing remaining credits on the usage page.

apps/webapp/app/services/platform.v3.server.ts

@@ -22,8 +22,6 @@ import {
   BillingLimitsActiveResultSchema,
   BillingLimitsPendingResolvesResultSchema,
   EntitlementResultSchema,
-  ResolveBillingLimitRequestSchema,
-  UpdateBillingLimitRequestSchema,
   asPlatformSchema,
   type BillingLimitResult,
   type BillingLimitsActiveResult,
@@ -352,7 +350,7 @@ export async function getCurrentPlan(orgId: string) {
     };
 
     return { ...result, usage };
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getCurrentPlan", "caught");
     return undefined;
   }
@@ -393,7 +391,7 @@ export async function getLimits(orgId: string) {
     }
 
     return result.v3Subscription?.plan?.limits;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getLimits", "caught");
     return undefined;
   }
@@ -469,7 +467,7 @@ export async function customerPortalUrl(orgId: string, orgSlug: string) {
     return client.createPortalSession(orgId, {
       returnUrl: `${env.APP_ORIGIN}${organizationBillingPath({ slug: orgSlug })}`,
     });
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("customerPortalUrl", "caught");
     return undefined;
   }
@@ -485,7 +483,7 @@ export async function getPlans() {
       return undefined;
     }
     return result;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getPlans", "caught");
     return undefined;
   }
@@ -544,6 +542,12 @@ export async function setPlan(
       return redirectWithSuccessMessage(callerPath, request, "Subscription canceled.");
     }
   }
+
+  // Unrecognised action shape — surface an error rather than falling through to
+  // an implicit undefined return, so callers always get a Response back.
+  return redirectWithErrorMessage(callerPath, request, "Error setting plan", {
+    ephemeral: false,
+  });
 }
 
 export async function setConcurrencyAddOn(organizationId: string, amount: number) {
@@ -556,7 +560,7 @@ export async function setConcurrencyAddOn(organizationId: string, amount: number
       return undefined;
     }
     return result;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("setConcurrencyAddOn", "caught");
     return undefined;
   }
@@ -572,7 +576,7 @@ export async function setSeatsAddOn(organizationId: string, amount: number) {
       return undefined;
     }
     return result;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("setSeatsAddOn", "caught");
     return undefined;
   }
@@ -588,7 +592,7 @@ export async function setBranchesAddOn(organizationId: string, amount: number) {
       return undefined;
     }
     return result;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("setBranchesAddOn", "caught");
     return undefined;
   }
@@ -604,7 +608,7 @@ export async function setSchedulesAddOn(organizationId: string, amount: number)
       return undefined;
     }
     return result;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("setSchedulesAddOn", "caught");
     return undefined;
   }
@@ -620,7 +624,7 @@ export async function getUsage(organizationId: string, { from, to }: { from: Dat
       return undefined;
     }
     return result;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getUsage", "caught");
     return undefined;
   }
@@ -643,7 +647,7 @@ export async function getCachedUsage(
     );
 
     return result.val;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getCachedUsage", "caught");
     return undefined;
   }
@@ -659,7 +663,7 @@ export async function getUsageSeries(organizationId: string, params: UsageSeries
       return undefined;
     }
     return result;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getUsageSeries", "caught");
     return undefined;
   }
@@ -683,7 +687,7 @@ export async function reportInvocationUsage(
       return undefined;
     }
     return result;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("reportInvocationUsage", "caught");
     return undefined;
   }
@@ -722,7 +726,7 @@ export async function getEntitlement(
         return undefined;
       }
       return response;
-    } catch (e) {
+    } catch (_e) {
       recordPlatformFailure("getEntitlement", "caught");
       return undefined;
     }
@@ -757,13 +761,16 @@ export async function getPromoCredits(organizationId: string): Promise<PromoCred
       const response = await client.promoCredits(organizationId);
       if (!response.success) {
         recordPlatformFailure("promoCredits", "no_success");
-        return null;
+        // Return undefined (not null) so SWR doesn't cache a transient failure
+        // as "no credits" and hide the display for the stale TTL. null is
+        // reserved for a successful "org has no promo credits" response.
+        return undefined;
       }
       return response.promoCredits;
-    } catch (e) {
+    } catch (_e) {
       recordPlatformFailure("promoCredits", "caught");
-      logger.error("promoCredits threw", { error: e });
-      return null;
+      logger.error("promoCredits threw", { error: _e });
+      return undefined;
     }
   });
 
@@ -792,7 +799,7 @@ export async function getBillingLimit(
           return undefined;
         }
         return response;
-      } catch (e) {
+      } catch (_e) {
         recordPlatformFailure("getBillingLimit", "caught");
         return undefined;
       }
@@ -803,7 +810,7 @@ export async function getBillingLimit(
     }
 
     return result.val;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getBillingLimit", "caught");
     return undefined;
   }
@@ -877,7 +884,7 @@ export async function getActiveBillingLimits(): Promise<BillingLimitsActiveResul
       return undefined;
     }
     return response;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getActiveBillingLimits", "caught");
     return undefined;
   }
@@ -899,7 +906,7 @@ export async function getPendingBillingLimitResolves(): Promise<
       return undefined;
     }
     return response;
-  } catch (e) {
+  } catch (_e) {
     recordPlatformFailure("getPendingBillingLimitResolves", "caught");
     return undefined;
   }