Merge branch 'dev' of github.com:topcoder-platform/platform-ui into dev

Author: jmgasper

.circleci/config.yml

@@ -258,6 +258,7 @@ workflows:
                           only:
                               - dev
                               - LVT-256
+                              - CORE-635
 
             - deployQa:
                   context: org-global

.prettierignore

@@ -0,0 +1 @@
+* *

src/apps/learn/src/course-completed/course-view/CourseView.tsx

@@ -54,7 +54,7 @@ const CourseView: FC<CourseViewProps> = (props: CourseViewProps) => (
                 size='md'
                 primary
                 label='Start a new course'
-                to={rootRoute}
+                to={rootRoute || '/'}
             />
         </div>
         <p className='body-main'>

src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx

@@ -8,11 +8,9 @@ import {
     UserProfile,
 } from '~/libs/core'
 import { ProfilePicture, useCheckIsMobile } from '~/libs/shared'
-import { Button } from '~/libs/ui'
 
 import { AddButton, EditMemberPropertyBtn } from '../../components'
 import { EDIT_MODE_QUERY_PARAM, profileEditModes } from '../../config'
-import { MemberProfileContextValue, useMemberProfileContext } from '../MemberProfile.context'
 
 import { OpenForGigs } from './OpenForGigs'
 import { ModifyMemberNameModal } from './ModifyMemberNameModal'
@@ -45,8 +43,6 @@ const ProfileHeader: FC<ProfileHeaderProps> = (props: ProfileHeaderProps) => {
     const [isHiringFormOpen, setIsHiringFormOpen]: [boolean, Dispatch<SetStateAction<boolean>>]
         = useState<boolean>(false)
 
-    const { isTalentSearch }: MemberProfileContextValue = useMemberProfileContext()
-
     const { state }: Location = useLocation()
 
     const searchedSkills: string[] = useMemo(
@@ -179,18 +175,6 @@ const ProfileHeader: FC<ProfileHeaderProps> = (props: ProfileHeaderProps) => {
                             .format('MMM YYYY')}
                     </p>
                 </div>
-                {
-                    !canEdit && isTalentSearch ? (
-                        <div className={styles.hiringClickWrap}>
-                            <Button
-                                label='Hire Topcoder Talent'
-                                primary
-                                size='lg'
-                                onClick={handleStartHiringToggle}
-                            />
-                        </div>
-                    ) : undefined
-                }
             </div>
 
             {

src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx

@@ -219,6 +219,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
         return confirmFlow?.content
     }, [confirmFlow])
 
+    // eslint-disable-next-line complexity
     const updatePayment = async (paymentId: string): Promise<void> => {
         const currentEditState = editStateRef.current
         // Send to server only the fields that have changed
@@ -259,10 +260,15 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
 
         toast.success('Updating payment', { position: toast.POSITION.BOTTOM_RIGHT })
         try {
-            const udpateMessage = await editPayment(updates)
-            toast.success(udpateMessage, { position: toast.POSITION.BOTTOM_RIGHT })
-        } catch (err) {
-            toast.error('Failed to update payment', { position: toast.POSITION.BOTTOM_RIGHT })
+            const updateMessage = await editPayment(updates)
+            toast.success(updateMessage, { position: toast.POSITION.BOTTOM_RIGHT })
+        } catch (err:any) {
+            if (err?.message) {
+                toast.error(err?.message, { position: toast.POSITION.BOTTOM_RIGHT })
+            } else {
+                toast.error('Failed to update payment', { position: toast.POSITION.BOTTOM_RIGHT })
+            }
+
             return
         }
 

src/apps/wallet-admin/src/lib/models/ApiResponse.ts

@@ -1,4 +1,7 @@
+import { ApiError } from './ApiError'
+
 export default interface ApiResponse<T> {
     status: 'success' | 'error'
     data: T
+    error: ApiError
 }

src/apps/wallet-admin/src/lib/services/wallet.ts

@@ -83,6 +83,10 @@ export async function editPayment(updates: {
     const response = await xhrPatchAsync<string, ApiResponse<string>>(url, body)
 
     if (response.status === 'error') {
+        if (response.error && response.error.message) {
+            throw new Error(response.error.message)
+        }
+
         throw new Error('Error editing payment')
     }
 

src/libs/core/lib/xhr/xhr-functions/xhr.functions.ts

@@ -172,10 +172,14 @@ function interceptError(instance: AxiosInstance): void {
         config => config,
         (error: any) => {
             // if there is server error message, then return it inside `message` property of error
-            error.message = error?.response?.data?.message || error.message
+            if (error?.response?.data?.message) {
+                error.message = error?.response?.data?.message
+            } else if (error?.response?.data?.error?.message) {
+                error.message = error?.response?.data?.error?.message
+            }
+
             // if there is server errors data, then return it inside `errors` property of error
             error.errors = error?.response?.data?.errors
-
             return Promise.reject(error)
         },
     )