chore: remediate CI blockers for production readiness

apps/web/components/subscription/__tests__/checkout-modal.spec.tsx

@@ -132,6 +132,32 @@ describe('CheckoutModal', () => {
           provider: 'VNPAY',
           type: 'SUBSCRIPTION',
           amountVND: 499000,
+          returnUrl: 'http://localhost:3000/vi/payment/return',
+        }),
+      );
+    });
+  });
+
+  it('uses the locale root payment return route from dashboard checkout', async () => {
+    Object.defineProperty(window, 'location', {
+      writable: true,
+      value: {
+        ...window.location,
+        href: 'http://localhost:3000/vi/dashboard/subscription',
+        origin: 'http://localhost:3000',
+        pathname: '/vi/dashboard/subscription',
+      },
+    });
+
+    render(
+      <CheckoutModal open={true} onOpenChange={onOpenChange} plan={basePlan} billingCycle="monthly" />,
+    );
+    await userEvent.click(screen.getByRole('button', { name: /thanh toán/i }));
+
+    await waitFor(() => {
+      expect(mockCreatePayment).toHaveBeenCalledWith(
+        expect.objectContaining({
+          returnUrl: 'http://localhost:3000/vi/payment/return',
         }),
       );
     });

apps/web/components/subscription/checkout-modal.tsx

@@ -120,7 +120,9 @@ function CheckoutModalInner({
       }
 
       // Step 2: Create payment and redirect to gateway
-      const returnUrl = `${window.location.origin}${window.location.pathname.replace(/\/pricing$/, '')}/payment/return`;
+      const localeMatch = window.location.pathname.match(/^\/(vi|en)(\/|$)/);
+      const localePrefix = localeMatch?.[1] ? `/${localeMatch[1]}` : '';
+      const returnUrl = `${window.location.origin}${localePrefix}/payment/return`;
 
       const idempotencyKey = `sub-${plan.tier}-${billingCycle}-${Date.now()}`;