From 934f16c1121af106d3ad2cc43caad52a9e8b6fef Mon Sep 17 00:00:00 2001
From: Sophia <littlejohn.sophia@gmail.com>
Date: Thu, 18 Apr 2024 10:26:37 -0400
Subject: [PATCH] Fix fee position adding when updating fees (#2089)

* Add fallback

* Add fee position when updating fees
---
 centrifuge-app/src/components/PoolFees/index.tsx | 2 +-
 centrifuge-js/src/modules/pools.ts               | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 ? (
                 <RouterLinkButton
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,
                 }
               }),
             ],