Handle duplicated ids in layout

frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SchemaGenerationErrorsPanel.tsx

@@ -2,7 +2,7 @@ import classes from './SchemaGenerationErrorsPanel.module.css';
 import React from 'react';
 import { Alert, ErrorMessage, Paragraph } from '@digdir/design-system-react';
 import { Trans, useTranslation } from 'react-i18next';
-import { XMarkIcon } from '@navikt/aksel-icons';
+import { XMarkIcon } from '@studio/icons';
 import { StudioButton } from '@studio/components';
 
 export interface SchemaGenerationErrorsPanelProps {

frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { ErrorMessage, Textfield, LegacyPopover } from '@digdir/design-system-react';
 import { useTranslation } from 'react-i18next';
-import { PlusIcon } from '@navikt/aksel-icons';
+import { PlusIcon } from '@studio/icons';
 import { extractModelNamesFromMetadataList } from '../../../../utils/metadataUtils';
 import type { DatamodelMetadata } from 'app-shared/types/DatamodelMetadata';
 import { StudioButton } from '@studio/components';

frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/DeleteWrapper.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { StudioButton } from '@studio/components';
-import { TrashIcon } from '@navikt/aksel-icons';
+import { TrashIcon } from '@studio/icons';
 import { useDeleteDatamodelMutation } from '../../../../hooks/mutations';
 import type { MetadataOption } from '../../../../types/MetadataOption';
 import { AltinnConfirmDialog } from 'app-shared/components';

frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/GenerateModelsButton.tsx

@@ -1,5 +1,5 @@
 import { Spinner } from '@digdir/design-system-react';
-import { CogIcon } from '@navikt/aksel-icons';
+import { CogIcon } from '@studio/icons';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSchemaQuery } from '../../../../hooks/queries';

frontend/app-development/features/overview/components/Documentation.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import classes from './Documentation.module.css';
 import { Heading, Link } from '@digdir/design-system-react';
