Fix type errors and featured member url resolution on update response

Tool: gitpod/catfood.gitpod.cloud

Author: filiptronicek

components/server/src/api/organization-service-api.ts

@@ -308,11 +308,7 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, msg);
         }
 
-        const updatedSettings = await this.orgService.updateSettingsWithResolvedWelcomeMessage(
-            ctxUserId(),
-            req.organizationId,
-            update,
-        );
+        const updatedSettings = await this.orgService.updateSettings(ctxUserId(), req.organizationId, update);
         return new UpdateOrganizationSettingsResponse({
             settings: this.apiConverter.toOrganizationSettings(updatedSettings),
         });

components/server/src/orgs/organization-service.ts

@@ -635,10 +635,15 @@ export class OrganizationService {
         };
 
         const dbSettings = await this.teamDB.setOrgSettings(orgId, settings, mergeSettings);
-        if (settings.onboardingSettings?.welcomeMessage?.featuredMemberId) {
-            if (resolvedFeaturedMemberAvatarUrl && dbSettings.onboardingSettings?.welcomeMessage) {
-                dbSettings.onboardingSettings.welcomeMessage.featuredMemberResolvedAvatarUrl =
-                    resolvedFeaturedMemberAvatarUrl;
+        if (dbSettings.onboardingSettings?.welcomeMessage?.featuredMemberId) {
+            const avatarUrl =
+                resolvedFeaturedMemberAvatarUrl ??
+                (await this.resolveMemberAvatarUrl(
+                    dbSettings.onboardingSettings.welcomeMessage.featuredMemberId,
+                    orgId,
+                ));
+            if (avatarUrl && dbSettings.onboardingSettings?.welcomeMessage) {
+                dbSettings.onboardingSettings.welcomeMessage.featuredMemberResolvedAvatarUrl = avatarUrl;
             }
         }