Merge branch 'release/1.52'

apps/mobile/app.config.ts

@@ -6,9 +6,9 @@ require('ts-node/register')
 // see https://docs.expo.dev/build-reference/app-versions/
 // TODO somehow automatically increment version numbers on every release
 const versions = {
-  version: '1.52.3', // user-facing value visible in stores
-  iosBuildNumber: '1.52.3', // developer-facing build version, see https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleversion
-  androidVersionCode: 149, // developer-facing build version, see https://developer.android.com/studio/publish/versioning.html#versioningsettings
+  version: '1.52.4', // user-facing value visible in stores
+  iosBuildNumber: '1.52.4', // developer-facing build version, see https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleversion
+  androidVersionCode: 150, // developer-facing build version, see https://developer.android.com/studio/publish/versioning.html#versioningsettings
 }
 
 // - Environment variables are available in the mobile app source code via the expo-constants package.

core/i18n/locales/de.json

@@ -5,14 +5,13 @@
   "act.events.filter.heading": "Events filtern",
   "act.events.filter.submitButton": "Events anzeigen",
   "act.events.fromTo": "bis",
-  "act.events.listing.partnerModal.headline": "Our volunteering partners",
-  "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.buttonText": "Besuche voltastics.com",
-  "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.headline": "Anerkennung für freiwilliges Engagement",
-  "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.text": "Wir begeistern Unternehmen und Freiwillige sich digital zu vernetzen, um freiwilliges Engagement sichtbarer zu machen und gegenseitige Unterstützung besser zu organisieren.",
+  "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.buttonText": "Besuche gemeinschaftswerk-nachhaltigkeit.de",
+  "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.headline": "Gemeinsam Zukunft gestalten",
+  "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.text": "Wir vernetzen engagierte Menschen und Organisationen, die nachhaltige Projekte und umweltbewusste Lebensstile fördern. Mit sinnvollen Events unterstützt die Initiative den Wandel zu einer ressourcenschonenden Zukunft.",
   "act.events.opportunities": "Events",
   "act.events.partnerInfoRowText": "über Gemeinschaftswerk Nachhaltigkeit",
   "act.events.showAll": "Weitere Events",
-  "act.events.subline": "Erlebene Events mit Bedeutung",
+  "act.events.subline": "Finde passende Events",
   "act.events.thumbnail.label": "Event Cover Bild",
   "act.events.title": "Events",
   "act.events.detail.organisationNameFallback": "Externe Initiative",

core/i18n/locales/en.json

@@ -5,7 +5,6 @@
   "act.events.filter.heading": "Filter events",
   "act.events.filter.submitButton": "Show events",
   "act.events.fromTo": "to",
-  "act.events.listing.partnerModal.headline": "Our volunteering partners",
   "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.buttonText": "Visit gemeinschaftswerk-nachhaltigkeit.de",
   "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.headline": "Create the future together",
   "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.text": "We connect committed people and organizations who promote sustainable projects and eco-friendly lifestyles. Through meaningful events, the initiative supports the transition to a resource-conserving future.",

core/screens/act/ActHome.tsx

@@ -23,8 +23,8 @@ const { useParam } = createParamHooks<ActHomeParams>()
 export const orderedSections = (selectedContentType?: string) => {
   const sections = [
     ActSectionType.VOLUNTEERING,
-    ActSectionType.CHALLENGES,
     ActSectionType.EVENTS,
+    ActSectionType.CHALLENGES,
     ActSectionType.TASKS,
     ActSectionType.DONATIONS,
   ]

core/screens/act/__tests__/ActHome.test.tsx

@@ -21,12 +21,12 @@ jest.mock('@holi/core/screens/act/ActSection', () => {
 })
 
 const cases = [
-  { section: undefined, order: ['VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'TASKS', 'DONATIONS'] },
-  { section: 'SPACE', order: ['VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'TASKS', 'DONATIONS'] },
-  { section: 'DONATIONS', order: ['DONATIONS', 'VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'TASKS'] },
-  { section: 'VOLUNTEERING', order: ['VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'TASKS', 'DONATIONS'] },
+  { section: undefined, order: ['VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'TASKS', 'DONATIONS'] },
+  { section: 'SPACE', order: ['VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'TASKS', 'DONATIONS'] },
+  { section: 'DONATIONS', order: ['DONATIONS', 'VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'TASKS'] },
+  { section: 'VOLUNTEERING', order: ['VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'TASKS', 'DONATIONS'] },
   { section: 'CHALLENGES', order: ['CHALLENGES', 'VOLUNTEERING', 'EVENTS', 'TASKS', 'DONATIONS'] },
-  { section: 'TASKS', order: ['TASKS', 'VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'DONATIONS'] },
+  { section: 'TASKS', order: ['TASKS', 'VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'DONATIONS'] },
 ]
 
 describe('ActHome Section', () => {