Add better message to toast when updating payments (CORE-635)

Author: jmgasper

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

@@ -259,10 +259,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

@@ -79,10 +79,14 @@ export async function editPayment(updates: {
 }): Promise<string> {
     const body = JSON.stringify(updates)
     const url = `${baseUrl}/admin/winnings`
-
+    
     const response = await xhrPatchAsync<string, ApiResponse<string>>(url, body)
 
     if (response.status === 'error') {
+        if (response.error && response.error.message) {
+            console.log(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,13 @@ 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)
         },
     )