Skip to content

Commit effe03c

Browse files
committed
migrate profile api code to @hey-api/openapi-ts
1 parent 1f145fc commit effe03c

24 files changed

+204
-288
lines changed

packages/core-mobile/.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ module.exports = {
2020
'android/app/build/**',
2121
'expo-env.d.ts',
2222
'ios/DerivedData',
23-
'app/utils/api/generated/**',
24-
'app/utils/apiClient/generated/**'
23+
'app/utils/api/generated/**'
2524
],
2625
overrides: [
2726
{

packages/core-mobile/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,4 @@ expo-env.d.ts
9999
/ios/config.xcconfig
100100

101101
# generated api clients
102-
app/utils/apiClient/generated/profileApi.client.ts
103-
app/utils/apiClient/generated/balanceApi.client/
104102
app/utils/api/generated

packages/core-mobile/app/hooks/balance/useSupportedChains.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useQuery, UseQueryResult } from '@tanstack/react-query'
22
import { ReactQueryKeys } from 'consts/reactQueryKeys'
33
import { queryClient } from 'contexts/ReactQueryProvider'
4-
import { getV1BalanceGetSupportedChains } from 'utils/apiClient/generated/balanceApi.client'
4+
import { getV1BalanceGetSupportedChains } from 'utils/api/generated/balanceApi.client'
55
import { balanceApiClient } from 'utils/api/clients/balanceApiClient'
66

77
const STALE_TIME = 5 * 60 * 1000 // 5 minutes

packages/core-mobile/app/services/balance/BalanceService.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ const mockLoadModuleByNetwork = jest.fn()
1111
const mockGetSupportedChainsFromCache = jest.fn()
1212
const mockMapBalanceResponseToLegacy = jest.fn()
1313

14-
jest.mock('utils/apiClient/balance/balanceApi', () => ({
15-
balanceApi: {
16-
getBalancesStream: (...args: unknown[]) => mockGetBalancesStream(...args)
14+
jest.mock('utils/api/clients/balanceApiClient', () => ({
15+
streamingBalanceApiClient: {
16+
getBalances: (...args: unknown[]) => mockGetBalancesStream(...args)
1717
}
1818
}))
1919

packages/core-mobile/app/services/balance/BalanceService.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { SPAN_STATUS_ERROR } from '@sentry/core'
1010
import SentryWrapper from 'services/sentry/SentryWrapper'
1111
import { Account } from 'store/account/types'
1212
import { getAddressByNetwork } from 'store/account/utils'
13-
import { balanceApi } from 'utils/apiClient/balance/balanceApi'
13+
import { streamingBalanceApiClient } from 'utils/api/clients/balanceApiClient'
1414
import { getSupportedChainsFromCache } from 'hooks/balance/useSupportedChains'
15-
import { GetBalancesRequestBody } from 'utils/apiClient/generated/balanceApi.client'
15+
import { GetBalancesRequestBody } from 'utils/api/generated/balanceApi.client'
1616
import { coingeckoInMemoryCache } from 'utils/coingeckoInMemoryCache'
1717
import Logger from 'utils/Logger'
1818
import {
@@ -442,7 +442,9 @@ export class BalanceService {
442442
}
443443

444444
try {
445-
for await (const balance of balanceApi.getBalancesStream(body)) {
445+
for await (const balance of streamingBalanceApiClient.getBalances(
446+
body
447+
)) {
446448
const id = 'id' in balance ? balance.id : undefined
447449
const account =
448450
(id ? accountById[id] : undefined) ??
@@ -570,7 +572,9 @@ export class BalanceService {
570572
}
571573

572574
try {
573-
for await (const balance of balanceApi.getBalancesStream(body)) {
575+
for await (const balance of streamingBalanceApiClient.getBalances(
576+
body
577+
)) {
574578
const normalized = mapBalanceResponseToLegacy(account, balance)
575579
if (!normalized) continue
576580

packages/core-mobile/app/services/balance/utils/buildRequestItemsForAccounts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
EvmGetBalancesRequestItem,
99
GetBalancesRequestBody,
1010
SvmGetBalancesRequestItem
11-
} from 'utils/apiClient/generated/balanceApi.client'
11+
} from 'utils/api/generated/balanceApi.client'
1212

1313
/**
1414
* Maximum number of EVM references allowed per request item

packages/core-mobile/app/services/balance/utils/mapBalanceResponseToLegacy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
NativeTokenBalance,
1313
PvmGetBalancesResponse,
1414
SvmGetBalancesResponse
15-
} from 'utils/apiClient/generated/balanceApi.client'
15+
} from 'utils/api/generated/balanceApi.client'
1616
import { TokenType } from '@avalabs/vm-module-types'
1717
import { Avalanche } from '@avalabs/core-wallets-sdk'
1818
import { AVAX_P_ID, AVAX_X_ID } from '../const'

packages/core-mobile/app/services/glacier/GlacierService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from '@avalabs/glacier-sdk'
77
import Config from 'react-native-config'
88
import Logger from 'utils/Logger'
9-
import { CORE_HEADERS } from 'utils/apiClient/constants'
9+
import { CORE_HEADERS } from 'utils/api/constants'
1010
import { GlacierFetchHttpRequest } from './GlacierFetchHttpRequest'
1111

1212
if (!Config.GLACIER_URL)

packages/core-mobile/app/services/wallet/WalletService.tsx

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import {
2222
} from '@avalabs/vm-module-types'
2323
import { SpanName } from 'services/sentry/types'
2424
import { Curve } from 'utils/publicKeys'
25-
26-
import { profileApi } from 'utils/apiClient/profile/profileApi'
27-
import { GetAddressesResponse } from 'utils/apiClient/profile/types'
25+
import { GetAddressesResponse } from 'utils/api/generated/profileApi.client/types.gen'
26+
import { postV1GetAddresses } from 'utils/api/generated/profileApi.client'
27+
import { profileApiClient } from 'utils/api/clients/profileApiClient'
2828
import {
2929
getAddressDerivationPath,
3030
isAvalancheTransactionRequest,
@@ -344,12 +344,21 @@ class WalletService {
344344
})
345345

346346
try {
347-
return await profileApi.postV1getAddresses({
348-
networkType: networkType,
349-
extendedPublicKey: xpubXP,
350-
isTestnet,
351-
onlyWithActivity
347+
const response = await postV1GetAddresses({
348+
client: profileApiClient,
349+
body: {
350+
networkType: networkType,
351+
extendedPublicKey: xpubXP,
352+
isTestnet,
353+
onlyWithActivity
354+
}
352355
})
356+
357+
if (!response.data) {
358+
throw new Error('Failed to get addresses from postV1GetAddresses')
359+
}
360+
361+
return response.data
353362
} catch (err) {
354363
Logger.error(`[WalletService.ts][getAddressesFromXpubXP]${err}`)
355364
throw err

packages/core-mobile/app/utils/api/clients/aggregatedTokensApiClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Config from 'react-native-config'
22
import queryString from 'query-string'
3-
import { CORE_HEADERS } from 'utils/apiClient/constants'
43
import Logger from 'utils/Logger'
4+
import { CORE_HEADERS } from '../constants'
55
import { createClient } from '../generated/tokenAggregator/aggregatorApi.client/client/client.gen'
66
import { appCheckFetch } from '../common/appCheckFetch'
77

0 commit comments

Comments
 (0)