Skip to content

fix: use cal url#6013

Merged
PeerRich merged 4 commits intomainfrom
fix/team-url-settings
Dec 14, 2022
Merged

fix: use cal url#6013
PeerRich merged 4 commits intomainfrom
fix/team-url-settings

Conversation

@Udit-takkar
Copy link
Copy Markdown
Contributor

@Udit-takkar Udit-takkar commented Dec 13, 2022

Fixes #6006

Environment: Staging(main branch) / Production

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (refactoring code, technical debt, workflow improvements)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
@vercel
Copy link
Copy Markdown

vercel Bot commented Dec 13, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
cal ✅ Ready (Inspect) Visit Preview Dec 14, 2022 at 5:42PM (UTC)

@PeerRich
Copy link
Copy Markdown
Member

but then self-hosters would see cal.com right?

@Udit-takkar
Copy link
Copy Markdown
Contributor Author

@PeerRich CAL_URL was being used in other places also. it depends on WEBAPP_URL you pass in env file

export const CAL_URL = new URL(WEBAPP_URL).hostname.endsWith(".vercel.app") ? WEBAPP_URL : WEBSITE_URL;

@PeerRich
Copy link
Copy Markdown
Member

@PeerRich CAL_URL was being used in other places also. it depends on WEBAPP_URL you pass in env file

export const CAL_URL = new URL(WEBAPP_URL).hostname.endsWith(".vercel.app") ? WEBAPP_URL : WEBSITE_URL;

ah I didnt know, good!

Copy link
Copy Markdown
Contributor

@leog leog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@PeerRich PeerRich enabled auto-merge (squash) December 14, 2022 15:16
@PeerRich PeerRich added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Dec 14, 2022
@PeerRich PeerRich merged commit 92d15a0 into main Dec 14, 2022
@PeerRich PeerRich deleted the fix/team-url-settings branch December 14, 2022 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge ♻️ autoupdate tells kodiak to keep this branch up-to-date

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CAL-587] Display of Team URL in the settings page is wrong

4 participants