Merge branch 'develop' into fix/handle-missing-resource

medusajs · Sep 2, 2024 · 10a8ab3 · 10a8ab3
2 parents 12c16a5 + 2536773
commit 10a8ab3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...ampaigns/campaign-detail/components/campaign-general-section/campaign-general-section.tsx b/...ampaigns/campaign-detail/components/campaign-general-section/campaign-general-section.tsx
@@ -150,7 +150,7 @@ export const CampaignGeneralSection = ({
         </Text>
 
         <Text size="small" leading="compact">
-          {campaign.starts_at ? formatDate(campaign.ends_at) : "-"}
+          {campaign.ends_at ? formatDate(campaign.ends_at) : "-"}
         </Text>
       </div>
     </Container>

diff --git a/...t/dashboard/src/routes/users/user-invite/components/invite-user-form/invite-user-form.tsx b/...t/dashboard/src/routes/users/user-invite/components/invite-user-form/invite-user-form.tsx
@@ -31,7 +31,6 @@ import {
 } from "../../../../../hooks/api/invites"
 import { useUserInviteTableQuery } from "../../../../../hooks/table/query/use-user-invite-table-query"
 import { useDataTable } from "../../../../../hooks/use-data-table"
-import { backendUrl } from "../../../../../lib/client"
 import { isFetchError } from "../../../../../lib/is-fetch-error.ts"
 
 const InviteUserSchema = zod.object({
@@ -40,6 +39,8 @@ const InviteUserSchema = zod.object({
 
 const PAGE_SIZE = 10
 const PREFIX = "usr_invite"
+const INVITE_URL = `${window.location.origin}${__BASE__ === "/" ? "" : __BASE__}/invite?token=`
+
 
 export const InviteUserForm = () => {
   const { t } = useTranslation()
@@ -206,7 +207,7 @@ const InviteActions = ({ invite }: { invite: InviteDTO }) => {
   }
 
   const handleCopyInviteLink = () => {
-    const inviteUrl = `${backendUrl}/app/invite?token=${invite.token}`
+    const inviteUrl = `${INVITE_URL}${invite.token}`
     copy(inviteUrl)
   }