Skip to content

fix(portfolio): further toTokenActivity breaking #3881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/portfolio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@yoroi/portfolio",
"version": "1.0.3",
"version": "1.0.4",
"description": "The Portfolio package of Yoroi SDK",
"keywords": [
"yoroi",
Expand Down
11 changes: 4 additions & 7 deletions packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,10 @@ describe('portfolioApiMaker', () => {
})

expect(resultTokenActivity).toEqual({
tag: 'left',
error: {
status: -3,
message: 'Failed to transform token activity updates response',
responseData: {
['wrong']: [200, 'data'],
},
tag: 'right',
value: {
status: 200,
data: {},
},
})

Expand Down
32 changes: 9 additions & 23 deletions packages/portfolio/src/adapters/dullahan-api/api-maker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -268,35 +268,21 @@ export const portfolioApiMaker = ({
if (Object.keys(activities).length === 0 && firstError)
return firstError

try {
const transformedResponseData = toTokenActivity(activities)

const transformedResponse: Api.Response<Portfolio.Api.TokenActivityResponse> =
freeze(
{
tag: 'right',
value: {
status: Api.HttpStatusCode.Ok,
data: transformedResponseData,
},
},
true,
)
const transformedResponseData = toTokenActivity(activities)

return transformedResponse
} catch (error) {
return freeze(
const transformedResponse: Api.Response<Portfolio.Api.TokenActivityResponse> =
freeze(
{
tag: 'left',
error: {
status: -3,
message: 'Failed to transform token activity updates response',
responseData: activities,
tag: 'right',
value: {
status: Api.HttpStatusCode.Ok,
data: transformedResponseData,
},
},
true,
)
}

return transformedResponse
},

async tokenHistory(tokenId, period) {
Expand Down
3 changes: 2 additions & 1 deletion packages/portfolio/src/adapters/dullahan-api/transformers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ export const toTokenActivity = (
const [statusCode, tokenActivityData] = response
if (statusCode !== Api.HttpStatusCode.Ok) return acc

TokenActivityResponseSchema.parse(tokenActivityData)
if (!TokenActivityResponseSchema.safeParse(tokenActivityData).success)
return acc

const parsedTokenActivity: Portfolio.Token.Activity = {
price: {
Expand Down
Loading