From 43fee155873ebc3441cecf636ffdd6748333fd29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kvasnic=CC=8Ca=CC=81k?=
 <michal.kvasnicak@gmail.com>
Date: Tue, 28 Jan 2025 08:25:19 +0100
Subject: [PATCH 1/2] fix: pass original frame app url to view

---
 .changeset/slow-pigs-hug.md               |  5 +++++
 packages/render/src/frame-app/iframe.ts   | 12 +-----------
 packages/render/src/frame-app/web-view.ts | 12 +-----------
 packages/render/src/use-frame-app.ts      | 23 +++++++++++++++++++++++
 4 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 .changeset/slow-pigs-hug.md

diff --git a/.changeset/slow-pigs-hug.md b/.changeset/slow-pigs-hug.md
new file mode 100644
index 000000000..48e1833b2
--- /dev/null
+++ b/.changeset/slow-pigs-hug.md
@@ -0,0 +1,5 @@
+---
+"@frames.js/render": patch
+---
+
+fix: pass original frame app source url to view
diff --git a/packages/render/src/frame-app/iframe.ts b/packages/render/src/frame-app/iframe.ts
index 5060c1e4e..4cf2d68fd 100644
--- a/packages/render/src/frame-app/iframe.ts
+++ b/packages/render/src/frame-app/iframe.ts
@@ -105,17 +105,7 @@ export function useFrameAppInIframe(
       case "pending":
         return frameApp;
       case "success": {
-        const frameUrl = frameApp.frame.frame.button?.action?.url;
-
-        if (!frameUrl) {
-          return {
-            status: "error",
-            error: new Error(
-              "Frame URL is not provided, please check button.action.url"
-            ),
-          };
-        }
-
+        const frameUrl = frameApp.frameUrl.toString();
         const frameOrigin = new URL(frameUrl).origin;
 
         return {
diff --git a/packages/render/src/frame-app/web-view.ts b/packages/render/src/frame-app/web-view.ts
index 46e1ce79e..9ef7c9723 100644
--- a/packages/render/src/frame-app/web-view.ts
+++ b/packages/render/src/frame-app/web-view.ts
@@ -120,17 +120,7 @@ export function useFrameAppInWebView(
       case "pending":
         return frameApp;
       case "success": {
-        const frame = frameApp.frame.frame;
-        const frameUrl = frame.button?.action?.url;
-
-        if (!frameUrl) {
-          return {
-            status: "error",
-            error: new Error(
-              "Frame URL is not provided, please check button.action.url"
-            ),
-          };
-        }
+        const frameUrl = frameApp.frameUrl.toString();
 
         return {
           ...frameApp,
diff --git a/packages/render/src/use-frame-app.ts b/packages/render/src/use-frame-app.ts
index a5e7c7cac..7d50effce 100644
--- a/packages/render/src/use-frame-app.ts
+++ b/packages/render/src/use-frame-app.ts
@@ -205,6 +205,12 @@ export type UseFrameAppReturn =
   | {
       frame: ParseFramesV2ResultWithFrameworkDetails;
       client: FrameClientConfig;
+      /**
+       * Url that has been used to fetch the frame app.
+       *
+       * If the source was set to parse result object, this will contain url of the frame from manifest.
+       */
+      frameUrl: URL;
       status: "success";
       /**
        * Creates sdk that must be exposed to frame app endpoint
@@ -302,6 +308,22 @@ export function useFrameApp({
     switch (frameResolutionState.status) {
       case "success": {
         const frame = frameResolutionState.frame;
+        let frameUrl: URL;
+
+        if (frameResolutionState.source instanceof URL) {
+          frameUrl = frameResolutionState.source;
+        } else if (typeof frameResolutionState.source === "string") {
+          frameUrl = new URL(frameResolutionState.source);
+        } else if (frame.frame.button?.action?.url) {
+          frameUrl = new URL(frame.frame.button.action.url);
+        } else {
+          return {
+            status: "error",
+            error: new Error(
+              "Frame URL is not provided, please check button.action.url"
+            ),
+          };
+        }
 
         return {
           getEmitter: (endpoint) => ({
@@ -416,6 +438,7 @@ export function useFrameApp({
           }),
           status: "success",
           frame: frameResolutionState.frame,
+          frameUrl,
           client: clientResolutionState.client,
         };
       }

From 9b94b47e20b5443aea897e991bc4602d058ac78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kvasnic=CC=8Ca=CC=81k?=
 <michal.kvasnicak@gmail.com>
Date: Tue, 28 Jan 2025 08:30:43 +0100
Subject: [PATCH 2/2] chore: fix comment

---
 packages/render/src/use-frame-app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/render/src/use-frame-app.ts b/packages/render/src/use-frame-app.ts
index 7d50effce..eb8ff01c7 100644
--- a/packages/render/src/use-frame-app.ts
+++ b/packages/render/src/use-frame-app.ts
@@ -208,7 +208,7 @@ export type UseFrameAppReturn =
       /**
        * Url that has been used to fetch the frame app.
        *
-       * If the source was set to parse result object, this will contain url of the frame from manifest.
+       * If the source was set to parse result object, this will contain url of the frame's button action definition.
        */
       frameUrl: URL;
       status: "success";