1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00

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

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

View File

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

View File

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