Merge branch 'payments-fix.staging' into release-05-12-25.staging

Author: kof

apps/builder/app/dashboard/profile-menu.tsx

@@ -87,9 +87,11 @@ export const ProfileMenu = ({
           purchase.subscriptionId ? (
             <DropdownMenuItem
               key={purchase.subscriptionId}
-              onSelect={() =>
-                navigate(userPlanSubscriptionPath(purchase.subscriptionId))
-              }
+              onSelect={() => {
+                window.location.href = userPlanSubscriptionPath(
+                  purchase.subscriptionId
+                );
+              }}
             >
               {purchase.planName}
             </DropdownMenuItem>

apps/builder/app/env/env.server.ts

@@ -54,9 +54,6 @@ const env = {
   N8N_WEBHOOK_URL: process.env.N8N_WEBHOOK_URL,
   N8N_WEBHOOK_TOKEN: process.env.N8N_WEBHOOK_TOKEN,
 
-  PAYMENT_WORKER_URL: process.env.PAYMENT_WORKER_URL,
-  PAYMENT_WORKER_TOKEN: process.env.PAYMENT_WORKER_TOKEN,
-
   PUBLISHER_HOST: process.env.PUBLISHER_HOST || "wstd.work",
 
   STAGING_USERNAME: process.env.STAGING_USERNAME ?? "admin",

apps/builder/app/routes/payments.$.tsx

@@ -117,7 +117,7 @@ export const userPlanSubscriptionPath = (subscriptionId?: string) => {
   }
 
   if (isFeatureEnabled("paymentWorker")) {
-    return `/payments/billing-portal/sessions?${urlSearchParams.toString()}`;
+    return `/builder-payments/billing-portal/sessions?${urlSearchParams.toString()}`;
   }
 
   return `/n8n/billing_portal/sessions?${urlSearchParams.toString()}`;