oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-11-15 01:34:57 +01:00
Code Releases Activity

Merge branch 'feature/history-compute' of https://github.com/oceanprotocol/market into feature/history-compute

Browse Source
This commit is contained in:
mihaisc 2020-10-22 14:31:07 +03:00
commit 5e38ae572b
No known key found for this signature in database
GPG Key ID: 4FB0C2329B4C6E29
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/organisms/AssetActions/Compute.tsx
View File

@ -128,6 +128,9 @@ export default function Compute({
<Dropzone multiple={false} handleOnDrop={onDrop} /> <Dropzone multiple={false} handleOnDrop={onDrop} />
<div className={styles.actions}> <div className={styles.actions}>
{isLoading ? (
<Loader message={computeStepText} />
) : (
<Button <Button
style="primary" style="primary"
onClick={() => startJob()} onClick={() => startJob()}
@ -135,10 +138,10 @@ export default function Compute({
> >
{hasDatatoken ? 'Start job' : 'Buy'} {hasDatatoken ? 'Start job' : 'Buy'}
</Button> </Button>
)}
</div> </div>
<footer className={styles.feedback}> <footer className={styles.feedback}>
{isLoading && <Loader message={computeStepText} />}
{computeError !== undefined && ( {computeError !== undefined && (
<Alert text={computeError} state="error" /> <Alert text={computeError} state="error" />
)} )}

4
src/components/pages/History/PoolTransactions.tsx
View File

@ -97,8 +97,8 @@ export default function PoolTransactions(): ReactElement {
data={logs} data={logs}
className={styles.table} className={styles.table}
noHeader noHeader
pagination={logs?.length >= 19} pagination={logs?.length >= 9}
paginationPerPage={20} paginationPerPage={10}
noDataComponent={<Empty />} noDataComponent={<Empty />}
/> />
) )