Skip to content

Commit 58cc7a0

Browse files
author
Ole Martin Handeland
committed
Fixes after merge from main
1 parent ce2f479 commit 58cc7a0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/core/routing/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ export enum SearchParams {
44
ExitSubform = 'exitSubform',
55
Validate = 'validate',
66
Pdf = 'pdf',
7+
BackToPage = 'backToPage',
78
}

src/features/receipt/FixWrongReceiptType.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
22
import type { PropsWithChildren } from 'react';
33

44
import { Loader } from 'src/core/loading/Loader';
5-
import { useCurrentDataModelGuid } from 'src/features/datamodel/useBindingSchema';
5+
import { useCurrentDataModelDataElementId } from 'src/features/datamodel/useBindingSchema';
66
import { useLayoutSets } from 'src/features/form/layoutSets/LayoutSetsProvider';
77
import { useNavigationParam } from 'src/hooks/navigation';
88
import { TaskKeys, useNavigateToTask } from 'src/hooks/useNavigatePage';
@@ -18,8 +18,8 @@ export function FixWrongReceiptType({ children }: PropsWithChildren) {
1818
const layoutSets = useLayoutSets();
1919
const hasCustomReceipt = behavesLikeDataTask(TaskKeys.CustomReceipt, layoutSets);
2020
const navigateToTask = useNavigateToTask();
21-
const dataModelGuid = useCurrentDataModelGuid();
22-
const customReceiptDataModelNotFound = hasCustomReceipt && !dataModelGuid;
21+
const dataElementId = useCurrentDataModelDataElementId();
22+
const customReceiptDataModelNotFound = hasCustomReceipt && !dataElementId;
2323

2424
let redirectTo: undefined | TaskKeys = undefined;
2525
if (taskId === TaskKeys.ProcessEnd && hasCustomReceipt) {

0 commit comments

Comments
 (0)