Merge remote-tracking branch 'origin/main' into sshin/stripe-2

Author: suejung-sentry

VERSION

@@ -1 +1 @@
-25.1.10
+25.1.16

src/services/account/useCreateStripeSetupIntent.ts

@@ -2,7 +2,11 @@ import { useQuery } from '@tanstack/react-query'
 import { z } from 'zod'
 
 import Api from 'shared/api'
-import { NetworkErrorObject, Provider } from 'shared/api/helpers'
+import {
+  NetworkErrorObject,
+  Provider,
+  rejectNetworkError,
+} from 'shared/api/helpers'
 
 export const CreateStripeSetupIntentSchema = z.object({
   createStripeSetupIntent: z.object({
@@ -70,13 +74,22 @@ export function useCreateStripeSetupIntent({
       createStripeSetupIntent({ provider, owner, signal }).then((res) => {
         const parsedRes = CreateStripeSetupIntentSchema.safeParse(res.data)
         if (!parsedRes.success) {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
+            error: parsedRes.error,
             data: {},
             dev: 'useStripeSetupIntent - 404 failed to parse',
           } satisfies NetworkErrorObject)
         }
 
+        const error = parsedRes.data.createStripeSetupIntent.error
+        if (error?.__typename) {
+          return Promise.reject({
+            error: error.__typename,
+            message: 'Error creating setup intent',
+          })
+        }
+
         return parsedRes.data.createStripeSetupIntent
       }),
     ...opts,

src/services/account/useUpdatePaymentMethod.ts

@@ -1,4 +1,4 @@
-import { useElements, useStripe } from '@stripe/react-stripe-js'
+import { PaymentElement, useElements, useStripe } from '@stripe/react-stripe-js'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 
 import config from 'config'
@@ -11,17 +11,20 @@ import { useCreateStripeSetupIntent } from './useCreateStripeSetupIntent'
 interface useUpdatePaymentMethodProps {
   provider: Provider
   owner: string
-  name?: string
   email?: string
 }
 
 interface useUpdatePaymentMethodReturn {
   reset: () => void
   error: null | Error
   isLoading: boolean
-  mutate: (variables: any, data: any) => void
+  mutate: (
+    variables: typeof PaymentElement,
+    data?: { onSuccess?: () => void }
+  ) => void
   data: undefined | unknown
 }
+
 function getPathAccountDetails({
   provider,
   owner,
@@ -35,7 +38,6 @@ function getPathAccountDetails({
 export function useUpdatePaymentMethod({
   provider,
   owner,
-  name,
   email,
 }: useUpdatePaymentMethodProps): useUpdatePaymentMethodReturn {
   const stripe = useStripe()
@@ -60,7 +62,6 @@ export function useUpdatePaymentMethod({
             payment_method_data: {
               // eslint-disable-next-line camelcase
               billing_details: {
-                name: name,
                 email: email,
               },
             },