Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

small fixes

Steven Teyc9bb0b637413
diff --git a/apps/web/lib/middleware/app.ts b/apps/web/lib/middleware/app.ts
index 8f45190410..db333bbdc4 100644
--- a/apps/web/lib/middleware/app.ts
+++ b/apps/web/lib/middleware/app.ts
@@ -91,15 +91,18 @@ export async function AppMiddleware(req: NextRequest) {
"/links",
"/analytics",
"/events",
- "/customers",
- "/program",
- "/programs",
- "/settings",
"/upgrade",
"/guides",
"/wrapped",
+ "/programs",
+ // here we have separate logic for the root paths instead of path.startsWith("/program")
+ // because some workspace slugs are program-something which will break
+ "/program",
+ "/customers",
+ "/settings",
].includes(path) ||
path.startsWith("/program/") ||
+ path.startsWith("/customers/") ||
path.startsWith("/settings/") ||
isTopLevelSettingsRedirect(path)
) {
diff --git a/apps/web/lib/payouts/recompute-partner-payout-state.ts b/apps/web/lib/payouts/recompute-partner-payout-state.ts
index 0678fadb77..0e597e6561 100644
--- a/apps/web/lib/payouts/recompute-partner-payout-state.ts
+++ b/apps/web/lib/payouts/recompute-partner-payout-state.ts
@@ -78,7 +78,12 @@ export async function recomputePartnerPayoutState(
let payoutsEnabledAt: Date | null = null;
if (defaultPayoutMethod) {
- payoutsEnabledAt = partner.payoutsEnabledAt ?? new Date();
+ // if default payout method has changed, set payoutsEnabledAt to today
+ // otherwise, use the existing payoutsEnabledAt (or today if null)
+ payoutsEnabledAt =
+ defaultPayoutMethod !== partner.defaultPayoutMethod
+ ? new Date()
+ : partner.payoutsEnabledAt ?? new Date();
} else {
payoutsEnabledAt = null;
}
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index 177e1c9c6b..460a05c9f0 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -509,9 +509,9 @@ export function AppSidebarNav({
pathname.includes("/program/messages/") ||
pathname.endsWith("/program/payouts/success")
? null
- : pathname.startsWith(`/${slug}/links`)
- ? "links"
- : "program";
+ : pathname.startsWith(`/${slug}/program`)
+ ? "program"
+ : "links";
}, [slug, pathname]);
const { program } = useProgram({
diff --git a/apps/web/ui/modals/switch-trial-plan-modal.tsx b/apps/web/ui/modals/switch-trial-plan-modal.tsx
index f3eafdb421..2d6f3aee2b 100644
--- a/apps/web/ui/modals/switch-trial-plan-modal.tsx
+++ b/apps/web/ui/modals/switch-trial-plan-modal.tsx
@@ -200,8 +200,8 @@ function SwitchTrialPlanModal({
setIsSubmitting(true);
try {
await onConfirm();
- } finally {
setShowModal(false);
+ } finally {
setIsSubmitting(false);
}
}}