diff --git a/apps/web/public/documents/privacyPolicy_de.html b/apps/web/public/documents/privacyPolicy_de.html
index cdef827a3ff9ec9dc98d973a188651b11dc9fe88..d1e2b945e7036c098d2cca3e9fc9ff9f034f9dd8 100644
--- a/apps/web/public/documents/privacyPolicy_de.html
+++ b/apps/web/public/documents/privacyPolicy_de.html
@@ -884,7 +884,7 @@
gewinnbringenden Nutzung der weiter unten beschriebenen Communityfunktionen bitten wir Nutzende zudem, ein
aussagekräftiges Nutzungsprofil anzulegen und einige persönliche Angaben zur Verfügung zu stellen, wie
die freiwillige Eingabe eines Nachnamens, die Auswahl zutreffender Interessen aus einer Auswahl sozialer und
- ökologischer Themen, sowie der passenden SDGs (Sustainable Development Goals/Nachhaltigkeitsziele der UN), die
+ ökologischer Themen, die
Angabe passender Fertigkeiten, sowie die Angabe des Standortes der Nutzung auf Ebene einer Stadt/eines Ortes.</p>
<p>Weiterhin kann ein Profilbild angelegt werden, wozu in der App der Zugriff auf die Fotobibliothek erteilt werden
muss. Die holi.social-App verwendet Bilder bzw. Fotos aus den Bildbibliotheken der Nutzenden nur dann, wenn Nutzende
diff --git a/apps/web/public/documents/privacyPolicy_en.html b/apps/web/public/documents/privacyPolicy_en.html
index 554928628f34ac56b3f3c30abeb1bb0c7b674b19..65f469872635e6d7680b8094c3888da880fc08e3 100644
--- a/apps/web/public/documents/privacyPolicy_en.html
+++ b/apps/web/public/documents/privacyPolicy_en.html
@@ -1045,8 +1045,7 @@
in the community functions described below. The data processed includes login information (user name, password and an
e-mail address). In order to make profitable use of the community functions described below, we also ask users to
create a meaningful user profile and provide some personal information, such as voluntarily entering a surname,
- selecting relevant interests from a selection of social and ecological topics, as well as the matching SDGs
- (Sustainable Development Goals of the UN), specifying suitable skills, and specifying the location of use at the level
+ selecting relevant interests from a selection of social and ecological topics, specifying suitable skills, and specifying the location of use at the level
of a city/town.</p>
<p>A profile picture can also be created, for which access to the photo library must be granted in the app. The
holi.social app only uses images or photos from users' image libraries if users decide to use certain functions, such
diff --git a/core/auth/hooks/__tests__/useLoggedInUser.test.tsx b/core/auth/hooks/__tests__/useLoggedInUser.test.tsx
index 9bb18e09f09fbd56ba69c170d792450005065aca..0725ce0d9dcb5e3a53af9c6b6e37ead96c62d2dc 100644
--- a/core/auth/hooks/__tests__/useLoggedInUser.test.tsx
+++ b/core/auth/hooks/__tests__/useLoggedInUser.test.tsx
@@ -58,7 +58,6 @@ const mockUserRequest = (userId?: string) => {
geolocationId: '',
engagementLevel: '',
interestsV2: [],
- sdgs: [],
skillsV2: [],
connectionStatusToMyself: '',
trackingConsentPersonalization: false,
diff --git a/core/domain/shared/hooks.ts b/core/domain/shared/hooks.ts
index 8cd678f87b13fc2f1b3db916efe63db6814dbbc4..1aaffacde90ec6b0a1b6d51ed748ecece78271d5 100644
--- a/core/domain/shared/hooks.ts
+++ b/core/domain/shared/hooks.ts
@@ -1,26 +1,10 @@
-import { useMutation, useQuery } from '@apollo/client'
+import { useMutation } from '@apollo/client'
-import { anonCountQuery, sdgsQuery } from '@holi/core/domain/shared/queries'
-import type { SDG, SdgsQueryResult } from '@holi/core/domain/shared/types'
-import { logError } from '@holi/core/errors/helpers'
+import { anonCountQuery } from '@holi/core/domain/shared/queries'
import { useCallback } from 'react'
import { getLogger } from '@holi/core/helpers/logging'
import type { MutationAnonCountArgs } from '@holi/api/graphql/graphql-codegen'
-export const useSDGs = (): { sdgs: readonly SDG[]; sdgsLoading: boolean } => {
- const { loading: sdgsLoading, data: sdgsData } = useQuery<SdgsQueryResult>(sdgsQuery, {
- onError: (error) =>
- logError(error, 'Failed to load SDGs', {
- location: 'domain/shared/hooks/useSDGs',
- }),
- })
- const sdgs = sdgsData?.sdgs.data || []
- return {
- sdgs,
- sdgsLoading: sdgsLoading && !sdgs.length,
- }
-}
-
export type AnonCountFn = (counterName: string) => void
const logger = getLogger('Tracking')
diff --git a/core/domain/shared/queries.ts b/core/domain/shared/queries.ts
index 92e4edf640356c9b598b269620f0285e734cd8c7..7e19dac7031ea2ca100d1b8161105ba36d4bec58 100644
--- a/core/domain/shared/queries.ts
+++ b/core/domain/shared/queries.ts
@@ -4,19 +4,6 @@ import { FullUserFragmentDoc } from '@holi/api/graphql/graphql-codegen'
import type { AuthenticatedUser, User } from '@holi/core/domain/shared/types'
import type { Paged } from '@holi/core/types'
-export const sdgsQuery = gql`
- query SDGs {
- sdgs {
- data {
- id
- title
- slug
- number
- }
- }
- }
-`
-
// This fragment is used in a lot of places throughout the app
// Do NOT add anymore fields here that are not required for HoliAvatar
export const UserAvatarFragment = gql`
@@ -64,11 +51,6 @@ export const FullAuthenticatedUserFragment = gql`
geolocationId
engagementLevel
interestsV2
- sdgs {
- id
- title
- slug
- }
skillsV2
connectionStatusToMyself
trackingConsentAnalytics
diff --git a/core/domain/shared/types.ts b/core/domain/shared/types.ts
index 7d06ef0649a6921779a4f2040e383de4e0351f50..792447b2afaac6601b5db4685cc599b3c6d7c9b4 100644
--- a/core/domain/shared/types.ts
+++ b/core/domain/shared/types.ts
@@ -1,6 +1,5 @@
import type { SpaceConnectionType } from '@holi/core/screens/spaces/types'
import type { UserConnectionStatus } from '@holi/core/screens/userprofile/types'
-import type { Paged } from '@holi/core/types'
export type TermType = 'topic' | 'skill'
@@ -137,18 +136,11 @@ export interface Term {
export type SortedTerm = Term & { number?: number }
-export type SDG = Term & {
- number: number
-}
-
+// TODO(SF) removable?
export const termsByTitleComparator = (a: Term, b: Term) => a.title.localeCompare(b.title)
export const termsBySortNumberComparator = (a: SortedTerm, b: SortedTerm) => (a.number || 0) - (b.number || 0)
-export interface SdgsQueryResult {
- sdgs: Paged<SDG>
-}
-
export interface User {
id: string
/**
@@ -170,7 +162,6 @@ export interface User {
geolocationId?: string
engagementLevel?: string
interestsV2?: string[]
- sdgs?: SDG[]
skillsV2?: string[]
connectionStatusToMyself?: UserConnectionStatus
connectionStatusToSpace?: SpaceConnectionType[]
diff --git a/core/i18n/locales/de.json b/core/i18n/locales/de.json
index 42e52b715a9bd268df3ec99afa40c3f232caf5c8..c52f3bb07f78ec52b11e1911ed7e696e701c6fcb 100644
--- a/core/i18n/locales/de.json
+++ b/core/i18n/locales/de.json
@@ -653,11 +653,6 @@
"profile.logout": "Ausloggen",
"profile.missingInfo": "Diese Person hat noch nicht viel über sich preisgegeben",
"profile.profile.edit": "Profil bearbeiten",
- "profile.sdgs": "SDGs, die mich interessieren",
- "profile.sdgs.add": "SDGs hinzufügen",
- "profile.sdgs.edit": "SDGs bearbeiten",
- "profile.sdgs.filter.empty": "Entschuldigung, es wurden keine passenden SDGs gefunden",
- "profile.sdgs.filter.placeholder": "SDGs suchen…",
"profile.settings.aboutholiapp.title": "Ãœber die holi App",
"profile.settings.account.delete": "Konto löschen",
"profile.settings.account.delete.confirmation.confirm": "Löschen",
@@ -1198,12 +1193,6 @@
"spaces.input.publicLinks.url.placeholder": "https://",
"spaces.input.publicLinks.validation.name.mandatory": "Ein Name für den Link ist Pflicht",
"spaces.input.publicLinks.validation.url.mandatory": "Eine URL ist erforderlich, um einen Social Media Link hinzuzufügen.",
- "spaces.input.sdgs.description": "Die 17 Ziele für nachhaltige Entwicklung (SDGs) sind politische Zielsetzungen der Vereinten Nationen (UN), die weltweit der Sicherung einer nachhaltigen Entwicklung auf ökonomischer, sozialer sowie ökologischer Ebene dienen sollen.",
- "spaces.input.sdgs.infoModal.sdg.buttonText": "Lies mehr bei sdgs.un.org/goals",
- "spaces.input.sdgs.infoModal.sdg.headline": "7 Ziele, um unsere Welt zu transformieren",
- "spaces.input.sdgs.infoModal.sdg.text": "Die Ziele für nachhaltige Entwicklung (Sustainable Development Goals, SDGs) sind eine Reihe von 17 globalen Zielen, die von den Vereinten Nationen im Jahr 2015 festgelegt wurden. Sie wurden entworfen, um verschiedene soziale, wirtschaftliche und Umwelt-Herausforderungen anzugehen, denen die Welt gegenübersteht, und um internationale Bemühungen für eine nachhaltigere und gerechtere Zukunft bis 2030 zu lenken. Die SDGs umfassen eine breite Palette von Themen, darunter Armut, Hunger, Gesundheit, Bildung, Geschlechtergleichstellung, sauberes Wasser, erneuerbare Energie, wirtschaftliches Wachstum, industrielle Innovation, Maßnahmen zum Klimaschutz und vieles mehr.",
- "spaces.input.sdgs.search": "Nachhaltigkeitsziele suchen",
- "spaces.input.sdgs.title": "Nachhaltigkeitsziele",
"spaces.input.task.contactEmail.label": "E-Mail-Adresse",
"spaces.input.task.contactEmail.placeholder": "E-Mail-Adresse…",
"spaces.input.task.contactPhone.label": "Telefonnummer",
@@ -1407,7 +1396,6 @@
"spaces.spaceDetails.publicLinks": "Mehr Infos",
"spaces.spaceDetails.publicLinks.change.title": "Du öffnest einen externen Link",
"spaces.spaceDetails.publicLinks.change.url": "Die URL lautet ",
- "spaces.spaceDetails.sdgs": "NachhaltigkeitsÂziele",
"spaces.spaceDetails.tasks.empty.message.forCreators": "Erstelle konkrete Aufgaben, um helfende Hände zu finden",
"spaces.spaceDetails.tasks.empty.message.forNonMembers": "Wenn du Ideen hast, mit unserer Community zusammenzuarbeiten, bist du herzlich eingeladen, Mitwirkende:r zu werden",
"spaces.spaceDetails.tasks.empty.title.forNonMembers": "Zurzeit keine Aufgaben verfügbar",
@@ -1638,8 +1626,6 @@
"user.profileView.role.community_manager": "Community Manager:in",
"user.profileView.role.editor": "Redakteur:in",
"user.profileView.role.journalist": "Partnerjournalist:in",
- "user.sdgs.form.headline": "SDGs, die mich interessieren",
- "user.sdgs.form.subline": "SDGs (Sustainable Development Goals) sind von der UN festgesetzte Ziele für nachhaltige Entwicklung, die helfen, eine nachhaltigere Welt zu erschaffen",
"user.skills.form.headline": "Finde ein Ehrenamt, das deinen Fähigkeiten entspricht",
"user.skills.form.subline": "Deine Fähigkeiten erlauben es anderen Nutzenden, dich besser kennenzulernen. Wir können außerdem unser Angebot auf dich zuschneiden.",
"user.visitProfile": "Zum Profil von {{name}}",
diff --git a/core/i18n/locales/en.json b/core/i18n/locales/en.json
index b3ec15c7bc1b32a9592c4c7cf0270cc12ef40d6c..6f9e60c802ee5b3e2a8ffa5da9424c316ed71c16 100644
--- a/core/i18n/locales/en.json
+++ b/core/i18n/locales/en.json
@@ -652,11 +652,6 @@
"profile.logout": "Sign out",
"profile.missingInfo": "This person has not shared much about themselves yet",
"profile.profile.edit": "Edit profile",
- "profile.sdgs": "SDGs I'm interested in",
- "profile.sdgs.add": "Add SDGs",
- "profile.sdgs.edit": "Edit SDGs",
- "profile.sdgs.filter.empty": "We are sorry, no matching SDGs were found",
- "profile.sdgs.filter.placeholder": "Search a SDG…",
"profile.settings.aboutholiapp.title": "About the holi app",
"profile.settings.account.delete": "Delete account",
"profile.settings.account.delete.confirmation.confirm": "Delete",
@@ -1202,12 +1197,6 @@
"spaces.input.publicLinks.url.placeholder": "https://",
"spaces.input.publicLinks.validation.name.mandatory": "A name for the link is mandatory.",
"spaces.input.publicLinks.validation.url.mandatory": "A URL is mandatory to add a profile link.",
- "spaces.input.sdgs.description": "The Sustainable Development Goals are a collection of 17 interlinked objectives designed to serve as a / shared blueprint for peace and prosperity for people and the planet now and into the future",
- "spaces.input.sdgs.infoModal.sdg.buttonText": "Read more at sdgs.un.org/goals",
- "spaces.input.sdgs.infoModal.sdg.headline": "17 Goals to transform our world",
- "spaces.input.sdgs.infoModal.sdg.text": "Sustainable Development Goals (SDGs) are a set of 17 global goals established by the United Nations in 2015. They are designed to address various social, economic, and environmental challenges facing the world and to guide international efforts toward a more sustainable and equitable future by 2030. The SDGs cover a wide range of issues, including poverty, hunger, health, education, gender equality, clean water, clean energy, economic growth, industry innovation, climate action, and more.",
- "spaces.input.sdgs.search": "Search SDG",
- "spaces.input.sdgs.title": "Sustainable Development Goals",
"spaces.input.task.contactEmail.label": "Email address",
"spaces.input.task.contactEmail.placeholder": "Email address…",
"spaces.input.task.contactPhone.label": "Phone number",
@@ -1411,7 +1400,6 @@
"spaces.spaceDetails.publicLinks": "More info",
"spaces.spaceDetails.publicLinks.change.title": "You are opening an external link",
"spaces.spaceDetails.publicLinks.change.url": "The URL is ",
- "spaces.spaceDetails.sdgs": "Sustainable Development Goals",
"spaces.spaceDetails.tasks.empty.message.forCreators": "Create actionable tasks to find helping hands",
"spaces.spaceDetails.tasks.empty.message.forNonMembers": "If you have ideas to collaborate with our community, you are welcome to become a Collaborator.",
"spaces.spaceDetails.tasks.empty.title.forNonMembers": "No tasks available right now",
@@ -1644,8 +1632,6 @@
"user.profileView.role.community_manager": "Community Manager",
"user.profileView.role.editor": "Editor",
"user.profileView.role.journalist": "Partner journalist",
- "user.sdgs.form.headline": "SDGs I'm interested in",
- "user.sdgs.form.subline": "SDGs (Sustainable Development Goals) are sustainable development goals set by the UN that help build towards a more sustainable world.",
"user.skills.form.headline": "Find volunteering that matches your skills",
"user.skills.form.subline": "This allows other users to get to know you better and us to tailor our offering to your skills.",
"user.visitProfile": "Visit profile of {{name}}",
diff --git a/core/screens/spaces/__tests__/testData.ts b/core/screens/spaces/__tests__/testData.ts
index 02a43f1557f5f28b6232dd74f1b73e3f8c6b6770..a6e498591cb04f68cb1d0f18d033ab1569f24d7a 100644
--- a/core/screens/spaces/__tests__/testData.ts
+++ b/core/screens/spaces/__tests__/testData.ts
@@ -50,7 +50,6 @@ export const user: User & WithTypename = {
location: '',
geolocationId: '',
engagementLevel: 'INTERESTED',
- sdgs: [],
skillsV2: ALL_SKILLS.slice(7, 9),
connectionStatusToMyself: UserConnectionStatus.NOT_CONNECTED,
__typename: 'User',
@@ -221,7 +220,6 @@ export const space: Space & WithTypename = {
name: 'space-title',
membershipRequests: emptyPagedMembershipRequests,
appointments: emptyPagedAppointments,
- sdgs: [],
onboarding: {
steps: [],
__typename: 'Onboarding',
diff --git a/core/screens/spaces/components/SpaceInputs/SpaceSDGsInput.tsx b/core/screens/spaces/components/SpaceInputs/SpaceSDGsInput.tsx
deleted file mode 100644
index b643bb122efd62a6f1f1ffbe6c5bfda1d0b6328f..0000000000000000000000000000000000000000
--- a/core/screens/spaces/components/SpaceInputs/SpaceSDGsInput.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import { ChipSelect } from 'holi-bricks/components/chips'
-import React, { useEffect, useMemo, useState } from 'react'
-import { Platform, StyleSheet, View, useWindowDimensions } from 'react-native'
-
-import { type SortedTerm, type Term, termsBySortNumberComparator } from '@holi/core/domain/shared/types'
-import { HoliIcon } from '@holi/icons/src/HoliIcon'
-import { Information, Search } from '@holi/icons/src/generated'
-import HoliText from '@holi/ui/components/atoms/HoliText'
-import HoliTextInput from '@holi/ui/components/molecules/HoliTextInput'
-import type { Color } from 'holi-bricks/tokens/colors/primitives'
-import { type HoliTheme, useTheme } from '@holi/ui/styles/theme'
-import { useSDGs } from '@holi/core/domain/shared/hooks'
-
-export interface SpaceSDGsInputProps {
- title?: string
- description: string
- searchPlaceholder: string
- onSelect: (items: SortedTerm[]) => void
- selected: readonly SortedTerm[]
- hint?: string
- testID?: string
- color?: Color
-}
-
-export const SpaceSDGsInput = ({
- title,
- description,
- searchPlaceholder,
- hint,
- onSelect,
- selected,
- testID,
- color = 'green',
-}: SpaceSDGsInputProps) => {
- const { sdgs: terms } = useSDGs()
- const [filterString, setFilterString] = useState<string>('')
- const [orderedTerms, setOrderedTerms] = useState<SortedTerm[]>([])
- const [filteredTerms, setFilteredTerms] = useState<SortedTerm[]>([])
- const { height: deviceHeight } = useWindowDimensions()
- const { theme } = useTheme()
- const { colors } = theme
- const styles = useMemo(() => getStyles(theme), [theme])
-
- useEffect(() => {
- /*
- We need to determine the right order when opening the layer:
- * currently selected items go to the top, alphabetically sorted by translation
- * currently unselected items go below, alphabetically sorted by translation
- This order is kept until the selection process is done and the layer is closed.
- */
- const unselected = terms && terms.filter((term) => !selected.find((item) => item.id === term.id))
- const copyOfSelected = [...selected] // make a hard copy of the selected items (for immutability)
-
- setOrderedTerms([
- ...copyOfSelected.sort(termsBySortNumberComparator),
- ...unselected.sort(termsBySortNumberComparator),
- ])
- }, [terms, selected])
-
- useEffect(
- () =>
- setFilteredTerms(
- filterString === ''
- ? orderedTerms
- : orderedTerms.filter((term) => term.title.toLowerCase().includes(filterString.toLowerCase()))
- ),
- [orderedTerms, filterString]
- )
-
- const updateValues = (term: Term) => {
- if (selected.includes(term)) {
- // remove the value
- onSelect(selected.filter((selectedTerm) => selectedTerm !== term))
- } else if (selected.length < 6) {
- // add the value
- onSelect([...selected, term])
- }
- }
-
- return (
- <View style={[styles.container, { minHeight: deviceHeight }]} testID={testID || 'terms-list'}>
- {title && (
- <HoliText size="extralarge" style={styles.title}>
- {title}
- </HoliText>
- )}
- <HoliText style={styles.subTitle}>{description}</HoliText>
- <HoliTextInput
- aria-label={searchPlaceholder}
- value={filterString}
- placeholder={searchPlaceholder}
- onChange={(text: string) => setFilterString(text)}
- trailingIcon={Search}
- style={styles.input}
- />
- {!!hint && (
- <View style={styles.hintContainer}>
- <HoliIcon icon={Information} size={14} color={colors.foreground30} style={styles.infoIcon} />
- <HoliText size="small" style={styles.hint}>
- {hint}
- </HoliText>
- </View>
- )}
- <View style={styles.termsListContainer}>
- {filteredTerms &&
- filteredTerms.map((term) => (
- <ChipSelect
- key={term.id}
- selected={selected.includes(term)}
- onPress={() => updateValues(term)}
- selectedColor={color}
- >
- {term.number ? `${term.number}. ${term.title}` : term.title}
- </ChipSelect>
- ))}
- </View>
- </View>
- )
-}
-
-const getStyles = (theme: HoliTheme) =>
- StyleSheet.create({
- container: {
- flex: 1,
- paddingTop: 24,
- paddingBottom: 132,
- ...Platform.select({
- native: {
- maxWidth: '100%',
- },
- }),
- },
- title: {
- marginBottom: 16,
- },
- subTitle: {
- marginBottom: 32,
- color: theme.colors.foreground20,
- },
- input: {
- marginBottom: 16,
- },
- hintContainer: {
- flexDirection: 'row',
- },
- infoIcon: { marginTop: 1 },
- hint: {
- marginLeft: 5,
- },
- termsListContainer: {
- marginTop: 16,
- display: 'flex',
- flexDirection: 'row',
- flexWrap: 'wrap',
- flexShrink: 1,
- gap: 8,
- },
- flatlistContainer: {
- paddingBottom: Platform.OS === 'web' ? 0 : 450,
- },
- })
diff --git a/core/screens/spaces/details/components/SpaceInfoView.tsx b/core/screens/spaces/details/components/SpaceInfoView.tsx
index e20606bc1017f0fe312e7cb847ad32ecb74feade..ba15212bd3665a1dac94d69d0c8394dae756cf7d 100644
--- a/core/screens/spaces/details/components/SpaceInfoView.tsx
+++ b/core/screens/spaces/details/components/SpaceInfoView.tsx
@@ -4,8 +4,6 @@ import { useCallback } from 'react'
import { useTranslation } from 'react-i18next'
import { type StyleProp, StyleSheet, View, type ViewStyle } from 'react-native'
-import InfoModal from '@holi/core/components/InfoModal'
-import { termsBySortNumberComparator } from '@holi/core/domain/shared/types'
import { HoliLink } from '@holi/core/navigation/components/HoliLink'
import useRouting from '@holi/core/navigation/hooks/useRouting'
import SpaceAvatar from '@holi/core/screens/spaces/components/SpaceAvatar'
@@ -14,7 +12,6 @@ import SpaceSection from '@holi/core/screens/spaces/components/SpaceSection'
import SpaceWelcome from '@holi/core/screens/spaces/details/components/SpaceWelcome'
import SpacesHorizontalSlider from '@holi/core/screens/spaces/discover/components/SpacesHorizontalSlider'
import SpacesSeeMore from '@holi/core/screens/spaces/discover/components/SpacesSeeMore'
-import { SDG_INFO_MODAL_SOURCES_MAPPING } from '@holi/core/screens/spaces/edit/EditSpace'
import type { RelatedSpace, Space } from '@holi/core/screens/spaces/types'
import type { Paged } from '@holi/core/types'
import { HoliIcon } from '@holi/icons/src/HoliIcon'
@@ -43,11 +40,6 @@ const SpaceInfoView: React.FC<SpaceInfoViewProps> = ({ space, style }: SpaceInfo
const { theme } = useTheme()
const { colors } = theme
- const { show: showInfoModal, hide: closeInfoModal, visible: infoModalVisible } = useModalState()
- const partner = SDG_INFO_MODAL_SOURCES_MAPPING['sdg']
-
- const sdgs = space.sdgs ? [...space.sdgs].sort(termsBySortNumberComparator) : []
-
const links = space.links || []
const hasManyLinkedSpaces = !!(space.childSpaces && space.childSpaces.totalResults > 4)
@@ -90,22 +82,6 @@ const SpaceInfoView: React.FC<SpaceInfoViewProps> = ({ space, style }: SpaceInfo
</SpaceSection>
)}
- {!!sdgs.length && (
- <SpaceSection title={t('spaces.spaceDetails.sdgs')} infoIcon onPressInfo={showInfoModal}>
- <View style={styles.listContainer}>
- {sdgs.map((sdg, index) => (
- <ChipLabel key={`sdg_${index}`} color="white">{`${sdg.number}. ${sdg.title}`}</ChipLabel>
- ))}
- </View>
- <InfoModal
- items={{ sdg: partner }}
- shown={infoModalVisible}
- onDismiss={closeInfoModal}
- i18nPrefix={'spaces.input.sdgs.infoModal'}
- />
- </SpaceSection>
- )}
-
{(!!space.contactDescription || !!space.contactEmail || !!space.contactPhone) && (
<SpaceSection title={t('spaces.spaceDetails.contact')}>
<View style={styles.contactWrapper}>
diff --git a/core/screens/spaces/edit/EditSpace.tsx b/core/screens/spaces/edit/EditSpace.tsx
index 14f1e0e1b31bb1977f3413f719b56659ac392bcb..c2f1b21099bce3b705ead9233195d423fa9d1d70 100644
--- a/core/screens/spaces/edit/EditSpace.tsx
+++ b/core/screens/spaces/edit/EditSpace.tsx
@@ -6,9 +6,7 @@ import { Platform, ScrollView, StyleSheet, View, useWindowDimensions } from 'rea
import type { NativeStackScreenProps } from '@react-navigation/native-stack'
-import InfoModal, { type InfoModalItemProps } from '@holi/core/components/InfoModal'
import PermissionsGuard, { PermissionsType } from '@holi/core/components/PermissionsGuard'
-import { termsBySortNumberComparator } from '@holi/core/domain/shared/types'
import useIsomorphicLayoutEffect from '@holi/core/helpers/useIsomorphicLayoutEffect'
import HeaderBackButton from '@holi/core/navigation/components/HeaderBackButton'
import createParamHooks from '@holi/core/navigation/hooks/useParam'
@@ -25,7 +23,6 @@ import EditSpaceCoverImage from '@holi/core/screens/spaces/edit/components/EditS
import EditSpaceLinks from '@holi/core/screens/spaces/edit/components/EditSpaceLinks'
import EditSpaceLocation from '@holi/core/screens/spaces/edit/components/EditSpaceLocation'
import EditSpaceNameAndGoal from '@holi/core/screens/spaces/edit/components/EditSpaceNameAndGoal'
-import EditSpaceSDGs from '@holi/core/screens/spaces/edit/components/EditSpaceSDGs'
import EditSpaceTopics from '@holi/core/screens/spaces/edit/components/EditSpaceTopics'
import { useSpace } from '@holi/core/screens/spaces/hooks/useSpace'
import { SpaceConnectionType } from '@holi/core/screens/spaces/types'
@@ -49,7 +46,6 @@ import { Button } from 'holi-bricks/components/button'
enum EditFields {
NAME = 'NAME',
TOPICS = 'TOPICS',
- SDGS = 'SDGS',
COVER_IMAGE = 'COVER_IMAGE',
AVATAR = 'AVATAR',
LOCATION = 'LOCATION',
@@ -60,7 +56,6 @@ enum EditFields {
const editTitles: Record<EditFields, string> = {
[EditFields.NAME]: 'spaces.input.nameAndGoal.title',
[EditFields.TOPICS]: 'spaces.input.topics.title',
- [EditFields.SDGS]: 'spaces.input.sdgs.title',
[EditFields.COVER_IMAGE]: 'spaces.edit.mainImage',
[EditFields.AVATAR]: 'spaces.edit.avatar',
[EditFields.LOCATION]: 'spaces.input.location.title',
@@ -106,20 +101,6 @@ const onboardingContentList: Array<OnboardingCard> = [
},
]
-export const SDG_INFO_MODAL_SOURCES_MAPPING: {
- [name: string]: InfoModalItemProps
-} = {
- sdg: {
- wordmark: {
- src: require('@holi/ui/assets/img/misc/sgd-wordmark.svg'),
- width: 115,
- height: 60,
- isSvg: true,
- },
- url: 'https://sdgs.un.org/goals',
- },
-}
-
const EditSpace: React.FC<ScreenProps> = () => {
const [spaceIdOrName] = useParam('spaceIdOrName')
const [isOnboarding] = useParam('onboarding')
@@ -148,9 +129,6 @@ const EditSpace: React.FC<ScreenProps> = () => {
}
}, [show, isOnboarding])
- const { show: showInfoModal, hide: closeInfoModal, visible: infoModalVisible } = useModalState()
- const partner = SDG_INFO_MODAL_SOURCES_MAPPING['sdg']
-
const openEditModal = useCallback(
(type: EditFields) => {
// if pressed too soon, the state is set to non null, but the modal is not shown.
@@ -183,8 +161,6 @@ const EditSpace: React.FC<ScreenProps> = () => {
return <></>
}
- const sdgs = space.sdgs ? [...space.sdgs].sort(termsBySortNumberComparator) : []
-
const handleModalClose = () => {
if (isOnboarding) {
// remove onboarding param to avoid going back to onboarding in case user clicks nav-button-back
@@ -285,27 +261,6 @@ const EditSpace: React.FC<ScreenProps> = () => {
{space.location && <HoliText>{space.location}</HoliText>}
</SpaceSectionEditable>
- <SpaceSectionEditable
- title={t('spaces.spaceDetails.sdgs')}
- infoIcon
- onPressInfo={showInfoModal}
- onEditPress={() => openEditModal(EditFields.SDGS)}
- testID="space-edit-sdgs"
- >
- {!!space.sdgs?.length && (
- <View style={styles.listContainer} testID="space-edit-sdgs-list">
- {sdgs.map((sdg, index) => (
- <ChipLabel key={`sdg_${index}`} color="white">{`${sdg.number}. ${sdg.title}`}</ChipLabel>
- ))}
- </View>
- )}
- <InfoModal
- items={{ sdg: partner }}
- shown={!!infoModalVisible}
- onDismiss={closeInfoModal}
- i18nPrefix={'spaces.input.sdgs.infoModal'}
- />
- </SpaceSectionEditable>
<SpaceSectionEditable
title={t('spaces.spaceDetails.contact')}
onEditPress={() => openEditModal(EditFields.CONTACT)}
@@ -371,7 +326,6 @@ const EditSpace: React.FC<ScreenProps> = () => {
<>
{editField === EditFields.NAME && <EditSpaceNameAndGoal space={space} onDismiss={hide} />}
{editField === EditFields.TOPICS && <EditSpaceTopics space={space} onDismiss={hide} />}
- {editField === EditFields.SDGS && <EditSpaceSDGs space={space} onDismiss={hide} />}
{editField === EditFields.COVER_IMAGE && <EditSpaceCoverImage space={space} onDismiss={hide} />}
{editField === EditFields.AVATAR && <EditSpaceAvatar space={space} onDismiss={hide} />}
{editField === EditFields.LOCATION && <EditSpaceLocation space={space} onDismiss={hide} />}
diff --git a/core/screens/spaces/edit/components/EditSpaceSDGs.tsx b/core/screens/spaces/edit/components/EditSpaceSDGs.tsx
deleted file mode 100644
index b4572020e2abd26a20a2cf8fc78882ce69b50bcf..0000000000000000000000000000000000000000
--- a/core/screens/spaces/edit/components/EditSpaceSDGs.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useMutation } from '@apollo/client'
-import React, { useState } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import type { Term } from '@holi/core/domain/shared/types'
-import { useErrorHandling } from '@holi/core/errors/hooks'
-import { SpaceSDGsInput } from '@holi/core/screens/spaces/components/SpaceInputs/SpaceSDGsInput'
-import EditSpaceModalWithFooter from '@holi/core/screens/spaces/edit/components/EditSpaceModalWithFooter'
-import { updateSpaceMutation } from '@holi/core/screens/spaces/edit/mutations'
-import type { Space } from '@holi/core/screens/spaces/types'
-import { HoliToastType, useToast } from '@holi/ui/components/molecules/HoliToastProvider'
-
-type EditSpaceSDGsProps = {
- space: Space
- onDismiss: () => void
-}
-
-const EditSpaceSDGs = ({ space, onDismiss }: EditSpaceSDGsProps) => {
- const [sdgs, setSdgs] = useState<Term[]>([...(space?.sdgs || [])])
- const { openToast } = useToast()
- const { displayError } = useErrorHandling()
-
- const [updateSpace] = useMutation(updateSpaceMutation, {
- onCompleted: () => {
- openToast(t('spaces.edit.success'), HoliToastType.SUCCESS)
- onDismiss()
- },
- onError: (error) =>
- displayError(error, 'Failed to update space SDGs', {
- location: 'EditSpaceSDGs.updateSpace',
- spaceId: space.id,
- }),
- })
-
- const { t } = useTranslation()
-
- const onSave = () => updateSpace({ variables: { input: { id: space.id, sdgs: sdgs.map((sdg) => sdg.id) } } })
-
- return (
- <EditSpaceModalWithFooter onDismiss={onDismiss} onSave={onSave}>
- <SpaceSDGsInput
- description={t('spaces.input.sdgs.description')}
- searchPlaceholder={t('spaces.input.sdgs.search')}
- selected={sdgs}
- onSelect={setSdgs}
- />
- </EditSpaceModalWithFooter>
- )
-}
-
-export default EditSpaceSDGs
diff --git a/core/screens/spaces/edit/mutations.ts b/core/screens/spaces/edit/mutations.ts
index 858650050a5b3daf200e69f15c0ab536d0d74ce2..6e157210af4ce7e6fe15ff63221bb4e840ce4f11 100644
--- a/core/screens/spaces/edit/mutations.ts
+++ b/core/screens/spaces/edit/mutations.ts
@@ -11,7 +11,6 @@ export const UpdateSpaceInputSchema = z.object({
location: z.string().optional(),
avatar: z.instanceof(Object).optional(),
topicsV2: z.array(z.string()).optional(),
- sdgs: z.array(z.string()).optional(),
contactDescription: z.string().optional(),
contactEmail: z.string().email().optional(),
contactPhone: z.string().optional(),
@@ -38,11 +37,6 @@ export const updateSpaceMutation = gql`
longitude
}
topicsV2
- sdgs {
- id
- title
- number
- }
links {
id
type
diff --git a/core/screens/spaces/queries.ts b/core/screens/spaces/queries.ts
index fc820c421a3491681e04503714b1c5ea4eca8f7a..95f020d6265570a40e4c59331ee719f7a9917e46 100644
--- a/core/screens/spaces/queries.ts
+++ b/core/screens/spaces/queries.ts
@@ -164,11 +164,6 @@ export const FullSpaceFragment = gql`
...FullTask
}
topicsV2
- sdgs {
- id
- title
- number
- }
onboarding {
steps {
text
diff --git a/core/screens/spaces/types.ts b/core/screens/spaces/types.ts
index c5d545dc38b6c3a600738a6bd523590f7614e4e3..6ea95e40d94158a47ee8caf8f888ba79302c22d9 100644
--- a/core/screens/spaces/types.ts
+++ b/core/screens/spaces/types.ts
@@ -1,4 +1,4 @@
-import type { SDG, User } from '@holi/core/domain/shared/types'
+import type { User } from '@holi/core/domain/shared/types'
import type { AppointmentInput } from '@holi/core/screens/appointments/types'
import type { Post } from '@holi/core/screens/posts/types'
import type { GeolocationPoint, Paged } from '@holi/core/types'
@@ -121,7 +121,6 @@ export interface Space {
avatarBlurhash?: string
tasks?: Task[]
topicsV2?: string[]
- sdgs?: SDG[]
collaborationTools?: SpaceCollaborationTool[]
posts?: Paged<Post>
hasPublicPosts?: boolean
diff --git a/core/screens/userprofile/OwnProfile.tsx b/core/screens/userprofile/OwnProfile.tsx
index cf459ecb218842efae1d8b3b32606a6e6827bbb3..4a039a723faaa8ef793bd4a85c2d94882b6408d3 100644
--- a/core/screens/userprofile/OwnProfile.tsx
+++ b/core/screens/userprofile/OwnProfile.tsx
@@ -14,7 +14,6 @@ import useRouting from '@holi/core/navigation/hooks/useRouting'
import { useSetScreenOptions } from '@holi/core/navigation/hooks/useScreenOptions'
import CreatePostButton, { ButtonFloatingWrapper } from '@holi/core/screens/individualPosts/components/CreatePostButton'
import OwnProfileView, { type EditModeState, Tab } from '@holi/core/screens/userprofile/components/OwnProfileView'
-import { UserSDGsChipLoader } from '@holi/core/screens/userprofile/components/UserSDGsChipLoader'
import UserEngagementLevelForm from '@holi/core/screens/userprofile/components/UserEngagementLevelForm'
import UserProfileForm from '@holi/core/screens/userprofile/components/UserProfileForm'
import { Edit2, Settings3, Share } from '@holi/icons/src/generated'
@@ -153,7 +152,6 @@ const OwnProfile = () => {
)}
{editMode === 'interests' && <UserTermsForm user={user} onSubmit={onSubmit} termType="topic" />}
{editMode === 'skills' && <UserTermsForm user={user} onSubmit={onSubmit} termType="skill" />}
- {editMode === 'sdgs' && <UserSDGsChipLoader user={user} onSubmit={onSubmit} />}
</HoliKeyboardSaveView>
</HoliModal>
)}
diff --git a/core/screens/userprofile/UserProfile.tsx b/core/screens/userprofile/UserProfile.tsx
index 5b818755a2ef6654f6ce4be4c76f1da402e4198e..2d5922c46f4be93af2c6f8da14726ec863a185e9 100644
--- a/core/screens/userprofile/UserProfile.tsx
+++ b/core/screens/userprofile/UserProfile.tsx
@@ -22,7 +22,6 @@ import { useSetScreenOptions } from '@holi/core/navigation/hooks/useScreenOption
import { ContentType, ContentType3K } from '@holi/core/queries'
import { useOnRefresh } from '@holi/core/refreshing/hooks/useOnRefresh'
import OtherPostsTab from '@holi/core/screens/individualPosts/components/OtherPostsTab'
-import UserSDGsChipRow from '@holi/core/screens/userprofile/components/UserSDGsChipRow'
import UserProfileView from '@holi/core/screens/userprofile/components/UserProfileView'
import { CloseCircle, Flag } from '@holi/icons/src/generated'
import HoliContainer from '@holi/ui/components/atoms/HoliContainer'
@@ -143,9 +142,8 @@ const UserProfile = () => {
}
const hasInterests = !!user.interestsV2?.length
- const hasSdgs = !!user.sdgs?.length
const hasSkills = !!user.skillsV2?.length
- const hasInfo = user.engagementLevel || hasInterests || hasSdgs || hasSkills
+ const hasInfo = user.engagementLevel || hasInterests || hasSkills
const tabsData = [
{
@@ -170,11 +168,6 @@ const UserProfile = () => {
<UserTermsRow termType="topic" />
</View>
)}
- {hasSdgs && (
- <View style={styles.chipRowContainer} key={UserChipTypes.SDGS}>
- <UserSDGsChipRow user={user} />
- </View>
- )}
{hasSkills && (
<View style={styles.chipRowContainer} key={UserChipTypes.SKILLS}>
<UserTermsRow termType="skill" />
diff --git a/core/screens/userprofile/components/OwnProfileView.tsx b/core/screens/userprofile/components/OwnProfileView.tsx
index 0938cd73507f61bb53e515a58dcb985a82af4c71..94c300343d8d0c2f777b7cc6e185dd5a8bc91678 100644
--- a/core/screens/userprofile/components/OwnProfileView.tsx
+++ b/core/screens/userprofile/components/OwnProfileView.tsx
@@ -13,7 +13,6 @@ import { logError } from '@holi/core/errors/helpers'
import type { InsightsByUserIdResponse } from '@holi/core/queries'
import { insightsByUserIdTotalResultsQuery } from '@holi/core/queries'
import MyPostsTab from '@holi/core/screens/individualPosts/components/MyPostsTab'
-import UserSDGsChipRow from '@holi/core/screens/userprofile/components/UserSDGsChipRow'
import UserProfileView from '@holi/core/screens/userprofile/components/UserProfileView'
import { Add } from '@holi/icons/src/generated'
import HoliContainer from '@holi/ui/components/atoms/HoliContainer'
@@ -26,7 +25,7 @@ import OwnConnectionsTab from '@holi/core/screens/userprofile/components/OwnConn
import { UserTermsRow } from '@holi/core/screens/userprofile/components/UserTermsRow'
import { UserChipTypes } from '@holi/core/screens/userprofile/types'
-export type EditModeState = 'profile' | 'engagementLevel' | 'interests' | 'skills' | 'sdgs'
+export type EditModeState = 'profile' | 'engagementLevel' | 'interests' | 'skills'
export enum Tab {
PROFILE = 'profile',
@@ -106,9 +105,6 @@ const OwnProfileView = ({ user, toggleEditMode, activeTab, onTabChange }: PropsW
<View style={styles.chipRowContainer} key={UserChipTypes.INTERESTS}>
<UserTermsRow termType="topic" onPressEdit={() => toggleEditMode(UserChipTypes.INTERESTS)} />
</View>
- <View style={styles.chipRowContainer} key={UserChipTypes.SDGS}>
- <UserSDGsChipRow user={user} onPressEdit={() => toggleEditMode(UserChipTypes.SDGS)} />
- </View>
<View style={styles.chipRowContainer} key={UserChipTypes.SKILLS}>
<UserTermsRow termType="skill" onPressEdit={() => toggleEditMode(UserChipTypes.SKILLS)} />
</View>
diff --git a/core/screens/userprofile/components/UserSDGsChipForm.tsx b/core/screens/userprofile/components/UserSDGsChipForm.tsx
deleted file mode 100644
index ae7f14cbe93179ded0586c76f7b91de050aaef9e..0000000000000000000000000000000000000000
--- a/core/screens/userprofile/components/UserSDGsChipForm.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { ChipSelect } from 'holi-bricks/components/chips'
-import type React from 'react'
-import { useTranslation } from 'react-i18next'
-import { StyleSheet, View } from 'react-native'
-
-import type { SDG } from '@holi/core/domain/shared/types'
-import { Search } from '@holi/icons/src/generated'
-import HoliText from '@holi/ui/components/atoms/HoliText'
-import HoliChipRow from '@holi/ui/components/molecules/HoliChipRow'
-import HoliTextInput from '@holi/ui/components/molecules/HoliTextInput'
-import type { ChipSelectSize } from 'holi-bricks/components/chips/size'
-import { HoliTransition } from '@holi/ui/components/atoms/HoliTransition'
-import HoliLoader from '@holi/ui/components/molecules/HoliLoader'
-
-export interface SelectableSDG extends SDG {
- selected?: boolean
-}
-
-type UserSDGsChipFormProps = {
- filterString?: string
- onFilterStringChange: (value: string) => void
- terms: SelectableSDG[]
- onTermSelect: (id: string) => void
- loading?: boolean
- size?: ChipSelectSize
- testID?: string
-}
-
-export const UserSDGsChipForm = ({
- filterString,
- onFilterStringChange,
- terms,
- onTermSelect,
- loading = false,
- size = 'md',
- testID = 'user-chip-form',
-}: UserSDGsChipFormProps) => {
- const { t } = useTranslation()
-
- return (
- <View testID={testID}>
- <HoliText style={styles.subline}>{t('user.sdgs.form.subline')}</HoliText>
-
- <HoliTextInput
- aria-label={t('profile.sdgs.filter.placeholder')}
- value={filterString}
- placeholder={t('profile.sdgs.filter.placeholder')}
- onChange={onFilterStringChange}
- trailingIcon={Search}
- style={styles.input}
- testID={`${testID}-search-input`}
- />
-
- <HoliTransition.FadeSwitch animKey={loading ? 'loader' : 'chips'}>
- {loading ? (
- <HoliLoader testID={`${testID}-loader`} />
- ) : terms.length > 0 ? (
- <HoliChipRow editable={false} editButtonLabel="">
- {terms.map(({ id, selected, title, slug }) => (
- <ChipSelect
- key={id}
- onPress={() => onTermSelect(id)}
- selected={selected}
- selectedColor={'green'}
- size={size}
- testID={`${testID}--${slug}-chip`}
- >
- {title}
- </ChipSelect>
- ))}
- </HoliChipRow>
- ) : (
- <HoliText style={styles.subline}>{t('profile.sdgs.filter.empty')}</HoliText>
- )}
- </HoliTransition.FadeSwitch>
- </View>
- )
-}
-
-const styles = StyleSheet.create({
- scrollViewContent: {
- paddingHorizontal: 16,
- alignItems: 'center',
- paddingBottom: 150,
- },
- headline: {
- marginBottom: 16,
- },
- subline: {
- marginBottom: 24,
- textAlign: 'left',
- },
- input: {
- marginBottom: 16,
- },
-})
diff --git a/core/screens/userprofile/components/UserSDGsChipLoader.tsx b/core/screens/userprofile/components/UserSDGsChipLoader.tsx
deleted file mode 100644
index 54ae56a1184c179e34b48551486cdb1fe51dd498..0000000000000000000000000000000000000000
--- a/core/screens/userprofile/components/UserSDGsChipLoader.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import React, { useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
-import { StyleSheet, View } from 'react-native'
-
-import { UserSDGsChipForm } from '@holi/core/screens/userprofile/components/UserSDGsChipForm'
-import HoliBox from '@holi/ui/components/atoms/HoliBox'
-import HoliText from '@holi/ui/components/atoms/HoliText'
-import HoliModalContentWrapper from '@holi/ui/components/molecules/HoliModalContentWrapper'
-import { type HoliTheme, useTheme } from '@holi/ui/styles/theme'
-import type { User } from '@holi/core/domain/shared/types'
-import { useUserSDGs } from '@holi/core/screens/userprofile/components/hooks/useUserSDGs'
-
-interface UserSDGsChipLoaderProps {
- user?: User | null
- onSubmit?: (user: User) => void
-}
-
-export const UserSDGsChipLoader = ({ user, onSubmit }: UserSDGsChipLoaderProps) => {
- const { t } = useTranslation()
- const { theme } = useTheme()
- const styles = useMemo(() => getStyles(theme), [theme])
- const {
- filterString,
- onFilterStringChange,
- sdgs,
- onSDGSelect,
- onSubmit: submitHandler,
- loading,
- } = useUserSDGs({ user, onSubmit })
-
- const notificationComponent = user ? null : (
- <View style={styles.notification}>
- <HoliText>{t('user.profileView.noUser')}</HoliText>
- </View>
- )
-
- return (
- <HoliModalContentWrapper
- actionButtonText={t('user.profileForm.save')}
- onActionButtonPress={submitHandler}
- headlineText={t('user.sdgs.form.headline')}
- prependChildren={notificationComponent}
- hideFooterWhenKeyboardIsOpen={true}
- style={styles.modalWrapper}
- loading={loading}
- testID="user-profile-chipform"
- >
- <HoliBox padding={[0, 24]}>
- <UserSDGsChipForm
- filterString={filterString}
- onFilterStringChange={onFilterStringChange}
- terms={sdgs}
- onTermSelect={onSDGSelect}
- />
- </HoliBox>
- </HoliModalContentWrapper>
- )
-}
-
-const getStyles = (theme: HoliTheme) =>
- StyleSheet.create({
- modalWrapper: {
- flex: 1,
- },
- notification: {
- ...StyleSheet.absoluteFillObject,
- alignItems: 'center',
- justifyContent: 'center',
- marginHorizontal: 16,
- zIndex: 10,
- backgroundColor: theme.colors.background10,
- },
- })
diff --git a/core/screens/userprofile/components/UserSDGsChipRow.tsx b/core/screens/userprofile/components/UserSDGsChipRow.tsx
deleted file mode 100644
index d50070d3c1e91438ff9af70d8b01382e05722aba..0000000000000000000000000000000000000000
--- a/core/screens/userprofile/components/UserSDGsChipRow.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { ChipAction, ChipLabel } from 'holi-bricks/components/chips'
-import type React from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { type User, termsByTitleComparator } from '@holi/core/domain/shared/types'
-import { Add } from '@holi/icons/src/generated'
-import HoliChipRow from '@holi/ui/components/molecules/HoliChipRow'
-
-type UserSDGsChipRowProps = {
- onPressEdit?: () => void
- user: User
-}
-
-export const UserSDGsChipRow = ({ onPressEdit, user }: UserSDGsChipRowProps) => {
- const terms = user ? user.sdgs || [] : []
- const sortedTerms = [...terms].sort(termsByTitleComparator)
- const { t } = useTranslation()
-
- return (
- <HoliChipRow
- editable={!!onPressEdit}
- title={t('profile.sdgs')}
- editButtonLabel={t('profile.sdgs.edit')}
- onPressEdit={onPressEdit}
- testID={'user-profile-sdgs'}
- >
- {sortedTerms.length > 0 || !onPressEdit ? (
- /** FIXME convert to VirtualizedList, FlatList or SectionList */
- sortedTerms.map((term) => (
- <ChipLabel key={term.id} color="white" testID={`sdgs--${term.slug}`}>
- {term.title}
- </ChipLabel>
- ))
- ) : (
- <ChipAction onPress={onPressEdit} color="white" iconTrailing={Add} aria-label={t('profile.sdgs.add')} />
- )}
- </HoliChipRow>
- )
-}
-
-export default UserSDGsChipRow
diff --git a/core/screens/userprofile/components/hooks/useUserSDGs.ts b/core/screens/userprofile/components/hooks/useUserSDGs.ts
deleted file mode 100644
index c5e56a1107b616065eda176958f173f6f0d22b71..0000000000000000000000000000000000000000
--- a/core/screens/userprofile/components/hooks/useUserSDGs.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { useMutation } from '@apollo/client'
-import { useCallback, useState } from 'react'
-
-import { authenticatedUserV2Query } from '@holi/core/domain/shared/queries'
-import { type SDG, type User, termsByTitleComparator } from '@holi/core/domain/shared/types'
-import { useErrorHandling } from '@holi/core/errors/hooks'
-import {
- type UpdateAuthenticatedUserInput,
- type UpdateAuthenticatedUserV2Response,
- updateAuthenticatedUserV2Mutation,
-} from '@holi/core/screens/userprofile/queries'
-import { UserChipTypes } from '@holi/core/screens/userprofile/types'
-import type { SelectableSDG } from '@holi/core/screens/userprofile/components/UserSDGsChipForm'
-import { useSDGs } from '@holi/core/domain/shared/hooks'
-
-interface UseUserChipsOptions {
- user?: User | null
- onSubmit?: (user: User) => void
-}
-
-const getSortedAndFilteredSDGs = (
- availableTerms: readonly SDG[],
- selectedTerms: readonly SDG[],
- filterString = ''
-): SelectableSDG[] => {
- const unselectedSDGs = availableTerms.filter((sdg) => !selectedTerms.find((t) => t.id === sdg.id))
- const orderedSDGs = [
- ...[...selectedTerms].sort(termsByTitleComparator).map((sdg) => ({ ...sdg, selected: true })),
- ...[...unselectedSDGs].sort(termsByTitleComparator),
- ]
- return filterString
- ? orderedSDGs.filter((sdg: SDG) => sdg.title.toLowerCase().includes(filterString.toLowerCase()))
- : orderedSDGs
-}
-
-export const useUserSDGs = ({ user, onSubmit }: UseUserChipsOptions) => {
- const keyInUserObject = UserChipTypes.SDGS
- const { displayError } = useErrorHandling()
- const { sdgsLoading, sdgs } = useSDGs()
- const [updateUser, { loading: updateUserLoading, error: updateUserError }] =
- useMutation<UpdateAuthenticatedUserV2Response>(updateAuthenticatedUserV2Mutation)
-
- const [filterString, setFilterString] = useState('')
-
- const [selectedSDGs, setSelectedSDGs] = useState(user?.[keyInUserObject] ?? [])
- const sortedAndFilteredSDGs = getSortedAndFilteredSDGs(sdgs, selectedSDGs, filterString)
-
- const onSDGSelect = useCallback(
- (id: string) =>
- setSelectedSDGs((currentlySelectedSDGs) => {
- // find changed SDG by ID
- const changedTerm = sdgs.find((sdg) => sdg.id === id)
-
- // if not found, do not change anything
- if (!changedTerm) return currentlySelectedSDGs
-
- // check if the SDG was selected or deselected and add or remove it from `selectedSDGs`
- return currentlySelectedSDGs.some((sdg) => sdg.id === id)
- ? currentlySelectedSDGs.filter((sdg) => sdg.id !== id)
- : [...currentlySelectedSDGs, changedTerm]
- }),
- [sdgs]
- )
-
- const submit = useCallback(async () => {
- const input = {} as UpdateAuthenticatedUserInput
- input[keyInUserObject] = selectedSDGs.map(({ id }: SDG) => id)
-
- const { data } = await updateUser({
- variables: { input },
- refetchQueries: [{ query: authenticatedUserV2Query, fetchPolicy: 'network-only' }],
- })
-
- if (data) {
- onSubmit?.(data.updateAuthenticatedUserV2)
- }
- }, [keyInUserObject, onSubmit, selectedSDGs, updateUser])
-
- if (updateUserError) {
- displayError(updateUserError, 'Failed to update user', {
- location: 'useUserChips',
- field: keyInUserObject,
- })
- }
-
- return {
- filterString,
- onFilterStringChange: setFilterString,
- sdgs: sortedAndFilteredSDGs,
- onSDGSelect,
- onSubmit: submit,
- loading: sdgsLoading || updateUserLoading,
- }
-}
diff --git a/core/screens/userprofile/queries.graphql b/core/screens/userprofile/queries.graphql
index 5c531fa53db505d222c05b846c1f4293a15d1437..9a3da4be828285b0bca694af8b7af50af485a98f 100644
--- a/core/screens/userprofile/queries.graphql
+++ b/core/screens/userprofile/queries.graphql
@@ -15,11 +15,6 @@ fragment FullUser on User {
geolocationId
engagementLevel
interestsV2
- sdgs {
- id
- title
- slug
- }
skillsV2
connectionStatusToMyself
}
diff --git a/core/screens/userprofile/queries.ts b/core/screens/userprofile/queries.ts
index 4f75263120024c3db5bf222d9bed6135927e502a..516a9a13a4c3b4edcab47b84b820def3212fdc9b 100644
--- a/core/screens/userprofile/queries.ts
+++ b/core/screens/userprofile/queries.ts
@@ -20,7 +20,6 @@ export const UpdateAuthenticatedUserInputSchema = z.object({
geolocation: z.instanceof(Object).optional(),
engagementLevel: z.string().optional(),
interestsV2: z.array(z.string()).optional(),
- sdgs: z.array(z.string() /* UUID */).optional(),
skillsV2: z.array(z.string()).optional(),
trackingConsentAnalytics: z.boolean().optional().nullable(),
trackingConsentPersonalization: z.boolean().optional().nullable(),
diff --git a/core/screens/userprofile/types.ts b/core/screens/userprofile/types.ts
index 9feabe40d9bab3cd975065af8941829e0988948d..9ae9aa744c97e071b02fa21b950972bf49d94163 100644
--- a/core/screens/userprofile/types.ts
+++ b/core/screens/userprofile/types.ts
@@ -18,5 +18,4 @@ export enum UpdateConnectionWithUserActions {
export enum UserChipTypes {
INTERESTS = 'interests',
SKILLS = 'skills',
- SDGS = 'sdgs',
}
diff --git a/e2e/web/tests/needs-predefined-e2e-account/userProfile.spec.ts b/e2e/web/tests/needs-predefined-e2e-account/userProfile.spec.ts
index 30b06b115795aeb137155f7a636719374bf5f34a..73207b78e016815ef6e69df433f06a61375d9baf 100644
--- a/e2e/web/tests/needs-predefined-e2e-account/userProfile.spec.ts
+++ b/e2e/web/tests/needs-predefined-e2e-account/userProfile.spec.ts
@@ -9,10 +9,9 @@ test.describe('@Profile', () => {
// FIXME: https://holi.atlassian.net/browse/HOLI-9014
// await loginAsE2EUser(context, page)
// await clickElementByTestId(page, 'btn-to-profile-view')
- // fill the interests, skills and sdgs for visiting the profile later
+ // fill the interests and skills for visiting the profile later
// await checkChipsSelection(page, 'interests')
// await checkChipsSelection(page, 'skills')
- // await checkChipsSelection(page, 'sdgs')
// now test with a generated user for not messing too much with the profile of the E2E user
const { page: otherPage } = await sessions.signUp()
diff --git a/e2e/web/tests/spaces.spec.ts b/e2e/web/tests/spaces.spec.ts
index 8a054017ea072afe5bba035f9a0b0626a43719ab..74f212dd16853a25b678eea8a6e6efd764f79b4e 100644
--- a/e2e/web/tests/spaces.spec.ts
+++ b/e2e/web/tests/spaces.spec.ts
@@ -225,16 +225,6 @@ const testCreatingEditingSpace = async (page: Page) => {
await saveAndWaitForModalClosed(page)
}
- // edit space sdgs
- await clickElementByTestId(page, 'btn-space-edit-sdgs')
- await waitForAnimationEnd(page, byTestId('space-chips-modal-animatedview'))
- await selectSomeTerms(page, numberOfEditedTerms)
- await saveAndWaitForModalClosed(page)
-
- // check if the correct number of sdgs have been selected
- const sdgsChips = page.locator(`${byTestId('space-edit-sdgs-list')} [role="presentation"]`)
- await expect(sdgsChips.count()).resolves.toBe(numberOfEditedTerms)
-
await editSpaceContactInfo(page)
await clickElementByTestId(page, 'space-edit-close')
diff --git a/packages/api/graphql/client.ts b/packages/api/graphql/client.ts
index b744924ea747013703113a4809f42912ccf3301a..bb4e299c70e4995770e453cae850a100f2dc05a8 100644
--- a/packages/api/graphql/client.ts
+++ b/packages/api/graphql/client.ts
@@ -92,21 +92,18 @@ export const createCache = () =>
fields: {
interests: alwaysReplacePolicy,
skills: alwaysReplacePolicy,
- sdgs: alwaysReplacePolicy,
},
},
AuthenticatedUser: {
fields: {
interests: alwaysReplacePolicy,
skills: alwaysReplacePolicy,
- sdgs: alwaysReplacePolicy,
},
},
Comment: {
fields: {
interests: alwaysReplacePolicy,
skills: alwaysReplacePolicy,
- sdgs: alwaysReplacePolicy,
},
},
AppGoodNews_GoodNewsArticlesQueryResponse: {
@@ -124,7 +121,6 @@ export const createCache = () =>
Space: {
fields: {
tasks: alwaysReplacePolicy,
- sdgs: alwaysReplacePolicy,
links: alwaysReplacePolicy,
collaborationTools: alwaysReplacePolicy,
connectionStatusToMyself: alwaysReplacePolicy,
diff --git a/packages/ui/assets/img/misc/sgd-wordmark.svg b/packages/ui/assets/img/misc/sgd-wordmark.svg
deleted file mode 100644
index e2dc30d57ab4e82eb52c1fb25d576340cfb36f37..0000000000000000000000000000000000000000
--- a/packages/ui/assets/img/misc/sgd-wordmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="115" height="60" fill="none" viewBox="0 0 115 60"><g clip-path="url(#a)"><path fill="#029CD9" d="M21.657 56.22c-.974 1.188-2.345 2.102-4.142 2.773-1.797.67-3.777 1.006-5.97 1.006-2.284.03-4.294-.458-6.03-1.463-1.737-.975-3.077-2.437-4.021-4.327C.55 52.32.032 50.065 0 47.505v-1.797c-.03-2.651.427-4.936 1.28-6.887.883-1.95 2.162-3.443 3.837-4.48 1.676-1.035 3.625-1.554 5.909-1.584 3.137-.031 5.605.7 7.401 2.194 1.798 1.493 2.833 3.657 3.199 6.52l-5.33.032c-.244-1.525-.792-2.621-1.645-3.322-.822-.7-1.98-1.036-3.442-1.036-1.858 0-3.259.731-4.234 2.133-.974 1.401-1.431 3.474-1.431 6.247v1.706c.03 2.773.548 4.876 1.614 6.277 1.066 1.402 2.62 2.103 4.66 2.103s3.503-.457 4.386-1.34l-.03-4.572-4.966.031-.03-4.022 10.417-.062.061 10.575Zm45.109-2.407-9.565.06-1.796 5.486-5.818.03 9.686-26.57 5.056-.032 10.112 26.45-5.817.03-1.858-5.454Zm-8.133-4.388 6.64-.03-3.412-9.904-3.228 9.934Zm22.874 5.363 11.605-.091.03 4.387-17.056.122-.183-26.51 5.482-.03.122 22.122Zm27.656-2.773c0-1.036-.366-1.828-1.096-2.377-.732-.548-2.041-1.127-3.93-1.736-1.888-.61-3.411-1.19-4.507-1.768-3.016-1.615-4.539-3.778-4.569-6.551 0-1.432.396-2.712 1.188-3.84.792-1.127 1.95-2.01 3.472-2.65 1.493-.641 3.198-.976 5.087-.976 1.888 0 3.593.305 5.055 1.006 1.493.67 2.65 1.645 3.473 2.894.822 1.25 1.249 2.651 1.249 4.266l-5.452.031c0-1.219-.397-2.163-1.158-2.834-.762-.67-1.858-1.006-3.229-.975-1.34 0-2.375.305-3.106.853-.731.58-1.097 1.31-1.097 2.225 0 .853.457 1.584 1.31 2.163.883.58 2.163 1.127 3.838 1.615 3.106.914 5.391 2.072 6.822 3.443 1.432 1.372 2.163 3.109 2.163 5.15.03 2.285-.853 4.114-2.558 5.424-1.737 1.31-4.051 1.98-7.006 2.011-2.04 0-3.898-.335-5.574-1.097-1.675-.731-2.954-1.737-3.838-3.047-.883-1.28-1.34-2.803-1.34-4.51l5.483-.03c.03 2.925 1.766 4.388 5.269 4.357 1.309 0 2.315-.274 3.045-.823.64-.517 1.006-1.28 1.006-2.224Z"/><path fill="#64B448" d="M31.343 42.57a8.19 8.19 0 0 1 1.188-1.524l-3.9-4.328a14.32 14.32 0 0 0-2.497 3.23l5.209 2.621Z"/><path fill="#D09F29" d="M40.937 39.522c.579.274 1.157.61 1.645 1.035l3.929-4.296a13.573 13.573 0 0 0-3.473-2.163l-2.101 5.424Z"/><path fill="#C32033" d="m49.953 40.802-5.209 2.59c.244.579.427 1.188.518 1.828l5.787-.548a14.08 14.08 0 0 0-1.096-3.87Z"/><path fill="#2D9A47" d="m44.379 42.66 5.208-2.59a13.253 13.253 0 0 0-2.436-3.23l-3.93 4.296c.427.458.823.946 1.158 1.525Z"/><path fill="#48773C" d="M30.308 46.347v-.365l-5.788-.518c-.03.274-.03.579-.03.883 0 1.097.152 2.194.395 3.23l5.605-1.614a6.903 6.903 0 0 1-.182-1.616Z"/><path fill="#FAB61B" d="M43.648 51.131a9.713 9.713 0 0 1-1.402 1.341l3.047 4.967a13.577 13.577 0 0 0 2.984-2.773l-4.629-3.535Z"/><path fill="#E8422E" d="M45.353 46.347c0 .549-.06 1.097-.182 1.585l5.604 1.614c.244-1.035.396-2.102.396-3.199 0-.274 0-.548-.03-.822l-5.788.548v.274Z"/><path fill="#F59C28" d="m32.104 51.223-4.63 3.504c.854 1.067 1.889 1.981 3.016 2.742l3.046-4.936a7.238 7.238 0 0 1-1.432-1.31Z"/><path fill="#027DBC" d="M30.429 45.159c.091-.64.304-1.28.548-1.859l-5.208-2.59a13.313 13.313 0 0 0-1.158 3.931l5.818.518Z"/><path fill="#8F1839" d="M44.561 57.835 41.516 52.9a8.987 8.987 0 0 1-1.767.731l1.066 5.729c1.34-.336 2.588-.823 3.746-1.524Z"/><path fill="#01ADD8" d="M44.958 48.755a7.791 7.791 0 0 1-.823 1.676l4.63 3.504a13.937 13.937 0 0 0 1.766-3.565l-5.573-1.615Z"/><path fill="#ED6E28" d="M38.927 53.782a6.36 6.36 0 0 1-1.097.092c-.304 0-.579-.031-.883-.06l-1.066 5.727a12.689 12.689 0 0 0 4.112-.03l-1.066-5.729Z"/><path fill="#E52330" d="M38.317 38.852a6.3 6.3 0 0 1 1.859.365l2.101-5.424a14.024 14.024 0 0 0-3.96-.761v5.82Z"/><path fill="#E01C83" d="M36.125 53.69a8.04 8.04 0 0 1-1.858-.7l-3.046 4.937c1.2.675 2.493 1.168 3.837 1.462l1.067-5.698Z"/><path fill="#1E3666" d="M35.576 39.187a7.905 7.905 0 0 1 1.889-.335V33.03a13.232 13.232 0 0 0-3.99.732l2.1 5.424Z"/><path fill="#CD8B2A" d="M31.617 50.553a7.39 7.39 0 0 1-.884-1.768L25.16 50.4c.426 1.341 1.035 2.59 1.858 3.687l4.599-3.534Z"/><path fill="#00568B" d="M33.17 40.466c.49-.4 1.033-.727 1.614-.975l-2.102-5.424c-1.248.518-2.405 1.25-3.441 2.103l3.93 4.297v-.001Z"/><path fill="#029CD9" d="M6.915 9.02c0-.427-.152-.762-.456-1.006-.305-.244-.823-.487-1.584-.731a13.095 13.095 0 0 1-1.858-.732C1.463 5.79.67 4.723.67 3.382c0-.67.183-1.25.58-1.767.395-.518.943-.914 1.644-1.188C3.595.152 4.418 0 5.3 0c.884 0 1.645.152 2.345.457a3.694 3.694 0 0 1 1.615 1.34c.395.58.578 1.22.578 1.982H6.946c0-.488-.152-.885-.457-1.158-.304-.275-.7-.396-1.218-.396s-.944.121-1.25.335c-.304.243-.456.518-.456.883 0 .305.152.58.487.853.335.244.914.518 1.767.792.853.275 1.523.55 2.07.885C9.2 6.734 9.84 7.77 9.84 9.08c0 1.067-.395 1.89-1.187 2.5-.792.609-1.889.914-3.29.914a6.736 6.736 0 0 1-2.65-.519c-.792-.365-1.4-.822-1.797-1.432a3.786 3.786 0 0 1-.61-2.103h2.925c0 .64.182 1.128.517 1.433.335.305.883.457 1.645.457.487 0 .853-.092 1.157-.305.244-.335.365-.64.365-1.005ZM20.987.122v7.922c0 .884-.182 1.677-.579 2.346a3.711 3.711 0 0 1-1.644 1.494c-.701.335-1.554.518-2.529.518-1.461 0-2.619-.396-3.472-1.158-.853-.762-1.28-1.798-1.31-3.138V.122h2.925v8.044c.03 1.31.64 1.98 1.857 1.98.61 0 1.066-.151 1.371-.487.305-.335.457-.883.457-1.614V.152h2.925l-.001-.03ZM29.24 9.02c0-.427-.152-.762-.457-1.006-.304-.244-.822-.487-1.583-.731a13.036 13.036 0 0 1-1.858-.732c-1.554-.761-2.346-1.828-2.346-3.169 0-.67.183-1.25.579-1.767.395-.518.944-.914 1.644-1.188C25.922.152 26.744 0 27.627 0c.884 0 1.645.152 2.346.457a3.695 3.695 0 0 1 1.614 1.34c.395.58.578 1.22.578 1.982h-2.893c0-.488-.152-.885-.456-1.158-.305-.275-.701-.396-1.218-.396-.519 0-.945.121-1.25.335-.304.243-.457.518-.457.883 0 .305.153.58.488.853.334.244.913.518 1.766.792.823.275 1.523.55 2.072.885 1.31.761 1.948 1.797 1.948 3.107 0 1.067-.395 1.89-1.187 2.5-.792.609-1.889.914-3.29.914a6.738 6.738 0 0 1-2.65-.519c-.79-.365-1.4-.822-1.796-1.432a3.787 3.787 0 0 1-.61-2.103h2.925c0 .64.182 1.128.517 1.433.335.305.884.457 1.645.457.487 0 .853-.092 1.157-.305.213-.335.365-.64.365-1.005Zm14.072-6.644h-3.626v9.874h-2.923V2.376H33.2V.122h10.112l.001 2.254Zm7.279 7.588h-3.99l-.7 2.255h-3.137L47.21.122h2.742l4.477 12.097h-3.138l-.7-2.255Zm-3.32-2.224h2.59l-1.31-4.206-1.28 4.206Zm11.3-7.618H55.68v12.097h2.893V.122Zm12.305 12.127h-2.893l-4.295-7.557v7.557h-2.925V.122h2.925l4.295 7.557V.122h2.893v12.127Zm9.046-2.285h-3.99l-.7 2.255h-3.107L76.573.122h2.741l4.477 12.097h-3.137l-.73-2.255Zm-3.29-2.224h2.59l-1.31-4.206-1.28 4.206Zm8.163 4.51V.152h4.356c1.553 0 2.741.274 3.563.853.823.58 1.219 1.402 1.219 2.5 0 .639-.153 1.157-.427 1.614-.273.457-.7.762-1.279.975.64.152 1.127.488 1.462.945.335.457.518 1.005.518 1.676 0 1.188-.365 2.072-1.127 2.68-.761.61-1.858.915-3.35.915h-4.935v-.061Zm2.924-7.07h1.523c.64 0 1.097-.121 1.37-.335.275-.213.397-.579.397-1.006 0-.517-.153-.884-.427-1.096-.304-.214-.761-.336-1.43-.336H87.72V5.18Zm0 1.92v2.895h1.92c.517 0 .944-.122 1.217-.366.275-.244.427-.579.427-1.006 0-1.005-.487-1.523-1.493-1.523h-2.07Zm11.148 2.895h5.086v2.254h-8.01V.122h2.924v9.873Zm13.98-2.895h-4.569v2.895h5.422v2.254h-8.346V.122h8.346v2.254h-5.422v2.56h4.569V7.1ZM.671 28.613V16.76H4.48a5.908 5.908 0 0 1 2.832.7 5.157 5.157 0 0 1 1.95 2.012c.457.854.7 1.828.7 2.925v.549c0 1.096-.243 2.072-.7 2.925a4.953 4.953 0 0 1-1.95 2.01c-.822.488-1.766.732-2.802.732H.671v.001Zm2.863-9.66v7.466H4.54c.823 0 1.463-.305 1.89-.884.426-.579.669-1.463.669-2.59v-.518c0-1.158-.213-2.01-.67-2.59-.426-.579-1.066-.884-1.919-.884h-.975Zm14.65 4.633h-4.202v2.833h4.995v2.194h-7.859V16.76h7.89v2.194H13.98v2.499h4.204v2.133Zm7.067 1.797 2.376-8.624h3.198l-3.99 11.854h-3.138l-3.959-11.854h3.168l2.345 8.624Zm13.432-1.797h-4.142v2.833h4.965v2.194h-7.828V16.76h7.828v2.194H34.54v2.499h4.142v2.133Zm4.66 2.833h4.507v2.194h-7.37V16.76h2.863v9.66-.001Zm15.168-3.505c0 1.158-.213 2.194-.64 3.078-.426.884-1.035 1.585-1.827 2.042-.791.488-1.676.731-2.71.731-1.006 0-1.92-.243-2.68-.7-.793-.458-1.402-1.128-1.829-1.981-.426-.854-.67-1.859-.7-2.986v-.671c0-1.158.213-2.194.64-3.077.427-.884 1.035-1.585 1.827-2.073.792-.487 1.706-.73 2.711-.73s1.888.243 2.68.73a4.77 4.77 0 0 1 1.828 2.042c.427.884.67 1.89.67 3.047v.548h.03Zm-2.924-.487c0-1.188-.182-2.072-.579-2.681-.395-.61-.944-.915-1.675-.915-1.43 0-2.193 1.067-2.284 3.23v.884c0 1.158.183 2.042.579 2.682.395.61.944.944 1.705.944.731 0 1.28-.305 1.676-.914.396-.61.578-1.493.609-2.651v-.579h-.03Zm6.914 2.164v4.022H59.64V16.76h4.72c.914 0 1.706.153 2.407.488.7.334 1.248.822 1.614 1.432.396.61.579 1.31.579 2.102 0 1.158-.427 2.072-1.25 2.773-.822.701-1.949 1.036-3.411 1.036h-1.797Zm0-2.225h1.858c.549 0 .975-.152 1.28-.426.304-.274.426-.67.426-1.158 0-.549-.153-1.006-.457-1.341-.305-.335-.7-.488-1.219-.518h-1.918v3.443h.03Zm11.27-5.607 2.65 8.258 2.619-8.258h3.777v11.854h-2.863V25.84l.274-5.668-2.863 8.44h-1.888l-2.894-8.44.274 5.668v2.773h-2.832V16.76h3.746Zm17.391 6.827H86.93v2.833h5.025v2.194h-7.858V16.76h7.889v2.194H86.93v2.499h4.233v2.133Zm11.665 5.027h-2.832l-4.203-7.374v7.374h-2.863V16.76h2.863l4.173 7.374V16.76h2.862v11.854Zm10.874-9.66h-3.564v9.66h-2.862v-9.66h-3.473v-2.194h9.899v2.194Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h115v60H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/ui/helper/fakeUsers.ts b/packages/ui/helper/fakeUsers.ts
index 7bdec832a537a5b645c241c4a0f81551075aa85c..d828ac2551d54d0ba21999ddf87fd8f72f59e709 100644
--- a/packages/ui/helper/fakeUsers.ts
+++ b/packages/ui/helper/fakeUsers.ts
@@ -27,7 +27,6 @@ export const getRandomUser = (hasAvatar = false): User => {
geolocationId: 'abc123',
engagementLevel: 'INTERESTED',
interestsV2: [],
- sdgs: [],
skillsV2: [],
connectionStatusToMyself: UserConnectionStatus.NOT_CONNECTED,
connectionStatusToSpace: [],