Merge pull request #5130 from balancer/release/1.140.0

Release 1.140.0

.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

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",

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;

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}`,

src/components/contextual/pages/vebal/cross-chain-boost/CrossChainBoostCards.vue

@@ -140,6 +140,10 @@ function onCloseModal() {
                   <template #activator>
                     <BalLink
                       :href="syncLayerZeroTxLinks[network]"
+                      :disabled="
+                        !checkIfNetworkSyncing(network) ||
+                        !syncLayerZeroTxLinks[network]
+                      "
                       external
                       noStyle
                       class="group flex items-center"

src/components/pool/PoolPageHeader.vue

@@ -214,14 +214,20 @@ function symbolFor(titleTokenIndex: number): string {
       </BalTooltip>
     </div>
   </div>
-  <BalAlert
-    v-if="pool.isInRecoveryMode && pool.isPaused"
-    type="warning"
-    :title="$t('recoveryMode')"
-    :description="$t('recoveryModeDescription')"
-    class="mt-2"
-    block
-  />
+  <div v-if="pool.isInRecoveryMode || pool.isPaused" class="flex mt-2">
+    <BalChip
+      v-if="pool.isInRecoveryMode"
+      class="mr-2"
+      color="orange"
+      :outline="false"
+    >
+      Recovery Mode
+    </BalChip>
+    <BalChip v-if="pool.isPaused" color="orange" :outline="false">
+      Paused
+    </BalChip>
+  </div>
+
   <BalAlert
     v-if="hasNonApprovedRateProviders"
     type="warning"

src/composables/usePoolHelpers.ts

@@ -310,7 +310,6 @@ export function totalAprLabel(
     return '-';
   }
   if (boost && boost !== '1' && isConnected) {
-    console.log('boosted');
     return numF(absMaxApr(aprs, boost), FNumFormats.bp);
   }
   if (

src/pages/pool/_id.vue

@@ -25,7 +25,7 @@ import {
 import { useTokens } from '@/providers/tokens.provider';
 import { POOLS } from '@/constants/pools';
 import { includesAddress } from '@/lib/utils';
-import useHistoricalPricesQuery from '@/composables/queries/useHistoricalPricesQuery';
+// import useHistoricalPricesQuery from '@/composables/queries/useHistoricalPricesQuery';
 import { PoolToken } from '@/services/pool/types';
 import useWeb3 from '@/services/web3/useWeb3';
 import BrandedRedirectCard from '@/components/pool/branded-redirect/BrandedRedirectCard.vue';
@@ -78,13 +78,13 @@ const snapshots = computed(() => poolSnapshotsQuery.data.value);
 //#endregion
 
 //#region historical prices query
-const historicalPricesQuery = useHistoricalPricesQuery(
-  poolId,
-  undefined,
-  // in order to prevent multiple coingecko requests
-  { refetchOnWindowFocus: false }
-);
-const historicalPrices = computed(() => historicalPricesQuery.data.value);
+// const historicalPricesQuery = useHistoricalPricesQuery(
+//   poolId,
+//   undefined,
+//   // in order to prevent multiple coingecko requests
+//   { refetchOnWindowFocus: false }
+// );
+// const historicalPrices = computed(() => historicalPricesQuery.data.value);
 //#endregion
 
 //#region APR query
@@ -217,7 +217,7 @@ watch(
         <div class="grid grid-cols-1 gap-y-8">
           <div class="px-4 lg:px-0">
             <PoolChart
-              :historicalPrices="historicalPrices"
+              :historicalPrices="null"
               :snapshots="snapshots"
               :loading="isLoadingSnapshots"
               :totalLiquidity="pool?.totalLiquidity"

src/pages/swap.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted } from 'vue';
 import MyWallet from '@/components/cards/MyWallet/MyWallet.vue';
-import PairPriceGraph from '@/components/cards/PairPriceGraph/PairPriceGraph.vue';
+// import PairPriceGraph from '@/components/cards/PairPriceGraph/PairPriceGraph.vue';
 import SwapCard from '@/components/cards/SwapCard/SwapCard.vue';
 import Col3Layout from '@/components/layouts/Col3Layout.vue';
 import usePoolFilters from '@/composables/pools/usePoolFilters';
@@ -27,7 +27,7 @@ const { upToLargeBreakpoint } = useBreakpoints();
 const sections = computed(() => {
   const sections = [
     { title: 'My wallet', id: 'my-wallet' },
-    { title: 'Price chart', id: 'price-chart' },
+    // { title: 'Price chart', id: 'price-chart' },
   ];
   if (hasBridge.value) sections.push({ title: 'Bridge assets', id: 'bridge' });
   return sections;
@@ -59,17 +59,17 @@ onMounted(() => {
           <template #my-wallet>
             <MyWallet />
           </template>
-          <template #price-chart>
-            <PairPriceGraph />
-          </template>
+          <!-- <template #price-chart> -->
+          <!-- <PairPriceGraph /> -->
+          <!-- </template> -->
           <template v-if="hasBridge" #bridge>
             <BridgeLink />
           </template>
         </BalAccordion>
       </div>
 
       <template #gutterRight>
-        <PairPriceGraph />
+        <!-- <PairPriceGraph /> -->
         <BridgeLink v-if="hasBridge" class="mt-4" />
       </template>
     </Col3Layout>

src/providers/cross-chain-sync.provider.spec.ts

@@ -128,7 +128,7 @@ test('Calculates L2 network balances', async () => {
   `);
 });
 
-test.skip('Synchronizes Arbitrum', async () => {
+test('Synchronizes Arbitrum', async () => {
   mockOmniEscrowLocks([]);
   const { sync } = await mountCrossChainSync();
 

src/providers/cross-chain-sync.provider.ts

@@ -347,9 +347,9 @@ export const crossChainSyncProvider = () => {
       return '';
     }
 
-    const { srcUaAddress, dstUaAddress, dstChainId, srcUaNonce } = message;
-    const link = `https://layerzeroscan.com/101/address/${srcUaAddress}/message/${dstChainId}/address/${dstUaAddress}/nonce/${srcUaNonce}`;
+    const { srcTxHash } = message;
 
+    const link = `https://layerzeroscan.com/tx/${srcTxHash}`;
     return link;
   }
 

tests/vitest/setup-msw.ts

@@ -1,4 +1,8 @@
 import { server } from '@tests/msw/server';
+import { fetch } from 'cross-fetch';
+
+// By default, our setup would use happy-dom fetch() implementation which is not 100% compatible with MSW
+global.fetch = fetch;
 
 // MSW SETUP
 // Establish API mocking before all tests.