fix merge conflict

XLabs · Mar 18, 2024 · a7af8a1 · a7af8a1
2 parents 518604d + 396d072
commit a7af8a1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -26,7 +26,7 @@ jobs:
       connect-branch: development
       advanced-tools-branch: advanced-tools
       environment: Cloudflare-Preview
-      public-url: ""
+      public-url: "/${{ needs.branch-sha.outputs.value }}"
       wac-url: "https://wac.gfx.xyz"
       project-branch: ${{ github.event.pull_request.head.ref }}
       app-domain: preview.portalbridge.com

diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml
@@ -26,7 +26,7 @@ jobs:
       connect-branch: development
       advanced-tools-branch: advanced-tools
       environment: Cloudflare-Testnet
-      public-url: ""
+      public-url: "/${{ needs.branch-sha.outputs.value }}"
       project-branch: ${{ github.event.pull_request.head.ref }}
       app-domain: testnet.portalbridge.com
     secrets: inherit

diff --git a/apps/connect/src/components/ConnectLoader.tsx b/apps/connect/src/components/ConnectLoader.tsx
@@ -23,7 +23,7 @@ export default function ConnectLoader({ config }: WormholeLoaderProps) {
 
   useEffect(() => {
     const script = document.createElement("script");
-    // script.src = `assets/wormhole-connect/main.js?id=${VITE_APP_JS_WC_INTEGRITY_SHA_384}`;
+    // script.src = `assets/wormhole-connect/main.js`;
     script.type = "module";
     /*if (VITE_APP_JS_WC_INTEGRITY_SHA_384) {
       script.integrity = `sha384-${VITE_APP_JS_WC_INTEGRITY_SHA_384}`;