From a5985b2ab52c803c642e4c5a7267e0e823817a3e Mon Sep 17 00:00:00 2001 From: jorbuedo Date: Mon, 24 Mar 2025 14:28:45 +0100 Subject: [PATCH 1/4] fix further toTokenActivity breaking --- packages/portfolio/src/adapters/dullahan-api/transformers.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/portfolio/src/adapters/dullahan-api/transformers.ts b/packages/portfolio/src/adapters/dullahan-api/transformers.ts index 4bc6c06a48..e5ed515d08 100644 --- a/packages/portfolio/src/adapters/dullahan-api/transformers.ts +++ b/packages/portfolio/src/adapters/dullahan-api/transformers.ts @@ -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: { From 2d446dff792d833685f7a06d9c7bd6919c82a263 Mon Sep 17 00:00:00 2001 From: jorbuedo Date: Mon, 24 Mar 2025 15:00:15 +0100 Subject: [PATCH 2/4] Remove safety try catch because no test can reach it since I dont see a condition now that would throw --- .../adapters/dullahan-api/api-maker.test.ts | 11 +++---- .../src/adapters/dullahan-api/api-maker.ts | 32 ++++++------------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts b/packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts index 48a510cdab..448b632ca9 100644 --- a/packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts +++ b/packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts @@ -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: {}, }, }) diff --git a/packages/portfolio/src/adapters/dullahan-api/api-maker.ts b/packages/portfolio/src/adapters/dullahan-api/api-maker.ts index a477e51c99..e4998fbfb0 100644 --- a/packages/portfolio/src/adapters/dullahan-api/api-maker.ts +++ b/packages/portfolio/src/adapters/dullahan-api/api-maker.ts @@ -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 = - 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 = + 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) { From a72b39a809bfd62c84aea0e707a6b9407a515f2e Mon Sep 17 00:00:00 2001 From: jorbuedo Date: Tue, 25 Mar 2025 12:55:19 +0100 Subject: [PATCH 3/4] upgrade portfolio version --- packages/portfolio/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/portfolio/package.json b/packages/portfolio/package.json index 4f4924196b..21676a6451 100644 --- a/packages/portfolio/package.json +++ b/packages/portfolio/package.json @@ -1,6 +1,6 @@ { "name": "@yoroi/portfolio", - "version": "1.0.3", + "version": "1.0.4", "description": "The Portfolio package of Yoroi SDK", "keywords": [ "yoroi", From a82aab5baf612e6041a8d7ee35a535dad86c2881 Mon Sep 17 00:00:00 2001 From: jorbuedo Date: Thu, 27 Mar 2025 02:30:46 +0100 Subject: [PATCH 4/4] update versions of portfolio --- apps/wallet-mobile/package.json | 2 +- packages/blockchains/package.json | 2 +- packages/claim/package.json | 4 ++-- packages/swap/package.json | 4 ++-- packages/transfer/package.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index 5650a620dc..434d15a6a0 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -136,7 +136,7 @@ "@yoroi/identicon": "^1.0.1", "@yoroi/links": "^1.5.7", "@yoroi/notifications": "^1.0.0", - "@yoroi/portfolio": "1.0.3", + "@yoroi/portfolio": "1.0.4", "@yoroi/resolver": "^2.0.6", "@yoroi/setup-wallet": "^1.0.1", "@yoroi/staking": "^1.6.0", diff --git a/packages/blockchains/package.json b/packages/blockchains/package.json index 4152aece37..09d898c27e 100644 --- a/packages/blockchains/package.json +++ b/packages/blockchains/package.json @@ -141,7 +141,7 @@ "@yoroi/api": "1.5.3", "@yoroi/common": "1.5.4", "@yoroi/explorers": "1.0.2", - "@yoroi/portfolio": "1.0.3", + "@yoroi/portfolio": "1.0.4", "@yoroi/types": "1.5.10" }, "devDependencies": { diff --git a/packages/claim/package.json b/packages/claim/package.json index 31445a22ba..f24be93dd7 100644 --- a/packages/claim/package.json +++ b/packages/claim/package.json @@ -154,7 +154,7 @@ "@types/react": "^18.2.55", "@types/react-test-renderer": "^18.0.7", "@yoroi/common": "^1.5.4", - "@yoroi/portfolio": "1.0.3", + "@yoroi/portfolio": "1.0.4", "@yoroi/types": "1.5.10", "bignumber.js": "^9.0.1", "commitlint": "^17.0.2", @@ -180,7 +180,7 @@ "peerDependencies": { "@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0", "@yoroi/common": "1.5.4", - "@yoroi/portfolio": "1.0.3", + "@yoroi/portfolio": "1.0.4", "immer": "^10.0.2", "react": ">= 16.8.0 <= 19.0.0", "react-query": "^3.39.3" diff --git a/packages/swap/package.json b/packages/swap/package.json index 2cf98c75e2..16c788e705 100644 --- a/packages/swap/package.json +++ b/packages/swap/package.json @@ -151,7 +151,7 @@ "@types/react-test-renderer": "^18.0.7", "@yoroi/api": "1.5.3", "@yoroi/common": "1.5.4", - "@yoroi/portfolio": "1.0.3", + "@yoroi/portfolio": "1.0.4", "@yoroi/types": "1.5.10", "bignumber.js": "^9.0.1", "commitlint": "^17.0.2", @@ -179,7 +179,7 @@ "@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0", "@yoroi/api": "1.5.3", "@yoroi/common": "1.5.4", - "@yoroi/portfolio": "1.0.3", + "@yoroi/portfolio": "1.0.4", "bignumber.js": "^9.0.1", "immer": "^10.0.2", "react": ">= 16.8.0 <= 19.0.0", diff --git a/packages/transfer/package.json b/packages/transfer/package.json index da56191037..d357116370 100644 --- a/packages/transfer/package.json +++ b/packages/transfer/package.json @@ -139,7 +139,7 @@ "@types/jest": "^29.5.12", "@types/react": "^18.2.55", "@types/react-test-renderer": "^18.0.7", - "@yoroi/portfolio": "1.0.3", + "@yoroi/portfolio": "1.0.4", "@yoroi/types": "1.5.10", "commitlint": "^17.0.2", "del-cli": "^5.0.0", @@ -163,7 +163,7 @@ }, "peerDependencies": { "@tanstack/react-query": "4.36.1", - "@yoroi/portfolio": "1.0.3", + "@yoroi/portfolio": "1.0.4", "@yoroi/resolver": "2.0.6", "immer": "^10.0.2", "react": ">= 16.8.0 <= 19.0.0",