fix: Callback response from Errors component

src/components/GiftCardOrCouponForm.tsx

@@ -46,10 +46,11 @@ const GiftCardOrCouponForm: FunctionComponent<GiftCardOrCouponFormProps> = (
         errors,
         (i) => i.field === camelCase(inputName)
       ) as BaseError[]
-      setOrderErrors({ errors: err })
-      onSubmit && onSubmit({ value: values[inputName]?.value, success: true })
+      setOrderErrors(err)
+      onSubmit && onSubmit({ value: values[inputName]?.value, success: false })
     }
     if (values[inputName]?.value === '') {
+      setOrderErrors([])
       onSubmit && onSubmit({ value: values[inputName]?.value, success: false })
     }
   }, [values])

src/components/OrderContainer.tsx

@@ -1,6 +1,5 @@
 import React, {
   useEffect,
-  FunctionComponent,
   useReducer,
   useContext,
   ReactNode,
@@ -25,6 +24,7 @@ import components from '#config/components'
 import { BaseMetadataObject } from '#typings'
 import OrderStorageContext from '#context/OrderStorageContext'
 import { OrderCreate, Order } from '@commercelayer/sdk'
+import { BaseError } from '#typings/errors'
 
 const propTypes = components.OrderContainer.propTypes
 const defaultProps = components.OrderContainer.defaultProps
@@ -37,7 +37,9 @@ type OrderContainerProps = {
   orderId?: string
 }
 
-const OrderContainer: FunctionComponent<OrderContainerProps> = (props) => {
+const OrderContainer: React.FunctionComponent<OrderContainerProps> = (
+  props
+) => {
   const { orderId, children, metadata, attributes } = props
   const [state, dispatch] = useReducer(orderReducer, orderInitialState)
   const config = useContext(CommerceLayerContext)
@@ -83,7 +85,8 @@ const OrderContainer: FunctionComponent<OrderContainerProps> = (props) => {
       setOrder: (order: Order) => setOrder(order, dispatch),
       getOrder: (id: string): Promise<void | Order> =>
         getApiOrder({ id, dispatch, config, state }),
-      setOrderErrors: (errors: any) => setOrderErrors({ dispatch, errors }),
+      setOrderErrors: (errors: BaseError[]) =>
+        setOrderErrors({ dispatch, errors }),
       createOrder: async (): Promise<string> =>
         await createOrder({
           persistKey,

src/components/utils/getAllErrors.tsx

@@ -29,10 +29,11 @@ const getAllErrors: GetAllErrors = (params) => {
   } = params
   return allErrors.map((v, k): ReactNode | void => {
     const objMsg = customMessages(messages, v)
-    const text =
-      (objMsg?.message || v.message) && v.title !== v.detail
+    let text =
+      v?.title && !v.detail?.includes(v.title)
         ? `${v.title} - ${v.detail}`
-        : `${v.title}`
+        : `${v.detail}`
+    if (objMsg?.message) text = objMsg?.message
     if (field) {
       if (v.resource === 'line_items') {
         if (lineItem && v.id === lineItem['id']) {

src/context/OrderContext.ts

@@ -16,11 +16,12 @@ import {
   updateOrder,
   getOrderContext,
 } from '#reducers/OrderReducer'
+import { BaseError } from '#typings/errors'
 
 type DefaultContext = {
   createOrder: CreateOrder
   addToCart: AddToCart
-  setOrderErrors: (errors: unknown) => void
+  setOrderErrors: (errors: BaseError[]) => void
   setGiftCardOrCouponCode: SetGiftCardOrCouponCode
   removeGiftCardOrCouponCode: RemoveGiftCardOrCouponCode
   saveAddressToCustomerAddressBook: SaveAddressToCustomerAddressBook

src/reducers/OrderReducer.ts

@@ -278,6 +278,7 @@ export async function updateOrder({
     // NOTE: Retrieve doesn't response with attributes updated
     const order = await getApiOrder({ id, config, dispatch, state })
     dispatch && order && dispatch({ type: 'setOrder', payload: { order } })
+    return { success: true }
   } catch (error) {
     const errors = getErrors(error, 'orders')
     if (dispatch) {
@@ -289,6 +290,7 @@ export async function updateOrder({
         },
       })
     }
+    return { success: false, error }
   }
 }
 
@@ -435,10 +437,10 @@ export const unsetOrderState: UnsetOrderState = (dispatch) => {
 
 type OrderErrors = {
   dispatch?: Dispatch<OrderActions>
-  errors: any
+  errors: BaseError[]
 }
 
-export function setOrderErrors({ dispatch, errors }: OrderErrors) {
+export function setOrderErrors({ dispatch, errors = [] }: OrderErrors) {
   dispatch &&
     dispatch({
       type: 'setErrors',
@@ -493,21 +495,22 @@ export const setGiftCardOrCouponCode: SetGiftCardOrCouponCode = async ({
       const attributes: Omit<OrderUpdate, 'id'> = {
         [codeType]: code,
       }
-      await updateOrder({
+      const { success, error } = await updateOrder({
         id: order.id,
         attributes,
         config,
         include,
         dispatch,
         state,
       })
+      if (!success) throw error
       dispatch({
         type: 'setErrors',
         payload: {
           errors: [],
         },
       })
-      return { success: true }
+      return { success }
     }
     return { success: false }
   } catch (error: any) {

src/reducers/PlaceOrderReducer.ts

@@ -120,7 +120,7 @@ export type SetPlaceOrder = (args: {
   config?: CommerceLayerConfig
   order?: Order
   state?: PlaceOrderState
-  setOrderErrors?: (collection: unknown) => void
+  setOrderErrors?: (errors: BaseError[]) => void
   paymentSource?: PaymentSourceType & { approval_url?: string }
   include?: string[]
   setOrder?: (order: Order) => void