Skip to content

Commit

Permalink
Merge pull request #94 from virtualidentityag/fix/DIAKONIE-280-sessio…
Browse files Browse the repository at this point in the history
…n-topics

fix: move translated topic name to tag
  • Loading branch information
janrembold authored Apr 22, 2024
2 parents 45bd4b8 + ed0cadf commit cc49e9b
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions src/components/sessionsListItem/SessionListItemComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ export const SessionListItemComponent = ({
ALIAS_MESSAGE_TYPES.MASTER_KEY_LOST
);
const [plainTextLastMessage, setPlainTextLastMessage] = useState(null);
const topicSession = activeSession.item?.topic as TopicSessionInterface;

const { autoSelectPostcode } =
consultingType?.registration ||
Expand Down Expand Up @@ -348,10 +347,6 @@ export const SessionListItemComponent = ({
sessionTopic = activeSession.user.username;
}

const showConsultingType =
consultingType && !tenantData?.settings?.featureTopicsEnabled;
const zipCodeSlash = showConsultingType ? '/ ' : '';

return (
<div
onClick={handleOnClick}
Expand Down Expand Up @@ -384,24 +379,22 @@ export const SessionListItemComponent = ({
</div>
) : (
<div className="sessionsListItem__consultingType">
{topic?.name ? `${topic.name} ` : ''}
{activeSession.item.consultingType !== 1 &&
!isAsker &&
{!isAsker &&
!activeSession.isLive &&
!autoSelectPostcode
? zipCodeSlash + activeSession.item.postcode
? activeSession.item.postcode
: null}
</div>
)}
{topicSession?.id !== undefined && topicSession.name && (
{topic?.name && (
<div
className="sessionsListItem__topic"
style={{
backgroundColor:
tenantData?.theming?.primaryColor
}}
>
{topicSession?.name}
{topic.name}
</div>
)}
<div className="sessionsListItem__date">
Expand Down

0 comments on commit cc49e9b

Please sign in to comment.