Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

improve uninstall link

Steven Teyc739b2365058
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx
index 1814eb61b1..0f963edb8d 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx
@@ -13,8 +13,8 @@ import { ZapierSettings } from "@/lib/integrations/zapier/ui/settings";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import useWorkspace from "@/lib/swr/use-workspace";
import { InstalledIntegrationInfoProps } from "@/lib/types";
-import { IntegrationStatusBadge } from "@/ui/integrations/integration-status-badge";
import { IntegrationLogo } from "@/ui/integrations/integration-logo";
+import { IntegrationStatusBadge } from "@/ui/integrations/integration-status-badge";
import { useUninstallIntegrationModal } from "@/ui/modals/uninstall-integration-modal";
import { CheckCircleFill, ThreeDots } from "@/ui/shared/icons";
import { Markdown } from "@/ui/shared/markdown";
@@ -32,7 +32,6 @@ import {
Logo,
MaxWidthWrapper,
Popover,
- Tooltip,
TooltipContent,
useMediaQuery,
} from "@dub/ui";
@@ -155,6 +154,12 @@ export default function IntegrationPageClient({
return variants[mode];
}, [integration.id, integration.installed, integration.settings]);
+ const uninstallDisabledIntegrations = {
+ stripe: `https://dashboard.stripe.com/${stripeConnectId}/${stripeConnectionBannerConfig?.title === "Test Mode" ? "test/" : ""}apps/installed/dub.co`,
+ intercom:
+ "https://app.intercom.com/a/apps/ry6jfr8i/settings/app-settings/app-store?installed=true&app_package_code=dub-ejgb",
+ };
+
const { canInstallAdvancedIntegrations } = getPlanCapabilities(plan);
return (
@@ -197,11 +202,11 @@ export default function IntegrationPageClient({
setShowUninstallIntegrationModal(true);
}}
disabledTooltip={
- integration.slug === "stripe" ? (
+ uninstallDisabledIntegrations[integration.slug] ? (
<TooltipContent
- title="You cannot uninstall the Stripe integration from here. Please visit the Stripe dashboard to uninstall the app."
- cta="Go to Stripe"
- href={`https://dashboard.stripe.com/${stripeConnectId}/apps/installed/dub.co`}
+ title={`You cannot uninstall the ${integration.name} integration from here. Please uninstall from your ${integration.name} dashboard instead.`}
+ cta={`Go to ${integration.name}`}
+ href={uninstallDisabledIntegrations[integration.slug]}
target="_blank"
/>
) : (
diff --git a/apps/web/lib/integrations/intercom/oauth.ts b/apps/web/lib/integrations/intercom/oauth.ts
index a092843c96..dea5aaf05e 100644
--- a/apps/web/lib/integrations/intercom/oauth.ts
+++ b/apps/web/lib/integrations/intercom/oauth.ts
@@ -1,4 +1,4 @@
-import { APP_DOMAIN } from "@dub/utils";
+import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
import { OAuthProvider, OAuthProviderConfig } from "../oauth-provider";
import { intercomAuthTokenSchema } from "./schema";
@@ -16,7 +16,7 @@ export const intercomOAuthProvider = new IntercomOAuthProvider({
clientSecret: process.env.INTERCOM_CLIENT_SECRET!,
authUrl: "https://app.intercom.com/oauth",
tokenUrl: "https://api.intercom.io/auth/eagle/token",
- redirectUri: `${APP_DOMAIN}/api/intercom/callback`,
+ redirectUri: `${APP_DOMAIN_WITH_NGROK}/api/intercom/callback`,
redisStatePrefix: "intercom:oauth:state",
tokenSchema: intercomAuthTokenSchema,
bodyFormat: "json",