Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Modal: Pooling #99

Merged
merged 4 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"@polkadot/extension-inject": "latest",
"@polkadot/types": "latest",
"@polkadot/ui-keyring": "latest",
"@polkadot/util": "latest",
"@polkadot/util": "^12.6.2",
"@polkadot/util-crypto": "^12.6.2",
"@types/humanize-duration": "^3.27.3",
"@vercel/analytics": "^1.2.2",
"clsx": "^1.1.1",
Expand Down Expand Up @@ -67,4 +68,4 @@
"typescript": "^4.7.4",
"webpack": "^5.81.0"
}
}
}
10 changes: 8 additions & 2 deletions src/components/Elements/ListingCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ const ListingCardInner = ({
>
<Typography fontSize={'1rem'}>Price/timeslice:</Typography>
<Typography variant='h2'>
{`${formatBalance(listing.timeslicePrice.toString(), true)} ${symbol}`}
{`${formatBalance(
listing.timeslicePrice.toString(),
true
)} ${symbol}`}
</Typography>
</Box>
<Box
Expand All @@ -206,7 +209,10 @@ const ListingCardInner = ({
>
<Typography fontSize={'1rem'}>Total:</Typography>
<Typography variant='h2'>
{`${formatBalance(listing.currentPrice.toString(), true)} ${symbol}`}
{`${formatBalance(
listing.currentPrice.toString(),
true
)} ${symbol}`}
</Typography>
</Box>
</Box>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Elements/RegionCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { useRelayApi } from '@/contexts/apis';
import { ApiState } from '@/contexts/apis/types';
import { useCommon } from '@/contexts/common';
import { useTasks } from '@/contexts/tasks';
import { RegionLocation, RegionMetadata } from '@/models';
import { POOLING_TASK_ID, RegionLocation, RegionMetadata } from '@/models';

import styles from './index.module.scss';
import { Label } from '..';
Expand Down Expand Up @@ -168,6 +168,7 @@ const RegionCardInner = ({
};

const getTask = (taskId: number | null): string => {
if (taskId === POOLING_TASK_ID) return 'Instantaneous Pool';
const getTaskName = (taskId: number) => {
return tasks.find(({ id }) => id === taskId)?.name || '';
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.options {
display: flex;
justify-content: center;
}

.option,
.activeOption {
min-width: 15rem;
margin: 1rem 5rem;
border-radius: 0.5rem !important;
text-transform: capitalize;
}

.activeOption {
border: 1px solid #e84d68;
background: linear-gradient(180deg, #e84d68 0%, #ad2b49 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}

.option {
border: 1px solid #cccccc !important;
background-color: white;
color: black;
}
27 changes: 27 additions & 0 deletions src/components/Elements/Selectors/FinalitySelector/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { MenuItem, Select } from '@mui/material';

import { FinalityType } from '@/models';

interface FinalitySelectorProps {
finality: FinalityType;
setFinality: (_: FinalityType) => void;
}

export const FinalitySelector = ({
finality,
setFinality,
}: FinalitySelectorProps) => {
return (
<Select
value={finality}
onChange={(e) => setFinality(e.target.value as FinalityType)}
fullWidth
>
{Object.values(FinalityType).map((value, index) => (
<MenuItem key={index} value={value}>
{value}
</MenuItem>
))}
</Select>
);
};
1 change: 1 addition & 0 deletions src/components/Elements/Selectors/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from './AssetSelector';
export * from './ChainSelector';
export * from './FinalitySelector';
export * from './RecipientSelector';
export * from './RegionSelector';
26 changes: 26 additions & 0 deletions src/components/Modals/Pooling/index.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.container {
display: flex;
flex-direction: column;
gap: 0.75rem;
min-width: 35rem;
}

.content {
display: flex;
flex-direction: column;
gap: 0.75rem;
margin: 1rem 0;
}

.options {
display: flex;
flex-direction: column;
gap: 1rem;
padding: 1rem;
}

.optionItem {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
173 changes: 173 additions & 0 deletions src/components/Modals/Pooling/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
import {
Box,
Button,
Dialog,
DialogActions,
DialogContent,
Input,
InputAdornment,
Paper,
Typography,
useTheme,
} from '@mui/material';
import { useEffect, useState } from 'react';

import { isValidAddress } from '@/utils/functions';

import {
FinalitySelector,
ProgressButton,
SimpleRegionCard,
} from '@/components/Elements';

import { useAccounts } from '@/contexts/account';
import { useCoretimeApi } from '@/contexts/apis';
import { useRegions } from '@/contexts/regions';
import { useToast } from '@/contexts/toast';
import { FinalityType, RegionMetadata } from '@/models';

import styles from './index.module.scss';

interface PoolingModalProps {
open: boolean;
onClose: () => void;
regionMetadata: RegionMetadata;
}

export const PoolingModal = ({
open,
onClose,
regionMetadata,
}: PoolingModalProps) => {
const theme = useTheme();
const {
state: { activeAccount, activeSigner },
} = useAccounts();

const {
state: { api: coretimeApi },
} = useCoretimeApi();
const { fetchRegions } = useRegions();
const { toastError, toastInfo, toastSuccess } = useToast();

const [finality, setFinality] = useState<FinalityType>(FinalityType.FINAL);
const [payee, setPayee] = useState<string>('');

const [working, setWorking] = useState(false);

const onPool = async () => {
if (!coretimeApi || !activeAccount || !activeSigner) return;

const txPooling = coretimeApi.tx.broker.pool(
regionMetadata.region.getOnChainRegionId(), // region id
activeAccount.address, // payee
finality
);

try {
setWorking(true);
await txPooling.signAndSend(
activeAccount.address,
{ signer: activeSigner },
({ status, events }) => {
if (status.isReady) toastInfo('Transaction was initiated');
else if (status.isInBlock) toastInfo(`In Block`);
else if (status.isFinalized) {
setWorking(false);
events.forEach(({ event: { method } }) => {
if (method === 'ExtrinsicSuccess') {
toastSuccess(
'Successfully contributed to the instantaneous region pool'
);
onClose();
fetchRegions();
} else if (method === 'ExtrinsicFailed') {
toastError(
`Failed to contribute to the instantaneous region pool`
);
}
});
}
}
);
} catch (e) {
toastError(`Failed to contribute to the instantaneous region pool ${e}`);
setWorking(false);
}
};

useEffect(() => {
if (!open) return;
setFinality(FinalityType.FINAL);
setPayee('');
setWorking(false);
}, [open]);

return (
<Dialog open={open} onClose={onClose} maxWidth='md'>
<DialogContent className={styles.container}>
<Box>
<Typography
variant='subtitle1'
sx={{ color: theme.palette.common.black }}
>
Task Pooling
</Typography>
<Typography
variant='subtitle2'
sx={{ color: theme.palette.text.primary }}
>
You can contribute your region to the pool of instantaneous regions
</Typography>
</Box>
<Box className={styles.content}>
<SimpleRegionCard regionMetadata={regionMetadata} />
</Box>
<Paper className={styles.options}>
<Typography
variant='subtitle1'
sx={{ color: theme.palette.common.black }}
>
Contribution options
</Typography>
<Box className={styles.optionItem}>
<Typography className={styles.optionKey}>Finality:</Typography>
<FinalitySelector {...{ finality, setFinality }} />
</Box>
<Box className={styles.optionItem}>
<Typography className={styles.optionKey}>Payee:</Typography>
<Input
value={payee}
onChange={(e) => setPayee(e.target.value)}
fullWidth
type='text'
placeholder='Address of the payee'
endAdornment={
<InputAdornment position='end'>
<Button
variant='text'
color='info'
onClick={() =>
activeAccount && setPayee(activeAccount.address)
}
>
Me
</Button>
</InputAdornment>
}
sx={{ height: '3rem' }}
error={payee.length > 0 && !isValidAddress(payee)}
/>
</Box>
</Paper>
</DialogContent>
<DialogActions>
<Button onClick={onClose} variant='outlined'>
Cancel
</Button>

<ProgressButton onClick={onPool} label='Pool' loading={working} />
</DialogActions>
</Dialog>
);
};
6 changes: 6 additions & 0 deletions src/components/Modals/TaskAssign/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,9 @@
padding: 1.25rem;
gap: 1rem;
}

.alert {
max-width: 32rem;
align-items: center;
margin: 0 auto;
}
12 changes: 5 additions & 7 deletions src/components/Modals/TaskAssign/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,12 @@ export const TaskAssignModal = ({
</Stack>
</Paper>
</Box>
<Alert className={styles.alert} severity='info'>
Finally assigned regions can no longer be managed. <br />
They will not be displayed on the Region Management page anymore.
</Alert>
</DialogContent>
<Alert
sx={{ margin: '2rem', maxWidth: '500px', textAlign: 'center' }}
severity='info'
>
Finally assigned regions can no longer be managed. They will not be
displayed on the Region Management page anymore.
</Alert>

<DialogActions>
<Button onClick={onClose} variant='outlined'>
Cancel
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modals/Transfer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import { Region } from 'coretime-utils';
import { useEffect, useState } from 'react';

import { transferRegionOnCoretimeChain } from '@/utils/native/transfer';
import { transferRegionOnCoretimeChain } from '@/utils/transfers/native';

import { ProgressButton, SimpleRegionCard } from '@/components/Elements';

Expand Down
1 change: 1 addition & 0 deletions src/components/Modals/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export * from './AddTask';
export * from './Interlace';
export * from './Partition';
export * from './Pooling';
export * from './Purchase';
export * from './Sell';
export * from './TaskAssign';
Expand Down
Loading
Loading