Skip to content

Commit 72cd37d

Browse files
suejung-sentrysuejung-sentry
committed
cleanup
1 parent 90214a2 commit 72cd37d

File tree

19 files changed

+44
-25
lines changed

19 files changed

+44
-25
lines changed

‎src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
useAvailablePlans,
1010
usePlanData,
1111
} from 'services/account'
12+
import { Provider } from 'shared/api/helpers'
1213
import { BillingRate, shouldDisplayTeamCard } from 'shared/utils/billing'
1314
import Spinner from 'ui/Spinner'
1415

@@ -25,7 +26,7 @@ const Loader = () => (
2526

2627
function CancelPlanPage() {
2728
const { provider, owner } = useParams<{
28-
provider: string
29+
provider: Provider
2930
owner: string
3031
}>()
3132
const { data: accountDetailsData } = useAccountDetails({ provider, owner })

‎src/pages/PlanPage/subRoutes/CurrentOrgPlan/BillingDetails/BillingDetails.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { useParams } from 'react-router-dom'
22

33
import { useAccountDetails } from 'services/account'
4+
import { Provider } from 'shared/api/helpers'
45

56
import AddressCard from './Address/AddressCard'
67
import EmailAddress from './EmailAddress'
78
import PaymentCard from './PaymentCard'
89

910
interface URLParams {
10-
provider: string
11+
provider: Provider
1112
owner: string
1213
}
1314

‎src/pages/PlanPage/subRoutes/CurrentOrgPlan/BillingDetails/EmailAddress/EmailAddress.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useParams } from 'react-router-dom'
55
import { z } from 'zod'
66

77
import { useAccountDetails, useUpdateBillingEmail } from 'services/account'
8+
import { Provider } from 'shared/api/helpers'
89
import A from 'ui/A'
910
import Button from 'ui/Button'
1011
import Icon from 'ui/Icon'
@@ -18,7 +19,7 @@ const emailSchema = z.object({
1819
})
1920

2021
interface URLParams {
21-
provider: string
22+
provider: Provider
2223
owner: string
2324
}
2425

‎src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { useParams } from 'react-router-dom'
33

44
import { usePlanUpdatedNotification } from 'pages/PlanPage/context'
55
import { useAccountDetails, usePlanData } from 'services/account'
6+
import { Provider } from 'shared/api/helpers'
67
import { getScheduleStart } from 'shared/plan/ScheduledPlanDetails/ScheduledPlanDetails'
78
import A from 'ui/A'
89
import { Alert } from 'ui/Alert'
@@ -16,7 +17,7 @@ import LatestInvoiceCard from './LatestInvoiceCard'
1617
import { EnterpriseAccountDetailsQueryOpts } from './queries/EnterpriseAccountDetailsQueryOpts'
1718

1819
interface URLParams {
19-
provider: string
20+
provider: Provider
2021
owner: string
2122
}
2223

‎src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/CurrentPlanCard.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { useParams } from 'react-router-dom'
22

33
import { useAccountDetails, usePlanData } from 'services/account'
4+
import { Provider } from 'shared/api/helpers'
45
import { CollectionMethods } from 'shared/utils/billing'
56

67
import EnterprisePlanCard from './EnterprisePlanCard'
78
import FreePlanCard from './FreePlanCard'
89
import PaidPlanCard from './PaidPlanCard'
910

1011
interface URLParams {
11-
provider: string
12+
provider: Provider
1213
owner: string
1314
}
1415

‎src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/PaidPlanCard/PaidPlanCard.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import { useParams } from 'react-router-dom'
44

55
import { PlanPageDataQueryOpts } from 'pages/PlanPage/queries/PlanPageDataQueryOpts'
66
import { useAccountDetails, usePlanData } from 'services/account'
7+
import { Provider } from 'shared/api/helpers'
78
import BenefitList from 'shared/plan/BenefitList'
89
import ScheduledPlanDetails from 'shared/plan/ScheduledPlanDetails'
910

1011
import ActionsBilling from '../shared/ActionsBilling/ActionsBilling'
1112
import PlanPricing from '../shared/PlanPricing'
1213

1314
type URLParams = {
14-
provider: string
15+
provider: Provider
1516
owner: string
1617
}
1718

‎src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/ProPlanController/PriceCallout/PriceCallout.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
useAccountDetails,
88
useAvailablePlans,
99
} from 'services/account'
10+
import { Provider } from 'shared/api/helpers'
1011
import {
1112
BillingRate,
1213
findProPlans,
@@ -32,7 +33,7 @@ const PriceCallout: React.FC<PriceCalloutProps> = ({
3233
seats,
3334
setFormValue,
3435
}) => {
35-
const { provider, owner } = useParams<{ provider: string; owner: string }>()
36+
const { provider, owner } = useParams<{ provider: Provider; owner: string }>()
3637
const { data: plans } = useAvailablePlans({ provider, owner })
3738
const { proPlanMonth, proPlanYear } = findProPlans({ plans })
3839
const perMonthPrice = calculatePriceProPlan({

‎src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/ProPlanController/UserCount/UserCount.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import isNumber from 'lodash/isNumber'
22
import { useParams } from 'react-router-dom'
33

44
import { useAccountDetails } from 'services/account'
5+
import { Provider } from 'shared/api/helpers'
56

67
interface StudentTextProps {
78
activatedStudents?: number
@@ -41,7 +42,7 @@ const UserText: React.FC<UserTextProps> = ({
4142
}
4243

4344
const UserCount: React.FC = () => {
44-
const { provider, owner } = useParams<{ provider: string; owner: string }>()
45+
const { provider, owner } = useParams<{ provider: Provider; owner: string }>()
4546
const { data: accountDetails } = useAccountDetails({ provider, owner })
4647

4748
const activatedStudentCount = accountDetails?.activatedStudentCount

‎src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/SentryPlanController/PriceCallout/PriceCallout.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
useAccountDetails,
88
useAvailablePlans,
99
} from 'services/account'
10+
import { Provider } from 'shared/api/helpers'
1011
import {
1112
BillingRate,
1213
findSentryPlans,
@@ -33,7 +34,7 @@ const PriceCallout: React.FC<PriceCalloutProps> = ({
3334
seats,
3435
setFormValue,
3536
}) => {
36-
const { provider, owner } = useParams<{ provider: string; owner: string }>()
37+
const { provider, owner } = useParams<{ provider: Provider; owner: string }>()
3738
const { data: plans } = useAvailablePlans({ provider, owner })
3839
const { sentryPlanMonth, sentryPlanYear } = findSentryPlans({ plans })
3940
const perMonthPrice = calculatePriceSentryPlan({

‎src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/SentryPlanController/UserCount/UserCount.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import isNumber from 'lodash/isNumber'
22
import { useParams } from 'react-router-dom'
33

44
import { useAccountDetails } from 'services/account'
5+
import { Provider } from 'shared/api/helpers'
56

67
interface StudentTextProps {
78
activatedStudents?: number
@@ -30,7 +31,7 @@ const UserText: React.FC = () => {
3031
}
3132

3233
const UserCount: React.FC = () => {
33-
const { provider, owner } = useParams<{ provider: string; owner: string }>()
34+
const { provider, owner } = useParams<{ provider: Provider; owner: string }>()
3435
const { data: accountDetails } = useAccountDetails({ provider, owner })
3536

3637
const activatedStudentCount = accountDetails?.activatedStudentCount

‎src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/TeamPlanController/PriceCallout/PriceCallout.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
useAccountDetails,
99
useAvailablePlans,
1010
} from 'services/account'
11+
import { Provider } from 'shared/api/helpers'
1112
import {
1213
BillingRate,
1314
findTeamPlans,
@@ -34,7 +35,7 @@ const PriceCallout: React.FC<PriceCalloutProps> = ({
3435
seats,
3536
setFormValue,
3637
}) => {
37-
const { provider, owner } = useParams<{ provider: string; owner: string }>()
38+
const { provider, owner } = useParams<{ provider: Provider; owner: string }>()
3839
const { data: plans } = useAvailablePlans({ provider, owner })
3940
const { teamPlanMonth, teamPlanYear } = findTeamPlans({ plans })
4041
const perMonthPrice = calculatePriceTeamPlan({

‎src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/TeamPlanController/UserCount/UserCount.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import isNumber from 'lodash/isNumber'
22
import { useParams } from 'react-router-dom'
33

44
import { useAccountDetails } from 'services/account'
5+
import { Provider } from 'shared/api/helpers'
56

67
interface StudentTextProps {
78
activatedStudents?: number
@@ -42,7 +43,7 @@ const UserText: React.FC<UserTextProps> = ({
4243
}
4344

4445
const UserCount: React.FC = () => {
45-
const { provider, owner } = useParams<{ provider: string; owner: string }>()
46+
const { provider, owner } = useParams<{ provider: Provider; owner: string }>()
4647
const { data: accountDetails } = useAccountDetails({ provider, owner })
4748

4849
const activatedStudentCount = accountDetails?.activatedStudentCount

‎src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/UpgradeForm.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
useAvailablePlans,
1010
usePlanData,
1111
} from 'services/account'
12+
import { Provider } from 'shared/api/helpers'
1213
import { canApplySentryUpgrade, getNextBillingDate } from 'shared/utils/billing'
1314
import {
1415
getDefaultValuesUpgradeForm,
@@ -24,7 +25,7 @@ import UpdateBlurb from './UpdateBlurb/UpdateBlurb'
2425
import UpdateButton from './UpdateButton'
2526

2627
type URLParams = {
27-
provider: string
28+
provider: Provider
2829
owner: string
2930
}
3031

‎src/services/account/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export * from './useInvoice'
88
export * from './usePlanData'
99
export * from './useAvailablePlans'
1010
export * from './useSentryToken'
11+
export * from './useUpdateCard'
1112
export * from './useUpdatePaymentMethod'
1213
export * from './useUpgradePlan'
1314
export * from './useUpdateBillingEmail'

‎src/services/account/useAccountDetails.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'
22
import { z } from 'zod'
33

44
import Api from 'shared/api'
5-
import { NetworkErrorObject } from 'shared/api/helpers'
5+
import { NetworkErrorObject, Provider } from 'shared/api/helpers'
66

77
const InvoiceSchema = z
88
.object({
@@ -153,7 +153,7 @@ export const AccountDetailsSchema = z.object({
153153
})
154154

155155
export interface UseAccountDetailsArgs {
156-
provider: string
156+
provider: Provider
157157
owner: string
158158
opts?: {
159159
enabled?: boolean
@@ -164,7 +164,7 @@ function getPathAccountDetails({
164164
provider,
165165
owner,
166166
}: {
167-
provider: string
167+
provider: Provider
168168
owner: string
169169
}) {
170170
return `/${provider}/${owner}/account-details/`
@@ -175,7 +175,7 @@ function fetchAccountDetails({
175175
owner,
176176
signal,
177177
}: {
178-
provider: string
178+
provider: Provider
179179
owner: string
180180
signal?: AbortSignal
181181
}) {

‎src/services/account/useCreateStripeSetupIntent.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'
22
import { z } from 'zod'
33

44
import Api from 'shared/api'
5-
import { NetworkErrorObject } from 'shared/api/helpers'
5+
import { NetworkErrorObject, Provider } from 'shared/api/helpers'
66

77
export const CreateStripeSetupIntentSchema = z.object({
88
createStripeSetupIntent: z.object({
@@ -15,13 +15,16 @@ export const CreateStripeSetupIntentSchema = z.object({
1515
z.object({
1616
__typename: z.literal('UnauthenticatedError'),
1717
}),
18+
z.object({
19+
__typename: z.literal('UnauthorizedError'),
20+
}),
1821
])
1922
.nullish(),
2023
}),
2124
})
2225

2326
export interface UseCreateStripeSetupIntentArgs {
24-
provider: string
27+
provider: Provider
2528
owner: string
2629
opts?: {
2730
enabled?: boolean
@@ -33,7 +36,7 @@ function createStripeSetupIntent({
3336
owner,
3437
signal,
3538
}: {
36-
provider: string
39+
provider: Provider
3740
owner: string
3841
signal?: AbortSignal
3942
}) {

‎src/services/account/useUpdateBillingEmail.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ describe('useUpdateBillingEmail', () => {
9595
await waitFor(() =>
9696
expect(mockBody).toHaveBeenCalledWith({
9797
new_email: '[email protected]',
98-
should_propagate_to_payment_methods: true,
98+
apply_to_default_payment_method: true,
9999
})
100100
)
101101
})

‎src/services/account/useUpdateBillingEmail.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { useMutation, useQueryClient } from '@tanstack/react-query'
22

33
import Api from 'shared/api'
4+
import { Provider } from 'shared/api/helpers'
45

56
interface UsePlanDataArgs {
6-
provider: string
7+
provider: Provider
78
owner: string
89
}
910

@@ -20,7 +21,7 @@ export function useUpdateBillingEmail({ provider, owner }: UsePlanDataArgs) {
2021
const body = {
2122
/* eslint-disable camelcase */
2223
new_email: formData?.newEmail,
23-
should_propagate_to_payment_methods: true,
24+
apply_to_default_payment_method: true,
2425
}
2526
return Api.patch({ path, provider, body })
2627
},

‎src/services/account/useUpdatePaymentMethod.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'
44
import config from 'config'
55

66
import Api from 'shared/api'
7+
import { Provider } from 'shared/api/helpers'
78

89
import { useCreateStripeSetupIntent } from './useCreateStripeSetupIntent'
910

1011
interface useUpdatePaymentMethodProps {
11-
provider: string
12+
provider: Provider
1213
owner: string
1314
email?: string
1415
}
@@ -24,7 +25,7 @@ function getPathAccountDetails({
2425
provider,
2526
owner,
2627
}: {
27-
provider: string
28+
provider: Provider
2829
owner: string
2930
}) {
3031
return `/${provider}/${owner}/account-details/`

0 commit comments

Comments
 (0)