Merge branch 'master' into patch-1

base-org · Feb 4, 2025 · e296743 · e296743
2 parents 44390ea + 368aa53
commit e296743
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/apps/web/contexts/Analytics.tsx b/apps/web/contexts/Analytics.tsx
@@ -4,7 +4,7 @@ import logEvent, {
   ActionType,
   AnalyticsEventImportance,
   CCAEventData,
-  AnalyticsContext,
+  AnalyticsEventContext,
 } from 'libs/base-ui/utils/logEvent';
 import { ReactNode, createContext, useCallback, useContext, useMemo } from 'react';
 
@@ -30,7 +30,7 @@ export function useAnalytics() {
 
 type AnalyticsProviderProps = {
   children?: ReactNode;
-  context: AnalyticsContext;
+  context: string | AnalyticsEventContext;
 };
 
 export default function AnalyticsProvider({ children, context }: AnalyticsProviderProps) {

diff --git a/apps/web/src/components/GetStarted/StartBuilding.tsx b/apps/web/src/components/GetStarted/StartBuilding.tsx
@@ -63,7 +63,7 @@ export default async function StartBuilding() {
         />
         <ResourceCard
           title="Gas Sponsorship"
-          description="Reduce costs and Sponsor Gas for you users, with the Coinbase Paymaster and Bundler"
+          description="Reduce costs and Sponsor Gas for your users, with the Coinbase Paymaster and Bundler"
           href="https://www.coinbase.com/developer-platform/products/paymaster/?utm_source=dotorg&utm_medium=builderkit"
           topLeft={<span className="font-mono">02</span>}
           topRight={<Icon name="diagonalUpArrow" width="16px" height="16px" />}

diff --git a/libs/base-ui/utils/logEvent.ts b/libs/base-ui/utils/logEvent.ts
@@ -84,7 +84,7 @@ type CCAEventData = {
   message_id?: number;
   response_helpful?: boolean;
   address?: string;
-  context?: AnalyticsEventContext;
+  context?: string | AnalyticsEventContext;
   userId?: string;
   error?: string;
   wallet_type?: string;