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

more consume refactor

This commit is contained in:
Matthias Kretschmann 2020-10-19 12:54:30 +02:00
parent a5815669c7
commit 018a765a23
Signed by: m
GPG Key ID: 606EEEF3C479A91F
3 changed files with 18 additions and 15 deletions

View File

@ -1,12 +1,12 @@
.loaderWrap { .loaderWrap {
display: flex; display: flex;
align-items: center;
} }
.loader { .loader {
display: block; display: block;
width: 20px; flex: 0 0 1.2rem;
height: 20px; width: 1.2rem;
height: 1.2rem;
border-radius: 50%; border-radius: 50%;
border: 2px solid var(--brand-purple); border: 2px solid var(--brand-purple);
border-top-color: var(--brand-violet); border-top-color: var(--brand-violet);

View File

@ -12,12 +12,9 @@
flex-shrink: 0; flex-shrink: 0;
} }
.pricewrapper button { .actions {
margin-top: var(--spacer);
}
.feedback {
width: 100%; width: 100%;
margin-top: calc(var(--spacer) / 2);
} }
.hasTokens { .hasTokens {

View File

@ -23,15 +23,21 @@ export default function Consume({
}): ReactElement { }): ReactElement {
const { ocean } = useOcean() const { ocean } = useOcean()
const { marketFeeAddress } = useSiteMetadata() const { marketFeeAddress } = useSiteMetadata()
const { buyDT, pricingStepText, pricingError } = usePricing() const {
dtSymbol,
buyDT,
pricingStepText,
pricingError,
pricingIsLoading
} = usePricing(ddo)
const { consumeStepText, consume, consumeError } = useConsume() const { consumeStepText, consume, consumeError } = useConsume()
const isDisabled = const isDisabled =
!ocean || !isBalanceSufficient || consumeStepText || pricingStepText !ocean || !isBalanceSufficient || consumeStepText || pricingIsLoading
const hasDatatoken = Number(dtBalance) >= 1 const hasDatatoken = Number(dtBalance) >= 1
async function handleConsume() { async function handleConsume() {
!hasDatatoken && (await buyDT(ddo.dataToken, '1')) !hasDatatoken && (await buyDT('1'))
await consume(ddo.id, ddo.dataToken, 'access', marketFeeAddress) await consume(ddo.id, ddo.dataToken, 'access', marketFeeAddress)
} }
@ -42,8 +48,8 @@ export default function Consume({
}, [consumeError, pricingError]) }, [consumeError, pricingError])
const PurchaseButton = () => ( const PurchaseButton = () => (
<div> <div className={styles.actions}>
{consumeStepText || pricingStepText ? ( {consumeStepText || pricingIsLoading ? (
<Loader message={consumeStepText || pricingStepText} /> <Loader message={consumeStepText || pricingStepText} />
) : ( ) : (
<Button style="primary" onClick={handleConsume} disabled={isDisabled}> <Button style="primary" onClick={handleConsume} disabled={isDisabled}>
@ -63,8 +69,8 @@ export default function Consume({
<Price ddo={ddo} conversion /> <Price ddo={ddo} conversion />
{hasDatatoken && ( {hasDatatoken && (
<div className={styles.hasTokens}> <div className={styles.hasTokens}>
You own {dtBalance} {ddo.dataTokenInfo?.symbol || 'DT'} so you can You own {dtBalance} {dtSymbol} so you can use this asset without
use this asset without paying again. paying again.
</div> </div>
)} )}
<PurchaseButton /> <PurchaseButton />