From 912c7fd6e90e54db240586e9fff76fec4b543422 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 24 Oct 2024 11:14:06 +0200 Subject: [PATCH] fix price fetching bug (#3706) --- packages/common/package.json | 2 +- .../round/ViewCartPage/SummaryContainer.tsx | 13 +++++++++++-- .../features/round/ViewCartPage/ViewCartPage.tsx | 2 +- pnpm-lock.yaml | 10 +++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index c292349d3..a591bafd7 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -19,7 +19,7 @@ "@allo-team/allo-v2-sdk": "^1.0.79", "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/providers": "^5.7.2", - "@gitcoin/gitcoin-chain-data": "^1.0.40", + "@gitcoin/gitcoin-chain-data": "^1.0.42", "@gitcoinco/passport-sdk-types": "^0.2.0", "@openzeppelin/merkle-tree": "^1.0.2", "@rainbow-me/rainbowkit": "2.1.2", diff --git a/packages/grant-explorer/src/features/round/ViewCartPage/SummaryContainer.tsx b/packages/grant-explorer/src/features/round/ViewCartPage/SummaryContainer.tsx index dc3356361..b7483b4ea 100644 --- a/packages/grant-explorer/src/features/round/ViewCartPage/SummaryContainer.tsx +++ b/packages/grant-explorer/src/features/round/ViewCartPage/SummaryContainer.tsx @@ -404,7 +404,10 @@ export function SummaryContainer(props: { // $variant="solid" data-testid="handle-confirmation" type="button" - disabled={totalDonationAcrossChainsInUSD === 0} + disabled={ + // enabled, if at least one chain has enough balance to checkout + !Object.values(props.enoughBalanceByChainId).some((value) => value) + } onClick={() => { /* If wallet is not connected, display Rainbowkit modal */ if (!isConnected) { @@ -420,7 +423,13 @@ export function SummaryContainer(props: {

- Need to bridge funds ? Bridge funds props.handleSwap(42161)}>here! + Need to bridge funds ? Bridge funds{" "} + props.handleSwap(42161)} + > + here! +

); diff --git a/packages/grant-explorer/src/features/round/ViewCartPage/ViewCartPage.tsx b/packages/grant-explorer/src/features/round/ViewCartPage/ViewCartPage.tsx index fe61d5662..79b82f48f 100644 --- a/packages/grant-explorer/src/features/round/ViewCartPage/ViewCartPage.tsx +++ b/packages/grant-explorer/src/features/round/ViewCartPage/ViewCartPage.tsx @@ -190,7 +190,7 @@ export default function ViewCart() { const balance = balances[Number(chainId)][ getVotingTokenForChain(Number(chainId)).address.toLowerCase() - ].formattedAmount; + ]?.formattedAmount || 0; acc[Number(chainId)] = balance >= totalAmount; return acc; }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c9bf88b6a..9041c33fd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -374,8 +374,8 @@ importers: specifier: ^5.7.2 version: 5.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.10) '@gitcoin/gitcoin-chain-data': - specifier: ^1.0.40 - version: 1.0.40(bufferutil@4.0.8)(typescript@5.6.2)(utf-8-validate@5.0.10)(zod@3.23.8) + specifier: ^1.0.42 + version: 1.0.42(bufferutil@4.0.8)(typescript@5.6.2)(utf-8-validate@5.0.10)(zod@3.23.8) '@gitcoinco/passport-sdk-types': specifier: ^0.2.0 version: 0.2.0 @@ -3489,8 +3489,8 @@ packages: '@foundry-rs/easy-foundryup@0.1.3': resolution: {integrity: sha512-Funb4hrSBeikKCmccFT/d3Ud5o92tlIZHTJeMCVk5b54/+CHZHr4g7MmtvO5xrGhxrOebQ0L+ojIj+VixgW7ug==} - '@gitcoin/gitcoin-chain-data@1.0.40': - resolution: {integrity: sha512-2Tw7HOynaKHUS02Awj4qeziWU7MGkAAMRUWgt8rQoUAD+aEWeMOkgmStWvdKj+uDNtKjjRD9j+gVvWr4+Z58OA==} + '@gitcoin/gitcoin-chain-data@1.0.42': + resolution: {integrity: sha512-hEhmEZMd8Pgi/XjnM3Dz25SyrXMOd1DM72zN0f5/tPPxAmPgFK6XeSSlvCsPLCye1+veHz3UlHFpLRq0cuwPWQ==} engines: {node: '>=16.15.0', npm: '>=8.5.5'} peerDependencies: typescript: ^5.0.0 @@ -19683,7 +19683,7 @@ snapshots: command-exists: 1.2.9 ts-interface-checker: 0.1.13 - '@gitcoin/gitcoin-chain-data@1.0.40(bufferutil@4.0.8)(typescript@5.6.2)(utf-8-validate@5.0.10)(zod@3.23.8)': + '@gitcoin/gitcoin-chain-data@1.0.42(bufferutil@4.0.8)(typescript@5.6.2)(utf-8-validate@5.0.10)(zod@3.23.8)': dependencies: typescript: 5.6.2 viem: 2.13.10(bufferutil@4.0.8)(typescript@5.6.2)(utf-8-validate@5.0.10)(zod@3.23.8)