From 5afdbfc0c289e636587539fd34e5af9930ae13a7 Mon Sep 17 00:00:00 2001
From: janrembold <janrembold@gmx.net>
Date: Mon, 6 May 2024 15:25:43 +0200
Subject: [PATCH] fix: merge conflicts

---
 .../components/registration/AgencyFields/Agency/index.tsx | 2 +-
 .../registration/AgencyFields/AgencySelection/index.tsx   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/extensions/components/registration/AgencyFields/Agency/index.tsx b/src/extensions/components/registration/AgencyFields/Agency/index.tsx
index 09b34de3e..4e61f327e 100644
--- a/src/extensions/components/registration/AgencyFields/Agency/index.tsx
+++ b/src/extensions/components/registration/AgencyFields/Agency/index.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { AgencyDataInterface } from '../../../../../globalState/interfaces';
 import { InfoTooltip } from '../../../../../components/infoTooltip/InfoTooltip';
-import { AgencyLanguages } from '../../../../../components/agencySelection/AgencyLanguages';
 import { RadioButton } from '../../../../../components/radioButton/RadioButton';
+import { AgencyLanguages } from '../../../../../components/agencyRadioSelect/AgencyLanguages';
 
 interface AgencySelectionFormFieldProps {
 	onChange: (value: number) => void;
diff --git a/src/extensions/components/registration/AgencyFields/AgencySelection/index.tsx b/src/extensions/components/registration/AgencyFields/AgencySelection/index.tsx
index 5d41367bd..eafd6d9dc 100644
--- a/src/extensions/components/registration/AgencyFields/AgencySelection/index.tsx
+++ b/src/extensions/components/registration/AgencyFields/AgencySelection/index.tsx
@@ -8,7 +8,6 @@ import {
 } from '../../../../../globalState/interfaces';
 import { PinIcon } from '../../../../../resources/img/icons';
 import { VALID_POSTCODE_LENGTH } from '../../../../../components/agencySelection/agencySelectionHelpers';
-import { PreselectedAgency } from '../../../../../containers/registration/components/PreSelectedAgency/PreselectedAgency';
 import { Loading } from '../../../../../components/app/Loading';
 import { InputField } from '../../../../../components/inputField/InputField';
 import { Text } from '../../../../../components/text/Text';
@@ -17,6 +16,7 @@ import { NoAgencyFound } from '../NoAgencyFound';
 import './agencySelection.styles.scss';
 import { useTranslation } from 'react-i18next';
 import { setValueInCookie } from '../../../../../components/sessionCookie/accessSessionCookie';
+import { AgencyRadioSelect } from '../../../../../components/agencyRadioSelect/AgencyRadioSelect';
 
 interface AgencySelectionFormFieldProps {
 	preselectedAgencies?: AgencyDataInterface[];
@@ -250,9 +250,11 @@ export const AgencySelection = ({
 				)}
 
 			{preselectedAgencies.length === 1 && (
-				<PreselectedAgency
+				<AgencyRadioSelect
+					agency={preselectedAgencies[0]}
+					checkedValue={preselectedAgencies[0].id.toString()}
 					prefix={translate('registration.agency.preselected.prefix')}
-					agencyData={preselectedAgencies[0]}
+					// showTooltipAbove={props.isProfileView}
 				/>
 			)}
 		</div>