From 22e071f822eaedd9a7bea09b136d1bd8a77b108c Mon Sep 17 00:00:00 2001
From: Sasha Goloshchapov <ferrata@hey.com>
Date: Fri, 26 Sep 2025 13:15:16 -0500
Subject: [PATCH] fix: ReactRuntimeProvider now respects NEXT_PUBLIC_MAKESWIFT
 vars

---
 .changeset/brave-snakes-dress.md | 5 +++++
 core/lib/makeswift/provider.tsx  | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/brave-snakes-dress.md

diff --git a/.changeset/brave-snakes-dress.md b/.changeset/brave-snakes-dress.md
new file mode 100644
index 0000000000..46dbb0f030
--- /dev/null
+++ b/.changeset/brave-snakes-dress.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-makeswift": patch
+---
+
+Fix ReactRuntimeProvider so it respects NEXT_PUBLIC_MAKESWIFT vars
diff --git a/core/lib/makeswift/provider.tsx b/core/lib/makeswift/provider.tsx
index a87e511e29..8377ff9443 100644
--- a/core/lib/makeswift/provider.tsx
+++ b/core/lib/makeswift/provider.tsx
@@ -13,7 +13,12 @@ export function MakeswiftProvider({
   siteVersion: SiteVersion | null;
 }) {
   return (
-    <ReactRuntimeProvider runtime={runtime} siteVersion={siteVersion}>
+    <ReactRuntimeProvider
+      apiOrigin={process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN}
+      appOrigin={process.env.NEXT_PUBLIC_MAKESWIFT_APP_ORIGIN}
+      runtime={runtime}
+      siteVersion={siteVersion}
+    >
       <RootStyleRegistry enableCssReset={false}>{children}</RootStyleRegistry>
     </ReactRuntimeProvider>
   );