diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 84600f0dbc..a86499c1e0 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -14,7 +14,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '18.x' - name: Install deps run: npm install -g npm@7 && npm ci - name: Run build @@ -31,7 +31,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '18.x' - name: Install deps run: npm install -g npm@7 && npm ci - name: Run lint @@ -48,7 +48,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '18.x' - name: Install deps run: npm install -g npm@7 && npm ci - name: Run typecheck diff --git a/package-lock.json b/package-lock.json index 1814710acd..3e5cf81906 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.139.85", + "version": "1.140.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.139.85", + "version": "1.140.0", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", @@ -85,7 +85,7 @@ "ethereumjs-util": "^7.0.7", "events": "^3.3.0", "feather-icons": "^4.28.0", - "happy-dom": "^12.10.3", + "happy-dom": "^13.1.4", "husky": "^8.0.0", "jest-extended": "^3.2.4", "json-to-graphql-query": "^2.0.0", @@ -15370,9 +15370,9 @@ } }, "node_modules/happy-dom": { - "version": "12.10.3", - "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-12.10.3.tgz", - "integrity": "sha512-JzUXOh0wdNGY54oKng5hliuBkq/+aT1V3YpTM+lrN/GoLQTANZsMaIvmHiHe612rauHvPJnDZkZ+5GZR++1Abg==", + "version": "13.1.4", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-13.1.4.tgz", + "integrity": "sha512-f8STa4iuJcpXn7YjgqBEemzinyPAdjlHMxlCNbIERdRIjJO9Z9Cj3XW5LuiEhsURFfl0AOWqj0hQitme4gq+Gg==", "dev": true, "dependencies": { "css.escape": "^1.5.1", @@ -39910,9 +39910,9 @@ } }, "happy-dom": { - "version": "12.10.3", - "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-12.10.3.tgz", - "integrity": "sha512-JzUXOh0wdNGY54oKng5hliuBkq/+aT1V3YpTM+lrN/GoLQTANZsMaIvmHiHe612rauHvPJnDZkZ+5GZR++1Abg==", + "version": "13.1.4", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-13.1.4.tgz", + "integrity": "sha512-f8STa4iuJcpXn7YjgqBEemzinyPAdjlHMxlCNbIERdRIjJO9Z9Cj3XW5LuiEhsURFfl0AOWqj0hQitme4gq+Gg==", "dev": true, "requires": { "css.escape": "^1.5.1", diff --git a/package.json b/package.json index 1ec0f81ea9..d7861ea111 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.139.85", + "version": "1.140.0", "engines": { "node": "=16", "npm": ">=8" @@ -115,7 +115,7 @@ "ethereumjs-util": "^7.0.7", "events": "^3.3.0", "feather-icons": "^4.28.0", - "happy-dom": "^12.10.3", + "happy-dom": "^13.1.4", "husky": "^8.0.0", "jest-extended": "^3.2.4", "json-to-graphql-query": "^2.0.0", diff --git a/src/components/contextual/pages/pools/StakedPoolsTable.vue b/src/components/contextual/pages/pools/StakedPoolsTable.vue index bd16a4d458..f299d76369 100644 --- a/src/components/contextual/pages/pools/StakedPoolsTable.vue +++ b/src/components/contextual/pages/pools/StakedPoolsTable.vue @@ -129,6 +129,7 @@ watch( () => userGaugeShares.value, async val => { if (!val || isVeBalSupported.value) return; + console.log('userGaugeShares', val); for (const gauge of val) { try { const id = gauge?.gauge.id; diff --git a/src/components/contextual/pages/vebal/MyVebalInfo.vue b/src/components/contextual/pages/vebal/MyVebalInfo.vue index 8be6684e08..1cb4f9db7e 100644 --- a/src/components/contextual/pages/vebal/MyVebalInfo.vue +++ b/src/components/contextual/pages/vebal/MyVebalInfo.vue @@ -168,8 +168,8 @@ const userRank = computed(() => { const vebalInfo = computed(() => { const arr: { icon: any; value: string }[] = []; - - if (bnum(veBalBalance.value).isGreaterThan(0)) { + const hasVebalBalance = bnum(veBalBalance.value).isGreaterThan(0); + if (hasVebalBalance) { arr.push({ icon: share, value: t('veBAL.myVeBAL.cards.myVeBAL.secondaryText', [ @@ -186,7 +186,7 @@ const vebalInfo = computed(() => { }); } - if (userRank.value) { + if (hasVebalBalance && userRank.value) { arr.unshift({ icon: rank, value: `Rank ${userRank.value}`, diff --git a/src/components/contextual/pages/vebal/cross-chain-boost/CrossChainBoostCards.vue b/src/components/contextual/pages/vebal/cross-chain-boost/CrossChainBoostCards.vue index 18bd363ed3..66292c3be6 100644 --- a/src/components/contextual/pages/vebal/cross-chain-boost/CrossChainBoostCards.vue +++ b/src/components/contextual/pages/vebal/cross-chain-boost/CrossChainBoostCards.vue @@ -140,6 +140,10 @@ function onCloseModal() {