Skip to content

Commit

Permalink
fix: merge changes from 0.25.x
Browse files Browse the repository at this point in the history
  • Loading branch information
scopsy committed Apr 16, 2024
2 parents da0a9a1 + 5b0da56 commit c9fd269
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion apps/api/src/app/blueprint/blueprint.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { ClassSerializerInterceptor, Controller, Get, Param, UseInterceptors } from '@nestjs/common';

import { EnvironmentRepository, NotificationTemplateRepository } from '@novu/dal';

import { GroupedBlueprintResponse } from './dto/grouped-blueprint.response.dto';
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/pages/auth/components/QuestionnaireForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import { useVercelIntegration, useVercelParams } from '../../../hooks';
import { ROUTES } from '../../../constants/routes.enum';
import { DynamicCheckBox } from './dynamic-checkbox/DynamicCheckBox';
import styled from '@emotion/styled/macro';
import { OnboardingExperimentV2ModalKey } from '../../../constants/experimentsConstants';
import { useDomainParser } from './useDomainHook';
import { OnboardingExperimentV2ModalKey } from '../../../constants/experimentsConstants';

export function QuestionnaireForm() {
const [loading, setLoading] = useState<boolean>();
Expand Down
1 change: 1 addition & 0 deletions apps/widget/cypress/e2e/notifications-list.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ describe('Notifications List', function () {
cy.task('createNotifications', {
organizationId: this.session.organization._id,
enumerate: true,
ordered: true,
identifier: this.session.templates[0].triggers[0].identifier,
token: this.session.token,
subscriberId: this.session.subscriber.subscriberId,
Expand Down

0 comments on commit c9fd269

Please sign in to comment.