Merge pull request #4246 from balancer/release/1.126.0

Release 1.126.0

Author: garethfuller

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@balancer/frontend-v2",
-  "version": "1.125.0",
+  "version": "1.126.0",
   "engines": {
     "node": "=16",
     "npm": ">=8"
@@ -76,7 +76,7 @@
     "@sentry/tracing": "^7.17.4",
     "@tanstack/vue-query": "^4.22.0",
     "@testing-library/jest-dom": "^5.16.1",
-    "@testing-library/vue": "^6.4.2",
+    "@testing-library/vue": "^7.0.0",
     "@tomfrench/ens-avatar-resolver": "^0.1.0",
     "@types/animejs": "^3.1.3",
     "@types/debounce-promise": "^3.1.6",
@@ -89,7 +89,7 @@
     "@typescript-eslint/parser": "^5.48.1",
     "@vitejs/plugin-vue": "^4.1.0",
     "@vitest/coverage-c8": "^0.30.1",
-    "@vue/test-utils": "^2.3.2",
+    "@vue/test-utils": "^2.4.1",
     "@vueuse/core": "^4.3.4",
     "@walletconnect/ethereum-provider": "^2.10.1",
     "@walletconnect/modal": "^2.6.2",

package.json

@@ -14,6 +14,8 @@
   "ChildChainGaugeTokenAdder": "0xf302f9F50958c5593770FDf4d4812309fF77414f",
   "ChildChainLiquidityGaugeFactory": "0xb08E16cFc07C684dAA2f93C70323BAdb2A6CBFd2",
   "ChildChainStreamer": "0xD7FAD3bd59D6477cbe1BE7f646F7f1BA25b230f8",
+  "ChildChainGaugeWorkingBalanceHelper": "0x687b8C9b41E01Be8B591725fac5d5f52D0564d79",
+  "ChildChainGaugeCheckpointer": "0x36caC20dd805d128c1a6Dd16eeA845C574b5A17C",
   "CircuitBreakerLib": "0x9129E834e15eA19b6069e8f08a8EcFc13686B8dC",
   "ComposableStablePoolFactory": "0x3B1eb8EB7b43882b385aB30533D9A2BeF9052a98",
   "DistributionScheduler": "0xC128a9954e6c874eA3d62ce62B468bA073093F25",

src/assets/data/contracts/avalanche.json

@@ -13,10 +13,11 @@
   "ChildChainGauge": "0x59562f93c447656F6E4799fC1FC7c3d977C3324F",
   "ChildChainGaugeFactory": "0x2498A2B0d6462d2260EAC50aE1C3e03F4829BA95",
   "ChildChainGaugeRewardHelper": "",
-  "ChildChainGaugeWorkingBalanceHelper": "",
   "ChildChainGaugeTokenAdder": "",
   "ChildChainLiquidityGaugeFactory": "",
   "ChildChainStreamer": "",
+  "ChildChainGaugeWorkingBalanceHelper": "0xa7d524046ef89de9F8e4f2d7B029f66cCB738d48",
+  "ChildChainGaugeCheckpointer": "0xaf779e58dafb4307b998C7b3C9D3f788DFc80632",
   "CircuitBreakerLib": "0xEF454a7B3f965D3f6723E462405246f8Cd865425",
   "ComposableStablePoolFactory": "0x8df317a729fcaA260306d7de28888932cb579b88",
   "DoubleEntrypointFixRelayer": "",

src/assets/data/contracts/base.json

@@ -166,7 +166,7 @@ const spacerWidth = computed((): number => {
 
 const _loadingLabel = computed((): string => {
   if (currentAction.value?.pending) return currentAction.value.loadingLabel;
-  return props.loadingLabel || t('Loading');
+  return props.loadingLabel || t('loading');
 });
 
 /**

src/components/_global/BalActionSteps/BalActionSteps.vue

@@ -7,10 +7,11 @@
           :name="name"
           :checked="modelValue"
           :class="[
-            'bal-checkbox-input hover:border-blue-600 dark:hover:border-blue-400 cursor-pointer transition-colors',
+            'bal-checkbox-input',
             alignCheckbox === 'items-start' && 'relative top-2',
             inputClasses,
           ]"
+          :disabled="disabled"
           @change="onChange"
         />
       </div>
@@ -60,6 +61,7 @@ export default defineComponent({
       default: 'blue',
       validator: (val: string): boolean => ['blue'].includes(val),
     },
+    disabled: { type: Boolean, default: false },
   },
 
   emits: ['update:modelValue'],
@@ -148,8 +150,7 @@ export default defineComponent({
 }
 
 .bal-checkbox-input {
-  @apply text-blue-600 dark:text-blue-400 bg-white dark:bg-gray-700 border border-gray-500 dark:border-gray-500
-    rounded leading-none;
+  @apply rounded;
 
   appearance: none;
   -webkit-print-color-adjust: exact;
@@ -159,15 +160,27 @@ export default defineComponent({
   user-select: none;
 }
 
+.bal-checkbox-input:enabled {
+  @apply text-blue-600 dark:text-blue-400 bg-white dark:bg-gray-700 border
+   border-gray-500 dark:border-gray-500 leading-none hover:border-blue-600 dark:hover:border-blue-400 cursor-pointer transition-colors;
+}
+
 .bal-checkbox-input:checked {
   background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M5.707 7.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0-1.414-1.414L7 8.586 5.707 7.293z'/%3e%3c/svg%3e");
   border-color: transparent;
-  background-color: currentcolor;
   background-size: 100% 100%;
   background-position: center;
   background-repeat: no-repeat;
 }
 
+.bal-checkbox-input:disabled {
+  @apply bg-gray-200 dark:bg-gray-800 cursor-not-allowed;
+}
+
+.bal-checkbox-input:enabled:checked {
+  background-color: currentcolor;
+}
+
 .bal-checkbox-error {
   @apply text-red-500 text-sm pt-1;
 }

src/components/_global/BalCheckbox/BalCheckbox.vue

@@ -37,6 +37,14 @@ function getHorizontalStickyClass(index: number) {
   }
   return '';
 }
+
+function handleColumnClick(column: ColumnDefinition, event: Event) {
+  // Disable default onClick when column is a checkbox
+  if (column.isCheckbox && event.target?.['type'] !== 'checkbox') {
+    event.preventDefault();
+    event.stopPropagation();
+  }
+}
 </script>
 
 <template>
@@ -54,12 +62,14 @@ function getHorizontalStickyClass(index: number) {
   >
     <td
       v-for="(column, columnIndex) in columns"
-      :key="column.id"
+      :key="column.id + columnIndex"
       :class="[
         column.align === 'right' ? 'text-left' : 'text-right',
         getHorizontalStickyClass(columnIndex),
         isColumnStuck ? 'isSticky' : '',
+        column.isCheckbox ? 'cursor-default' : '',
       ]"
+      @click="handleColumnClick(column, $event)"
     >
       <component
         :is="href?.getHref(data) ? 'a' : link ? 'router-link' : 'div'"

src/components/_global/BalTable/BalTableRow.vue

@@ -30,4 +30,6 @@ export type ColumnDefinition<T = Data> = {
   totalsCell?: string;
 
   cellClassName?: string;
+  // Disables default row onclick behavior for special columns like checkbox ones
+  isCheckbox?: boolean;
 };