Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
REACT_APP_GTM_ID=GTM-WVXPS94
REACT_APP_GA4_ID=G-3G0Z44ZM07
REACT_APP_API_URL=https://dev.unguess.io/api
REACT_APP_TRYBER_URL=https://dev.tryber.me
REACT_ZAPIER_WEBHOOK=https://hooks.zapier.com/hooks/catch/5196925/bkxm1k6/
Expand Down
1 change: 1 addition & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
REACT_APP_GTM_ID=GTM-WVXPS94
REACT_APP_GA4_ID=G-2M29YVTK78
REACT_APP_API_URL=/api
REACT_APP_TRYBER_URL=https://app.tryber.me
REACT_ZAPIER_WEBHOOK=https://hooks.zapier.com/hooks/catch/5196925/bkxm1k6/
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "1.4.0",
"private": true,
"dependencies": {
"@analytics/google-analytics": "^1.1.0",
"@analytics/google-tag-manager": "^0.6.0",
"@analytics/hubspot": "^0.5.1",
"@appquality/languages": "1.4.3",
Expand Down
7 changes: 6 additions & 1 deletion src/analytics.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import googleAnalytics from '@analytics/google-analytics';
import googleTagManager from '@analytics/google-tag-manager';
import Analytics from 'analytics';
import hubspotPlugin from '@analytics/hubspot';
import Analytics from 'analytics';
import userpilot from './common/analytics-plugins/userpilot';
import { isDev } from './common/isDevEnvironment';

Expand All @@ -15,6 +16,10 @@ const analytics = Analytics({
preview: 'env-4',
}),
}),
// fallback to staging/local GA4 if no production ID is provided
googleAnalytics({
measurementIds: [process.env.REACT_APP_GA4_ID || 'G-3G0Z44ZM07'],
}),
userpilot({
token: 'NX-54e88e10',
}),
Expand Down
18 changes: 12 additions & 6 deletions src/common/components/PlanCreationInterface/ProjectDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,18 @@ export const ProjectDropdown = () => {
setProjectId(value.id);
}
}}
options={(projects || []).map((prj) => ({
id: prj.id.toString(),
value: prj.id.toString(),
label: prj.name,
isSelected: projectId === prj.id,
}))}
options={[
{
id: 'options-group',
label: t('__PLAN_CREATION_PROJECT_DROPDOWN_PLACEHOLDER'),
options: (projects || []).map((prj) => ({
id: prj.id.toString(),
value: prj.id.toString(),
label: prj.name,
isSelected: projectId === prj.id,
})),
},
]}
placeholder={t('__PLAN_CREATION_PROJECT_DROPDOWN_PLACEHOLDER')}
selectionValue={projectId?.toString() || ''}
{...(hasValidationError && { validation: 'error' })}
Expand Down
1 change: 1 addition & 0 deletions src/google-analytics.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module '@analytics/google-analytics';
2 changes: 1 addition & 1 deletion src/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@
"__PLAN_ADDITIONAL_TARGET_ERROR_TOO_LONG": "This text is a bit long. It is recommended not to exceed 512 characters, including spaces.",
"__PLAN_ASIDE_NAVIGATION_MODULES_TITLE": "IN THIS SECTION",
"__PLAN_CREATION_PROJECT_DROPDOWN_ERROR": "Select a project",
"__PLAN_CREATION_PROJECT_DROPDOWN_PLACEHOLDER": "Select a project",
"__PLAN_CREATION_PROJECT_DROPDOWN_PLACEHOLDER": "Select or create a new project",
"__PLAN_DATE_ERROR_REQUIRED": "Required field: enter a date to continue",
"__PLAN_DATE_IN_FUTURE_ERROR": "Date must be at least one business day in the future",
"__PLAN_DELETE_PLAN_CTA": "Delete draft",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ export const FollowActivitiesAccordion = () => {
isError,
} = useGetUsersMeWatchedPlansQuery();

const {
data: followedCampaigns,
isLoading: isCampaignsLoading,
isError: isCampaignsError,
} = useGetUsersMeWatchedCampaignsQuery();
const { data: followedCampaigns } = useGetUsersMeWatchedCampaignsQuery();
const totalFollowed =
(followedActivities?.items.length || 0) +
(followedCampaigns?.items.length || 0);
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
dependencies:
"@analytics/type-utils" "^0.6.2"

"@analytics/google-analytics@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@analytics/google-analytics/-/google-analytics-1.1.0.tgz#901e20b8c0ad10e26118317a5b6d5e98f927037f"
integrity sha512-i8uGyELMtwEUAf3GNWNLNBzhRvReDn1RUxvMdMhjUA7+GNGxPOM4kkzFfv3giQXKNxTEjfsh75kqNcscbJsuaA==

"@analytics/google-tag-manager@^0.6.0":
version "0.6.0"
resolved "https://registry.yarnpkg.com/@analytics/google-tag-manager/-/google-tag-manager-0.6.0.tgz#bc1d20bb77450171848af2acaacfe1554e6aa19c"
Expand Down
Loading