Merge pull request #978 from topcoder-platform/CORE-635

PROD DEPLOY - Core 635

Author: jmgasper

.circleci/config.yml

@@ -44,7 +44,7 @@ save_cache_settings: &save_cache_settings
 running_yarn_eslint: &running_yarn_eslint
     name: Running Yarn eslint
     command: |
-        yarn add eslint -g
+        yarn add eslint@8.57.0 -g
         yarn lint
 
 running_yarn_build: &running_yarn_build
@@ -258,6 +258,7 @@ workflows:
                           only:
                               - dev
                               - LVT-256
+                              - CORE-635
 
             - deployQa:
                   context: org-global

.prettierignore

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

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

@@ -37,6 +37,8 @@ function formatStatus(status: string): string {
             return 'Paid'
         case 'CANCELLED':
             return 'Cancel'
+        case 'PROCESSING':
+            return 'Processing'
         default:
             return status.replaceAll('_', ' ')
     }
@@ -217,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
@@ -257,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
         }
 
@@ -352,6 +360,10 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
                                             label: 'Cancelled',
                                             value: 'CANCELLED',
                                         },
+                                        {
+                                            label: 'Processing',
+                                            value: 'PROCESSING',
+                                        },
                                     ],
                                     type: 'dropdown',
                                 },

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)
         },
     )