From 5c6820e9115024e148c22f9aaca334629782082d Mon Sep 17 00:00:00 2001
From: Onno Visser <23527729+onnovisser@users.noreply.github.com>
Date: Mon, 6 May 2024 16:47:23 +0200
Subject: [PATCH 1/2] remove permissions check

---
 .../src/components/LiquidityEpochSection.tsx        | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/centrifuge-app/src/components/LiquidityEpochSection.tsx b/centrifuge-app/src/components/LiquidityEpochSection.tsx
index c08d7edd48..0d145cfecd 100644
--- a/centrifuge-app/src/components/LiquidityEpochSection.tsx
+++ b/centrifuge-app/src/components/LiquidityEpochSection.tsx
@@ -71,19 +71,8 @@ function EpochStatusOngoing({ pool }: { pool: Pool }) {
   const [account] = useSuitableAccounts({ poolId: pool.id, proxyType: ['Borrow', 'Invest'] })
   const api = useCentrifugeApi()
   const orders = usePoolAccountOrders(pool.id)
-  const poolPermissions = usePoolPermissions(pool.id)
   const { showOrderExecution } = useDebugFlags()
 
-  const isIssuer = account
-    ? Object.keys(poolPermissions || {})
-        .filter(
-          (address) =>
-            poolPermissions?.[address].roles.includes('InvestorAdmin') ||
-            poolPermissions?.[address].roles.includes('LoanAdmin')
-        )
-        .includes(account.actingAddress)
-    : false
-
   const { execute: closeEpochTx, isLoading: loadingClose } = useCentrifugeTransaction(
     'Start order execution',
     (cent) => (args: [poolId: string, batchSolution: boolean, collect: boolean], options) =>
@@ -166,7 +155,7 @@ function EpochStatusOngoing({ pool }: { pool: Pool }) {
             </Text>
           )} */}
 
-          {(isIssuer || showOrderExecution) && (
+          {(account || showOrderExecution) && (
             <Button
               small
               variant="secondary"

From 0297c26d006d7b2be63e581ed3b9146cc0652b56 Mon Sep 17 00:00:00 2001
From: Onno Visser <23527729+onnovisser@users.noreply.github.com>
Date: Tue, 7 May 2024 10:23:09 +0200
Subject: [PATCH 2/2] fix roles

---
 .../src/components/LiquidityEpochSection.tsx  | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/centrifuge-app/src/components/LiquidityEpochSection.tsx b/centrifuge-app/src/components/LiquidityEpochSection.tsx
index 0d145cfecd..e6d5ff3f5c 100644
--- a/centrifuge-app/src/components/LiquidityEpochSection.tsx
+++ b/centrifuge-app/src/components/LiquidityEpochSection.tsx
@@ -18,7 +18,7 @@ import { useTinlakeTransaction } from '../utils/tinlake/useTinlakeTransaction'
 import { useChallengeTimeCountdown } from '../utils/useChallengeTimeCountdown'
 import { useEpochTimeCountdown } from '../utils/useEpochTimeCountdown'
 import { useLiquidity } from '../utils/useLiquidity'
-import { usePoolPermissions, useSuitableAccounts } from '../utils/usePermissions'
+import { useSuitableAccounts } from '../utils/usePermissions'
 import { usePoolAccountOrders } from '../utils/usePools'
 import { DataTable } from './DataTable'
 import { DataTableGroup } from './DataTableGroup'
@@ -68,7 +68,11 @@ function EpochStatusOngoing({ pool }: { pool: Pool }) {
   const { sumOfLockedInvestments, sumOfLockedRedemptions, sumOfExecutableInvestments, sumOfExecutableRedemptions } =
     useLiquidity(pool.id)
   const { message: epochTimeRemaining } = useEpochTimeCountdown(pool.id)
-  const [account] = useSuitableAccounts({ poolId: pool.id, proxyType: ['Borrow', 'Invest'] })
+  const [account] = useSuitableAccounts({
+    poolId: pool.id,
+    proxyType: ['Borrow', 'Invest'],
+    poolRole: ['InvestorAdmin', 'LoanAdmin'],
+  })
   const api = useCentrifugeApi()
   const orders = usePoolAccountOrders(pool.id)
   const { showOrderExecution } = useDebugFlags()
@@ -246,20 +250,15 @@ function EpochStatusSubmission({ pool }: { pool: Pool }) {
 
 function EpochStatusExecution({ pool }: { pool: Pool }) {
   const { minutesRemaining, minutesTotal } = useChallengeTimeCountdown(pool.id)
-  const [account] = useSuitableAccounts({ poolId: pool.id, proxyType: ['Borrow', 'Invest'] })
+  const [account] = useSuitableAccounts({
+    poolId: pool.id,
+    proxyType: ['Borrow', 'Invest'],
+    poolRole: ['InvestorAdmin', 'LoanAdmin'],
+  })
   const api = useCentrifugeApi()
   const orders = usePoolAccountOrders(pool.id)
-  const poolPermissions = usePoolPermissions(pool.id)
   const { showOrderExecution } = useDebugFlags()
 
-  const isIssuer = Object.keys(poolPermissions || {})
-    .filter(
-      (address) =>
-        poolPermissions?.[address].roles.includes('InvestorAdmin') ||
-        poolPermissions?.[address].roles.includes('LoanAdmin')
-    )
-    .includes(account.actingAddress)
-
   const { execute: executeEpochTx, isLoading: loadingExecution } = useCentrifugeTransaction(
     'Execute order',
     (cent) => (args: [poolId: string, collect: boolean], options) =>
@@ -298,7 +297,7 @@ function EpochStatusExecution({ pool }: { pool: Pool }) {
       title="Order overview"
       titleAddition={<Text variant="body2">{loadingExecution && 'Order executing'}</Text>}
       headerRight={
-        (isIssuer || showOrderExecution) && (
+        (account || showOrderExecution) && (
           <Button
             small
             variant={minutesRemaining > 0 ? 'secondary' : 'primary'}