Merge branch 'feat/wormhole-connect-cutover' into feat/hamburguer-menu

XLabs · Nov 27, 2023 · e5a381d · e5a381d
2 parents 667216b + d541bfe
commit e5a381d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -33,6 +33,7 @@ jobs:
  name: "Deploy Preview"
  needs:
  - build
+ - branch-sha
  runs-on: "ubuntu-latest"
  concurrency:
  group: ${{ github.ref }}-deploy-preview
@@ -52,13 +53,13 @@ jobs:
  - name: Trigger a preview Deploy
  run: |
  sleep 30s
- mkdir -p preview/${{ needs.build.outputs.branch-sha }}
- pushd preview/${{ needs.build.outputs.branch-sha }}
+ mkdir -p preview/${{ needs.branch-sha.outputs.value }}
+ pushd preview/${{ needs.branch-sha.outputs.value }}
  [[ ! -f .latest ]] && touch .latest
  [[ ! -f .artifacts ]] && touch .artifacts
  cat .latest >> .artifacts
  echo ${{ needs.build.outputs.pkg-version }} > .latest
  git add .artifacts .latest
  git commit -m"Update preview artifacts ${{ needs.build.outputs.pkg-version }}"
  git push
- echo "The preview URL is: ${{ vars.PREVIEW_ROOT_URL }}/${{ needs.build.outputs.branch-sha }}/" >> ${GITHUB_STEP_SUMMARY}
+ echo "The preview URL is: ${{ vars.PREVIEW_ROOT_URL }}/${{ needs.branch-sha.outputs.value }}/" >> ${GITHUB_STEP_SUMMARY}
diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml
@@ -33,6 +33,7 @@ jobs:
  name: "Deploy Testnet"
  needs:
  - build
+ - branch-sha
  runs-on: "ubuntu-latest"
  concurrency:
  group: ${{ github.ref }}-deploy-testnet
@@ -52,13 +53,13 @@ jobs:
  - name: Trigger a testnet Deploy
  run: |
  sleep 30s
- mkdir -p testnet/${{ needs.build.outputs.branch-sha }}
- pushd testnet/${{ needs.build.outputs.branch-sha }}
+ mkdir -p testnet/${{ needs.branch-sha.outputs.value }}
+ pushd testnet/${{ needs.branch-sha.outputs.value }}
  [[ ! -f .latest ]] && touch .latest
  [[ ! -f .artifacts ]] && touch .artifacts
  cat .latest >> .artifacts
  echo ${{ needs.build.outputs.pkg-version }} > .latest
  git add .artifacts .latest
  git commit -m"Update testnet artifacts ${{ needs.build.outputs.pkg-version }}"
  git push
- echo "The testnet URL is: ${{ vars.TESTNET_ROOT_URL }}/${{ needs.build.outputs.branch-sha }}/" >> ${GITHUB_STEP_SUMMARY}
+ echo "The testnet URL is: ${{ vars.TESTNET_ROOT_URL }}/${{ needs.branch-sha.outputs.value }}/" >> ${GITHUB_STEP_SUMMARY}
diff --git a/apps/connect/vite.token-bridge.config.ts b/apps/connect/vite.token-bridge.config.ts
@@ -5,17 +5,20 @@ const PUBLIC_URL = viteConfig.base;
 
 const ADVANCE_TOOLS_HREF = `${PUBLIC_URL}/advanced-tools/#/transfer`
 const ADVANCE_TOOLS_HREF_TEMPLATE = `${ADVANCE_TOOLS_HREF}?sourceChain={:sourceChain}&targetChain={:targetChain}`
-
+const USDC_BRIDGE_HREF = `${PUBLIC_URL}/usdc-bridge/`
 // https://vitejs.dev/config/
 export default defineConfig({
  ...viteConfig,
  define: {
  navBar: [
  { label: "Home", active: true, href: `${PUBLIC_URL}/` },
- { label: "USDC", href: `${PUBLIC_URL}/usdc-bridge` }
+ { label: "USDC", href: USDC_BRIDGE_HREF }
  ],
  wormholeConnectConfig: {
  ...viteConfig?.define?.wormholeConnectConfig,
+ cctpWarning: {
+ href: USDC_BRIDGE_HREF
+ },
  moreNetworks: {
  href: ADVANCE_TOOLS_HREF_TEMPLATE,
  target: "_blank",