Merge pull request #1449 from topcoder-platform/dev

[PROD RELEASE] - Jan26

Author: jmgasper

.circleci/config.yml

@@ -227,6 +227,7 @@ workflows:
                           only:
                               - dev
                               - mm-final-2025-reveal
+                              - engagements
                               - HOTFIX-PM-3269
 
             - deployQa:

craco.config.js

@@ -45,6 +45,7 @@ module.exports = {
             '@profiles': resolve('src/apps/profiles/src'),
             '@wallet': resolve('src/apps/wallet/src'),
             '@walletAdmin': resolve('src/apps/wallet-admin/src'),
+            '@engagements': resolve('src/apps/engagements/src'),
 
             '@platform': resolve('src/apps/platform/src'),
             // aliases used in SCSS files

package.json

@@ -215,7 +215,7 @@
     "webpack-merge": "^5.10.0"
   },
   "resolutions": {
-    "@types/react": "18.0.35",
+    "@types/react": "18.3.27",
     "string-width": "4.2.0",
     "node-fetch": "2.6.7",
     "nth-check": "2.0.1",

src/apps/accounts/src/settings/tabs/preferences/preferences.config.ts

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 export const newsletters: Array<{ id: string, name: string, desc: string }> = [
     {
-        desc: 'A weekly summary of available ways to earn, including gig work, challenges, and Thrive articles.',
+        desc: 'A weekly summary of available ways to earn, including engagements, challenges, and Thrive articles.',
         id: 'd0c48e9da3',
         name: 'Work Opportunities',
     },

src/apps/admin/src/lib/components/CopyButton/CopyButton.module.scss

@@ -3,8 +3,8 @@
 .copy-btn {
     line-height: 0;
 
-    padding: $sp-3 $sp-4;
-    margin: 10;
+    padding: 10px 0 !important;
+    margin: 0 10px;
     background: none;
     border: none;
     border-radius: inherit;

src/apps/admin/src/lib/components/TermsAddForm/TermsAddForm.tsx

@@ -30,12 +30,12 @@ import {
 } from '~/libs/ui'
 import { yupResolver } from '@hookform/resolvers/yup'
 import { EnvironmentConfig } from '~/config'
+import { FieldHtmlEditor } from '~/libs/shared'
 
 import { FormAddWrapper } from '../common/FormAddWrapper'
 import { FormAddTerm } from '../../models'
 import { formAddTermSchema } from '../../utils'
 import { useManageAddTerm, useManageAddTermProps } from '../../hooks'
-import { FieldHtmlEditor } from '../common/FieldHtmlEditor'
 
 import styles from './TermsAddForm.module.scss'
 

src/apps/admin/src/lib/services/payments.service.ts

@@ -68,7 +68,7 @@ export async function getMembersByIds(userIds: string[]): Promise<Array<{ userId
             perPage: userIds.length,
             userIds,
         },
-        { arrayFormat: 'repeat' },
+        { arrayFormat: userIds.length === 1 ? 'brackets' : 'repeat' },
     )
     return xhrGetAsync<Array<{ userId: string; handle: string }>>(
         `${EnvironmentConfig.API.V6}/members?${query}`,

src/apps/calendar/src/CalendarApp.tsx

@@ -1,7 +1,7 @@
 import { FC, useContext, useEffect, useMemo } from 'react'
 import { Outlet, Routes } from 'react-router-dom'
 
-import { routerContext, RouterContextData } from '~/libs/core'
+import { ProfileProvider, routerContext, RouterContextData } from '~/libs/core'
 
 import { CalendarContextProvider, Layout, SWRConfigProvider } from './lib'
 import { toolTitle } from './calendar-app.routes'
@@ -19,14 +19,16 @@ const CalendarApp: FC = () => {
     }, [])
 
     return (
-        <CalendarContextProvider>
-            <SWRConfigProvider>
-                <Layout>
-                    <Outlet />
-                    <Routes>{childRoutes}</Routes>
-                </Layout>
-            </SWRConfigProvider>
-        </CalendarContextProvider>
+        <ProfileProvider>
+            <CalendarContextProvider>
+                <SWRConfigProvider>
+                    <Layout>
+                        <Outlet />
+                        <Routes>{childRoutes}</Routes>
+                    </Layout>
+                </SWRConfigProvider>
+            </CalendarContextProvider>
+        </ProfileProvider>
     )
 }
 

src/apps/calendar/src/pages/personal-calendar/PersonalCalendarPage.tsx

@@ -1,6 +1,7 @@
 import { addMonths, endOfMonth, startOfMonth, subMonths } from 'date-fns'
 import { FC, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 
+import { useProfileContext } from '~/libs/core'
 import { Button } from '~/libs/ui'
 
 import { Calendar, CalendarLegend, MonthNavigation } from '../../lib/components'
@@ -12,6 +13,7 @@ import styles from './PersonalCalendarPage.module.scss'
 
 const PersonalCalendarPage: FC = () => {
     const calendarContext = useContext(CalendarContext)
+    const profileContext = useProfileContext()
     const [currentDate, setCurrentDate] = useState<Date>(new Date())
     const [selectedDates, setSelectedDates] = useState<Set<string>>(new Set())
     const leaveDatesState = useFetchLeaveDates()
@@ -107,14 +109,35 @@ const PersonalCalendarPage: FC = () => {
         return `${count} date${count > 1 ? 's' : ''} selected`
     }, [selectedDates])
 
+    const profile = profileContext.profile
+    const displayName = useMemo(() => {
+        const firstName = profile?.firstName?.trim()
+        const lastName = profile?.lastName?.trim()
+        const fullName = [firstName, lastName]
+            .filter(Boolean)
+            .join(' ')
+
+        return (
+            fullName
+            || profile?.handle
+            || calendarContext.loginUserInfo?.handle
+            || 'Your calendar'
+        )
+    }, [
+        calendarContext.loginUserInfo?.handle,
+        profile?.firstName,
+        profile?.handle,
+        profile?.lastName,
+    ])
+
     const errorMessage = actionError || (error ? 'Something went wrong. Please try again.' : '')
 
     return (
         <div className={styles.page}>
             <header className={styles.header}>
                 <p className={styles.subtitle}>Welcome back</p>
                 <h2 className={styles.title}>
-                    {calendarContext.loginUserInfo?.handle ?? 'Your calendar'}
+                    {displayName}
                 </h2>
             </header>
 

src/apps/customer-portal/index.ts

@@ -0,0 +1 @@
+export * from './src'