Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Show Close Epoch button for borrower #2115

Merged
merged 3 commits into from
May 7, 2024
Merged

Show Close Epoch button for borrower #2115

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c6820e
remove permissions check
onnovisser May 6, 2024
0297c26
fix roles
onnovisser May 7, 2024
75e5f60
Merge branch 'main' into fix-close-epoch
onnovisser May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions centrifuge-app/src/components/LiquidityEpochSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -68,22 +68,15 @@ 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 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) =>
Expand Down Expand Up @@ -166,7 +159,7 @@ function EpochStatusOngoing({ pool }: { pool: Pool }) {
</Text>
)} */}

{(isIssuer || showOrderExecution) && (
{(account || showOrderExecution) && (
<Button
small
variant="secondary"
Expand Down Expand Up @@ -257,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) =>
Expand Down Expand Up @@ -309,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'}
Expand Down
Loading