From 1155037c47199c587c505034a2de6c1b05652b5f Mon Sep 17 00:00:00 2001 From: sophian Date: Wed, 17 Apr 2024 19:05:57 -0400 Subject: [PATCH 1/2] Add fallback --- centrifuge-app/src/components/PoolFees/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centrifuge-app/src/components/PoolFees/index.tsx b/centrifuge-app/src/components/PoolFees/index.tsx index 234a0fafce..08c741a92c 100644 --- a/centrifuge-app/src/components/PoolFees/index.tsx +++ b/centrifuge-app/src/components/PoolFees/index.tsx @@ -167,7 +167,7 @@ export function PoolFees() { percentOfNav: feeChainData?.amounts?.percentOfNav, pendingFees: feeChainData?.amounts.pending, receivingAddress: feeChainData?.destination, - feePosition: feeMetadata?.feePosition, + feePosition: feeMetadata?.feePosition || 'Top of waterfall', action: (isAllowedToCharge || poolAdmin) && !fixedFee ? ( Date: Wed, 17 Apr 2024 19:06:26 -0400 Subject: [PATCH 2/2] Add fee position when updating fees --- centrifuge-js/src/modules/pools.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts index 0a23c447b7..5dec33722e 100644 --- a/centrifuge-js/src/modules/pools.ts +++ b/centrifuge-js/src/modules/pools.ts @@ -3611,10 +3611,9 @@ export function getPoolsModule(inst: Centrifuge) { }) || []), ...add.map((metadata, index) => { return { - // chain refactor required: feeId needs to be assigned to fee when it's proposed - // until then multiple fees have to be added at once or all pending fees have to be applied before adding more id: parseInt(lastFeeId.toHuman() as string) + index + 1, name: metadata.fee.name, + feePosition: metadata.fee.feePosition, } }), ],