Skip to content

Commit

Permalink
Merge pull request #4117 from balancer/release/1.121.0
Browse files Browse the repository at this point in the history
Release 1.121.0 (DM)
  • Loading branch information
timjrobinson authored Aug 29, 2023
2 parents 91c5583 + 70cb734 commit d0770fb
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 6 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@balancer/frontend-v2",
"version": "1.120.14",
"version": "1.121.0",
"engines": {
"node": "=16",
"npm": ">=8"
Expand Down
11 changes: 9 additions & 2 deletions src/components/_global/BalTable/BalTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const emit = defineEmits<{
type Props = {
columns: ColumnDefinition[];
data: DataProp[];
// Sometimes we want to explicitly specify a function to calculate the unique row key (for example, voting pool rows can have repeated ids)
rowKey?: (dataItem: DataProp) => string;
isLoading?: boolean;
isLoadingMore?: boolean;
skeletonClass?: string;
Expand Down Expand Up @@ -152,6 +154,11 @@ function getAlignProperty(align: 'left' | 'right' | 'center' | undefined) {
}
}
function getRowKey(dataItem: DataProp, index: number) {
if (props.rowKey) return `tableRow-${props.rowKey(dataItem)}`;
return `tableRow-${dataItem.id ?? index}`;
}
onMounted(() => {
if (bodyRef.value) {
bodyRef.value.onscroll = () => {
Expand Down Expand Up @@ -323,7 +330,7 @@ watch([() => props.data, () => props.isLoading], ([newData]) => {
<PinHeader v-if="pinnedData.length" />
<BalTableRow
v-for="(dataItem, index) in pinnedData"
:key="`tableRow-${dataItem.id ?? index}`"
:key="getRowKey(dataItem, index)"
:class="getTableRowClass(dataItem, index)"
:data="dataItem"
:columns="filteredColumns"
Expand All @@ -343,7 +350,7 @@ watch([() => props.data, () => props.isLoading], ([newData]) => {
<!-- begin data rows -->
<template
v-for="(dataItem, index) in unpinnedData"
:key="`tableRow-${dataItem.id ?? index}`"
:key="getRowKey(dataItem, index)"
>
<BalTableRow
v-if="!renderedRowsIdx || index <= renderedRowsIdx"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ function getPickedTokens(tokens: VotingPool['tokens']) {
<BalTable
:columns="columns"
:data="data"
:rowKey="(dataItem: VotingPool) => dataItem.gauge.address"
:isLoading="isLoading"
skeletonClass="h-64"
sticky="both"
Expand Down
1 change: 1 addition & 0 deletions src/lib/config/arbitrum/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const pools: Pools = {
'0x84a1038d55e887c2abb8cb02ccf4c9d3871c859a000000000000000000000489', // rETH-WETH (stafi)
'0x0c8972437a38b389ec83d1e666b69b8a4fcf8bfd00000000000000000000049e', // wstETH/rETH/sfrxETH
'0xee7e36b8b24a1c60c28e7336e937d43f74aad7400000000000000000000004a4', // STAR-USDC.e
'0xa7952cd7ea8effbd81c2b4de72a1e5b9bd1b3e2a0000000000000000000004a1', // USDF/4pool
],
},
Investment: {
Expand Down
2 changes: 2 additions & 0 deletions src/lib/config/base/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ const pools: Pools = {
'0xfa4ac3ecfece20769f8b5d9b6dfa5b7ed6569de2000200000000000000000033', // weth-mz
'0x65e8e75899f683c8e2e73c77d6c5c63075f296cd00020000000000000000002b', // sus-weth
'0x109fb663fbe47bcef8cf1d74759ebb869e390105000200000000000000000037', // 1WETH-99USDbC
'0x7bd499100daee002c8df900d831a3dc0c2c91040000200000000000000000039', // 85BPT-stabal3-15ONE
'0x18f150c43598cd822d39711c55bd90407a8b8ad700020000000000000000003b', // 90BPT-50STABAL3-50WETH-10ONE
],
},
Factories: {
Expand Down
1 change: 1 addition & 0 deletions src/lib/config/gnosis-chain/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const pools: Pools = {
'0xbad20c15a773bf03ab973302f61fabcea5101f0a000000000000000000000034', // WETH / wstETH
'0xe15cac1df3621e001f76210ab12a7f1a1691481f000000000000000000000044', // bb-ag-USD
'0x2086f52651837600180de173b09470f54ef7491000000000000000000000004f', // xdai-usdc-usdt
'0x0c1b9ce6bf6c01f587c2ee98b0ef4b20c6648753000000000000000000000050', // eure-stabal3
],
},
Investment: {
Expand Down
5 changes: 4 additions & 1 deletion src/lib/config/mainnet/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ const pools: Pools = {
'0xe7e2c68d3b13d905bbb636709cf4dfd21076b9d20000000000000000000005ca', // swETH-WETH-BPT
'0xd5d99b7e9697ba8bb1da48f07ba81900c7572cea0000000000000000000005cc', // DUSD-3POOL-BPT
'0x37b18b10ce5635a84834b26095a0ae5639dcb7520000000000000000000005cb', // ETHx-WETH-BPT
'0x8353157092ed8be69a9df8f95af097bbf33cb2af0000000000000000000005d9', // GHO/USDT/USDC
'0x6ae5a7857aad26722cb02cc168e38c52e0e4e45d0000000000000000000005dd', // TBY-feb1924-USDC-BPT
],
},
Investment: {
Expand Down Expand Up @@ -195,7 +197,8 @@ const pools: Pools = {
'0x3ff3a210e57cfe679d9ad1e9ba6453a716c56a2e0002000000000000000005d5', // USDC/STG
'0x034e2d995b39a88ab9a532a9bf0deddac2c576ea0002000000000000000005d1', // 80SD-20ETHx
'0x0da692ac0611397027c91e559cfd482c4197e4030002000000000000000005c9', // 50bb-s-DAI-50bb-a-USDC
'0xdd378a2a1dd89a90ee1de05aff195a4f2e476c490001000000000000000005d8', // KNC/WETH/USDC
'0x6f0ed6f346007563d3266de350d174a831bde0ca0001000000000000000005db', // KNC/WETH/USDC
'0xf01b0684c98cd7ada480bfdf6e43876422fa1fc10002000000000000000005de', // ECLP-wstETH-wETH
],
},
Factories: {
Expand Down
4 changes: 4 additions & 0 deletions src/lib/config/polygon/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,12 @@ const pools: Pools = {
'0x16b98793f3e6a17d15931a2c9f98fe28d1c845a1000100000000000000000c1f', // 1stMATIC-bb-a-WMATIC-BPT-0QI-50STARD-0fireEP-1bb-am-USD-1vQi-47STARV2
'0xc976855d2201298b8b35ad523dfb4cbd67ad6838000200000000000000000c20', // 50WETH-50NEX
'0x513f69b2e2a6fa0347529e6178002213cf60ce3d000200000000000000000c24', // 50WETH-50AAVE
'0xec7b8286e906fd74f14d0a0bdf0d362e0d1a3f9c000100000000000000000c1c', // 45WETH-45WMATIC-10TSB
'0x0dd7398a4366efad04bad15ad0d6f3efd1682cd0000200000000000000000c28', // 50SUSHI-50USDT
'0x2fb9cc718d45867688da816c35858a436c1b62e4000200000000000000000c2d', // 50STARD-50STARV2
'0x78e0f9e91fe77058d13a7162b72a5d5e5f2bbd23000200000000000000000c2f', // 50STARD-50wUSDR
'0x6f662a90bc9c48a2acb0958df49c71f35d7bf248000200000000000000000c30', // 50tetuQi-50STARV2
'0xc75daa752fb3f160b4c96364f2ee12e3434df655000200000000000000000c31', // 50wstETH-50bIB01
],
},
Factories: {
Expand Down

1 comment on commit d0770fb

@vercel
Copy link

@vercel vercel bot commented on d0770fb Aug 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.