-import { ExternalLinkIcon } from '@navikt/aksel-icons';
+import { ExternalLinkIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 
 export const Documentation = () => {

frontend/app-development/layout/AppBar/appBarConfig.test.ts

@@ -4,7 +4,7 @@ import { typedLocalStorage } from 'app-shared/utils/webStorage';
 import { TopBarMenu } from 'app-shared/enums/TopBarMenu';
 import type { TopBarMenuItem } from 'app-shared/types/TopBarMenuItem';
 import { RoutePaths } from 'app-development/enums/RoutePaths';
-import { DatabaseIcon } from '@navikt/aksel-icons';
+import { DatabaseIcon } from '@studio/icons';
 
 describe('getTopBarMenu', () => {
   it('should return all items when provided repository type is "App" which is not hidden behind feature-flags', () => {

frontend/app-development/layout/AppBar/appBarConfig.ts

@@ -1,6 +1,6 @@
 import { RepositoryType } from 'app-shared/types/global';
 import { shouldDisplayFeature } from 'app-shared/utils/featureToggleUtils';
-import { DatabaseIcon, Density3Icon, PencilIcon, TenancyIcon } from '@navikt/aksel-icons';
+import { DatabaseIcon, Density3Icon, PencilIcon, TenancyIcon } from '@studio/icons';
 import { RoutePaths } from 'app-development/enums/RoutePaths';
 import { TopBarMenu } from 'app-shared/enums/TopBarMenu';
 import type { TopBarMenuItem } from 'app-shared/types/TopBarMenuItem';

frontend/app-development/layout/SettingsModalButton/SettingsModal/SettingsModal.tsx

@@ -8,7 +8,7 @@ import {
   TimerStartIcon,
   ShieldLockIcon,
   SidebarBothIcon,
-} from '@navikt/aksel-icons';
+} from '@studio/icons';
 import { StudioModal } from '@studio/components';
 import type { LeftNavigationTab } from 'app-shared/types/LeftNavigationTab';
 import { LeftNavigationBar } from 'app-shared/components/LeftNavigationBar';

frontend/app-development/layout/SettingsModalButton/SettingsModal/components/Tabs/AboutTab/CreatedFor/CreatedFor.tsx

@@ -5,7 +5,7 @@ import { Paragraph } from '@digdir/design-system-react';
 import { useTranslation } from 'react-i18next';
 import { RepositoryType } from 'app-shared/types/global';
 import type { Repository } from 'app-shared/types/Repository';
-import { PersonCircleIcon } from '@navikt/aksel-icons';
+import { PersonCircleIcon } from '@studio/icons';
 import { formatDateToDateAndTimeString } from 'app-development/utils/dateUtils';
 import { StudioLabelAsParagraph } from '@studio/components';
 

frontend/app-development/layout/SettingsModalButton/SettingsModal/utils/settingsModalUtils.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { SettingsModalTab } from 'app-development/types/SettingsModalTab';
 import { createNavigationTab } from './index';
-import { TestFlaskIcon } from '@navikt/aksel-icons';
+import { TestFlaskIcon } from '@studio/icons';
 import type { LeftNavigationTab } from 'app-shared/types/LeftNavigationTab';
 
 const mockTabId1: SettingsModalTab = 'about';

frontend/app-development/layout/SettingsModalButton/SettingsModalButton.tsx

@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react';
 import React, { useState } from 'react';
 import { StudioButton } from '@studio/components';
-import { CogIcon } from '@navikt/aksel-icons';
+import { CogIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 import { SettingsModal } from './SettingsModal';
 

frontend/app-preview/src/components/AppBarConfig/AppPreviewBarConfig.tsx

@@ -4,7 +4,7 @@ import type { TFunction } from 'i18next';
 import { LegacyToggleButtonGroup, LegacySelect } from '@digdir/design-system-react';
 import type { AltinnButtonActionItem } from 'app-shared/components/altinnHeader/types';
 import classes from '../AppPreviewSubMenu.module.css';
-import { ArrowCirclepathIcon, EyeIcon, LinkIcon } from '@navikt/aksel-icons';
+import { ArrowCirclepathIcon, EyeIcon, LinkIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 import type { AppPreviewSubMenuProps } from '../AppPreviewSubMenu';
 import { useLayoutSetsQuery } from 'app-shared/hooks/queries/useLayoutSetsQuery';

frontend/dashboard/components/RepoList/RepoList.tsx

@@ -21,13 +21,7 @@ import classes from './RepoList.module.css';
 import type { User } from 'app-shared/types/Repository';
 import { useSetStarredRepoMutation, useUnsetStarredRepoMutation } from '../../hooks/mutations';
 
-import {
-  PencilIcon,
-  FilesIcon,
-  ExternalLinkIcon,
-  StarIcon,
-  StarFillIcon,
-} from '@navikt/aksel-icons';
+import { PencilIcon, FilesIcon, ExternalLinkIcon, StarIcon, StarFillIcon } from '@studio/icons';
 
 export interface IRepoListProps {
   isLoading: boolean;

frontend/dashboard/pages/Dashboard/Dashboard.tsx

@@ -4,7 +4,7 @@ import cn from 'classnames';
 import type { ChangeEvent, KeyboardEvent } from 'react';
 import { Textfield } from '@digdir/design-system-react';
 import { StudioButton } from '@studio/components';
-import { XMarkIcon } from '@navikt/aksel-icons';
+import { XMarkIcon } from '@studio/icons';
 import { CenterContainer } from '../../components/CenterContainer';
 import { DatamodelsReposList } from '../../components/DataModelsRepoList';
 import { OrgReposList } from '../../components/OrgRepoList';

frontend/language/src/nb.json

@@ -1692,6 +1692,14 @@
   "ux_editor.component_title.TextArea": "Langt svar",
   "ux_editor.component_unknown": "Ukjent komponent",
   "ux_editor.conditional_rendering_connection_header": "Betingede renderingstilkoblinger",
+  "ux_editor.config.warning_duplicates.heading": "Du har den samme ID-en på flere komponenter",
+  "ux_editor.config.warning_duplicates.solution_gitea": "Gå til Gitea for å endre filen med feil.",
+  "ux_editor.config.warning_duplicates.solution_gitea_commit": "Klikk på 'Commit endringer' nederst på siden.",
+  "ux_editor.config.warning_duplicates.solution_gitea_edit": "Endre en eller flere ID-er, slik at hver av dem blir unike.",
+  "ux_editor.config.warning_duplicates.solution_gitea_locate": "Finn de ID-ene som er like flere steder: ",
+  "ux_editor.config.warning_duplicates.solution_gitea_pencel": "I filen, velg blyanten øverst til høyre for å redigere filen.",
+  "ux_editor.config.warning_duplicates.solution_heading": "For å fikse problemet, må du gjøre dette:",
+  "ux_editor.config.warning_duplicates.solution_studio_import": "Gå tilbake til Altinn Studio og velg 'Hent endringer' for å laste inn endringene du har gjort i koden.",
   "ux_editor.container_empty": "Tomt, dra noe inn her...",
   "ux_editor.container_not_editable_info": "Noen egenskaper for denne komponenten er ikke redigerbare for øyeblikket. Du kan legge til underkomponenter i kolonnen til venstre.",
   "ux_editor.edit_component.id_help_text": "The component ID. Must be unique within all layouts/pages in a layout-set. Cannot end with <dash><number>.",
@@ -1705,6 +1713,8 @@
   "ux_editor.file_upload_component.display_mode": "Type",
   "ux_editor.file_upload_component.settings": "Innstillinger for filopplastingskomponent",
   "ux_editor.file_upload_component.valid_file_endings": "Innstillinger for filopplastingskomponent",
+  "ux_editor.formLayout.warning_duplicates": "Du har den samme ID-en på flere komponenter: ",
+  "ux_editor.formLayout.warning_duplicates.cannot_publish": "Du kan ikke publisere appen eller konfigurere komponentene før du har rettet opp feilen.",
   "ux_editor.form_designer": "Skjemadesigner",
   "ux_editor.id_identifier": "ID: {{item}}",
   "ux_editor.image_component.settings": "Innstillinger for bilde",

frontend/libs/studio-components/src/components/StudioIconTextfield/StudioIconTextfield.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { StudioIconTextfield } from './StudioIconTextfield';
 import type { StudioIconTextfieldProps } from './StudioIconTextfield';
-import { KeyVerticalIcon } from '@navikt/aksel-icons';
+import { KeyVerticalIcon } from '@studio/icons';
 import userEvent from '@testing-library/user-event';
 
 describe('StudioIconTextfield', () => {

frontend/libs/studio-components/src/components/StudioToggleableTextfield/StudioToggleableTextfield.stories.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Meta, StoryFn } from '@storybook/react';
 import { StudioToggleableTextfield } from './StudioToggleableTextfield';
-import { KeyVerticalIcon } from '@navikt/aksel-icons';
+import { KeyVerticalIcon } from '@studio/icons';
 
 type Story = StoryFn<typeof StudioToggleableTextfield>;
 

frontend/libs/studio-components/src/components/StudioToggleableTextfieldSchema/StudioToggleableTextfieldSchema.stories.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Meta, StoryFn } from '@storybook/react';
 import { StudioToggleableTextfieldSchema } from './StudioToggleableTextfieldSchema';
-import { KeyVerticalIcon } from '@navikt/aksel-icons';
+import { KeyVerticalIcon } from '@studio/icons';
 
 type Story = StoryFn<typeof StudioToggleableTextfieldSchema>;
 

frontend/libs/studio-icons/src/react/icons/SectionHeaderWarningIcon.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import type { IconProps } from '../types';
+import { SvgTemplate } from './SvgTemplate';
+
+export const SectionHeaderWarningIcon = (props: IconProps): React.ReactElement => {
+  return (
+    <SvgTemplate {...props}>
+      <rect y='0.477051' width='24' height='24' rx='12' fill='#B3253A' />
+      <path
+        fillRule='evenodd'
+        clipRule='evenodd'
+        d='M12.75 6.97705C12.75 6.56284 12.4142 6.22705 12 6.22705C11.5858 6.22705 11.25 6.56284 11.25 6.97705V14.9771C11.25 15.3913 11.5858 15.7271 12 15.7271C12.4142 15.7271 12.75 15.3913 12.75 14.9771V6.97705ZM12 16.9771C11.4477 16.9771 11 17.4248 11 17.9771C11 18.5293 11.4477 18.9771 12 18.9771C12.5523 18.9771 13 18.5293 13 17.9771C13 17.4248 12.5523 16.9771 12 16.9771Z'
+        fill='white'
+      />
+    </SvgTemplate>
+  );
+};

frontend/libs/studio-icons/src/react/icons/index.ts

@@ -20,6 +20,7 @@ export { PropertyIcon } from './PropertyIcon';
 export { RadioButtonIcon } from './RadioButtonIcon';
 export { ReferenceIcon } from './ReferenceIcon';
 export { RepeatingGroupIcon } from './RepeatingGroupIcon';
+export { SectionHeaderWarningIcon } from './SectionHeaderWarningIcon';
 export { SelectIcon } from './SelectIcon';
 export { ShortTextIcon } from './ShortTextIcon';
 export { SignTaskIcon } from './SignTaskIcon';

frontend/packages/policy-editor/src/components/CardButton/CardButton.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import classes from './CardButton.module.css';
-import { PlusIcon } from '@navikt/aksel-icons';
+import { PlusIcon } from '@studio/icons';
 import { Paragraph } from '@digdir/design-system-react';
 
 export type CardButtonProps = {

frontend/packages/policy-editor/src/components/ExpandablePolicyCard/ExpandablePolicyCard.tsx

@@ -6,7 +6,7 @@ import {
   Textarea,
   LegacySelect,
 } from '@digdir/design-system-react';
-import { PlusIcon } from '@navikt/aksel-icons';
+import { PlusIcon } from '@studio/icons';
 import classes from './ExpandablePolicyCard.module.css';
 import { ActionAndSubjectListItem } from './ActionAndSubjectListItem';
 import { ResourceNarrowingList } from './ResourceNarrowingList';

frontend/packages/policy-editor/src/components/ExpandablePolicyCard/ExpandablePolicyElement/ExpandablePolicyElement.tsx

@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react';
 import React, { useState } from 'react';
 import classes from './ExpandablePolicyElement.module.css';
-import { ChevronDownIcon, ChevronUpIcon } from '@navikt/aksel-icons';
+import { ChevronDownIcon, ChevronUpIcon } from '@studio/icons';
 import { PolicyEditorDropdownMenu } from './PolicyEditorDropdownMenu';
 import { useTranslation } from 'react-i18next';
 import { StudioLabelAsParagraph } from '@studio/components';

frontend/packages/policy-editor/src/components/ExpandablePolicyCard/ResourceNarrowingList/PolicyResourceFields/PolicyResourceFields.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import classes from './PolicyResourceFields.module.css';
 import { Textfield } from '@digdir/design-system-react';
-import { MultiplyIcon } from '@navikt/aksel-icons';
+import { MultiplyIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 import { StudioButton, StudioLabelAsParagraph } from '@studio/components';
 

frontend/packages/policy-editor/src/components/ExpandablePolicyCard/ResourceNarrowingList/ResourceNarrowingList.tsx

@@ -3,7 +3,7 @@ import classes from './ResourceNarrowingList.module.css';
 import { PolicyResourceFields } from './PolicyResourceFields';
 import { ExpandablePolicyElement } from '../ExpandablePolicyElement';
 import { StudioButton } from '@studio/components';
-import { PlusIcon } from '@navikt/aksel-icons';
+import { PlusIcon } from '@studio/icons';
 import type { PolicyEditorUsage, PolicyRuleResource } from '../../../types';
 import { useTranslation } from 'react-i18next';
 

frontend/packages/process-editor/src/components/ConfigPanel/ConfigEndEvent/ConfigEndEvent.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import type { LayoutSetConfig } from 'app-shared/types/api/LayoutSetsResponse';
 import { StudioSectionHeader, StudioToggleableTextfield } from '@studio/components';
 import { Paragraph } from '@digdir/design-system-react';
-import { PencilWritingIcon } from '@navikt/aksel-icons';
+import { PencilWritingIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 import classes from './ConfigEndEvent.module.css';
 import { PROTECTED_TASK_NAME_CUSTOM_RECEIPT } from 'app-shared/constants';

frontend/packages/schema-editor/src/components/SchemaInspector/CustomProperties.tsx

@@ -8,7 +8,7 @@ import {
   setCustomProperties,
   setProperty,
 } from '@altinn/schema-model';
-import { TrashIcon } from '@navikt/aksel-icons';
+import { TrashIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 import classes from './CustomProperties.module.css';
 import { useSchemaEditorAppContext } from '@altinn/schema-editor/hooks/useSchemaEditorAppContext';

frontend/packages/schema-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTab.tsx

@@ -4,7 +4,7 @@ import type { FieldNode } from '@altinn/schema-model';
 import { FieldType, isField, isReference, ObjectKind } from '@altinn/schema-model';
 import classes from './ItemFieldsTab.module.css';
 import { StudioButton, usePrevious } from '@studio/components';
-import { PlusIcon } from '@navikt/aksel-icons';
+import { PlusIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 import { ItemFieldsTable } from './ItemFieldsTable';
 import { useAddProperty } from '@altinn/schema-editor/hooks/useAddProperty';

frontend/packages/schema-editor/src/components/SchemaTree/SchemaNode/ActionButtons/AddPropertyMenu.tsx

@@ -3,9 +3,8 @@ import { useTranslation } from 'react-i18next';
 import { useAddProperty } from '../../../../hooks/useAddProperty';
 import { ObjectKind } from '@altinn/schema-model';
 import { ActionButton } from './ActionButton';
-import { PlusIcon } from '@navikt/aksel-icons';
 import { DropdownMenu } from '@digdir/design-system-react';
-import { CombinationIcon, PropertyIcon, ReferenceIcon } from '@studio/icons';
+import { CombinationIcon, PropertyIcon, ReferenceIcon, PlusIcon } from '@studio/icons';
 
 interface AddPropertyMenuProps {
   pointer: string;

frontend/packages/schema-editor/src/components/TypesInspector/TypeItem.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { UiSchemaNode } from '@altinn/schema-model';
 import { extractNameFromPointer } from '@altinn/schema-model';
-import { CogIcon, FileJsonIcon } from '@navikt/aksel-icons';
+import { CogIcon, FileJsonIcon } from '@studio/icons';
 import classes from './TypeItem.module.css';
 import classNames from 'classnames';
 import * as testids from '../../../../../testing/testids';

frontend/packages/schema-editor/src/components/TypesInspector/TypesInspector.tsx

@@ -1,7 +1,7 @@
 import type { MouseEvent } from 'react';
 import React from 'react';
 import { StudioButton } from '@studio/components';
-import { PlusIcon } from '@navikt/aksel-icons';
+import { PlusIcon } from '@studio/icons';
 import type { UiSchemaNode } from '@altinn/schema-model';
 import classes from './TypesInspector.module.css';
 import { Divider } from 'app-shared/primitives';

frontend/packages/schema-editor/src/components/common/ActionMenu.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { PlusCircleIcon } from '@navikt/aksel-icons';
+import { PlusCircleIcon } from '@studio/icons';
 import type { IconImage } from './Icon';
 import { Icon } from './Icon';
 import classes from './ActionMenu.module.css';

frontend/packages/shared/src/api/paths.js

@@ -48,6 +48,7 @@ export const frontendLangPath = (locale) => `/designer/frontend/lang/${locale}.j
 export const gitCommitPath = (org, app, commitId) => `/repos/${org}/${app}/commit/${commitId}`;
 export const repositoryGitPath = (org, app) => `/repos/${org}/${app}.git`;
 export const repositoryPath = (org, app) => `/repos/${org}/${app}`;
+export const repositoryLayoutPath = (org, app, layout) => `/repos/${org}/${app}/src/branch/master/App/ui/form/layouts/${layout}.json`;
 export const publishPath = (org, app) => `/editor/${org}/${app}/deploy`;
 export const repositoryOwnerPath = (org) => `/repos/${org}`;
 export const repositoryBasePath = () => `/repos`;

frontend/packages/shared/src/components/FileSelector.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { StudioButton } from '@studio/components';
-import { UploadIcon } from '@navikt/aksel-icons';
+import { UploadIcon } from '@studio/icons';
 import * as testids from '../../../../testing/testids';
 
 export interface IFileSelectorProps {

frontend/packages/shared/src/components/GiteaHeader/ThreeDotsMenu/LocalChangesModal/DeleteModal/DeleteModal.tsx

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import classes from './DeleteModal.module.css';
 import { useTranslation } from 'react-i18next';
 import { StudioButton, StudioModal, StudioSpinner } from '@studio/components';
-import { TrashIcon } from '@navikt/aksel-icons';
+import { TrashIcon } from '@studio/icons';
 import { useResetRepositoryMutation } from 'app-development/hooks/mutations/useResetRepositoryMutation';
 import { toast } from 'react-toastify';
 import { Heading, Paragraph, Textfield } from '@digdir/design-system-react';

frontend/packages/shared/src/components/GiteaHeader/ThreeDotsMenu/LocalChangesModal/LocalChanges/LocalChanges.tsx

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import classes from './LocalChanges.module.css';
 import { useTranslation } from 'react-i18next';
 import { Paragraph } from '@digdir/design-system-react';
-import { DownloadIcon, TrashIcon } from '@navikt/aksel-icons';
+import { DownloadIcon, TrashIcon } from '@studio/icons';
 import { LocalChangesActionButton } from '../LocalChangesActionButton';
 import { DeleteModal } from '../DeleteModal';
 import { repoDownloadPath } from 'app-shared/api/paths';

frontend/packages/shared/src/components/GiteaHeader/ThreeDotsMenu/LocalChangesModal/LocalChangesActionButton/LocalChangesActionButton.test.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import type { Action, LocalChangesActionButtonProps } from './LocalChangesActionButton';
 import { LocalChangesActionButton } from './LocalChangesActionButton';
-import { TestFlaskIcon } from '@navikt/aksel-icons';
+import { TestFlaskIcon } from '@studio/icons';
 import userEvent from '@testing-library/user-event';
 
 const mockLabel: string = 'Test label';

frontend/packages/shared/src/components/GiteaHeader/ThreeDotsMenu/LocalChangesModal/LocalChangesModal.tsx

@@ -2,7 +2,7 @@ import type { ReactNode } from 'react';
 import React from 'react';
 import classes from './LocalChangesModal.module.css';
 import { Heading } from '@digdir/design-system-react';
-import { MonitorIcon } from '@navikt/aksel-icons';
+import { MonitorIcon } from '@studio/icons';
 import { StudioModal } from '@studio/components';
 import { useTranslation } from 'react-i18next';
 import { LocalChanges } from './LocalChanges/LocalChanges';

frontend/packages/shared/src/components/GiteaHeader/ThreeDotsMenu/ThreeDotsMenu.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import classes from './ThreeDotsMenu.module.css';
-import { MonitorIcon, TabsIcon, MenuElipsisVerticalIcon } from '@navikt/aksel-icons';
+import { MonitorIcon, TabsIcon, MenuElipsisVerticalIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 import { repositoryPath } from 'app-shared/api/paths';
 import { GiteaIcon } from 'app-shared/icons';

frontend/packages/shared/src/components/GiteaHeader/VersionControlButtons/FetchChangesButton/FetchChangesButton.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { StudioButton } from '@studio/components';
-import { DownloadIcon } from '@navikt/aksel-icons';
+import { DownloadIcon } from '@studio/icons';
 import classes from './FetchChangesButton.module.css';
 import { useTranslation } from 'react-i18next';
 import { Notification } from '../Notification';

frontend/packages/shared/src/components/GiteaHeader/VersionControlButtons/ShareChangesButton/ShareChangesButton.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { StudioButton } from '@studio/components';
-import { UploadIcon, XMarkIcon } from '@navikt/aksel-icons';
+import { UploadIcon, XMarkIcon } from '@studio/icons';
 import classes from './ShareChangesButton.module.css';
 import { useTranslation } from 'react-i18next';
 import { Notification } from '../Notification';