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

Merge branch 'main' into feature/compute

Browse Source
This commit is contained in:
Matthias Kretschmann 2021-04-15 11:21:46 +02:00
commit a78988be67
Signed by: m
GPG Key ID: 606EEEF3C479A91F
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package-lock.json generated
View File

@ -22312,11 +22312,6 @@
"resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
"integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
}, },
"is-url-superb": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/is-url-superb/-/is-url-superb-5.0.0.tgz",
"integrity": "sha512-jGkG59ra7/JlcV8ap3dsc0M79IgpuFU/obfsSf6X5D0z1NVvFTFuzt4ob7nfBTZEPbTwjGXVKNQDfWfPghapKQ=="
},
"is-utf8": { "is-utf8": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",

1
package.json
View File

@ -62,7 +62,6 @@
"gatsby-transformer-remark": "^2.14.0", "gatsby-transformer-remark": "^2.14.0",
"gatsby-transformer-sharp": "^2.10.1", "gatsby-transformer-sharp": "^2.10.1",
"intersection-observer": "^0.12.0", "intersection-observer": "^0.12.0",
"is-url-superb": "^5.0.0",
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"lodash.debounce": "^4.0.8", "lodash.debounce": "^4.0.8",
"lodash.omit": "^4.5.0", "lodash.omit": "^4.5.0",

7
src/components/molecules/FormFields/FilesInput/Input.tsx
View File

@ -1,5 +1,4 @@
import React, { ReactElement } from 'react' import React, { ReactElement } from 'react'
import isUrl from 'is-url-superb'
import Button from '../../../atoms/Button' import Button from '../../../atoms/Button'
import { FieldInputProps, useField } from 'formik' import { FieldInputProps, useField } from 'formik'
import Loader from '../../../atoms/Loader' import Loader from '../../../atoms/Loader'
@ -29,11 +28,7 @@ export default function FileInput({
style="primary" style="primary"
size="small" size="small"
onClick={(e: React.SyntheticEvent) => handleButtonClick(e, field.value)} onClick={(e: React.SyntheticEvent) => handleButtonClick(e, field.value)}
disabled={ disabled={!field.value}
!field.value ||
// weird static page build fix so is-url-superb won't error
!isUrl(typeof field.value === 'string' ? field.value : '')
}
> >
{isLoading ? <Loader /> : 'Add File'} {isLoading ? <Loader /> : 'Add File'}
</Button> </Button>

4
src/hooks/useConsume.ts
View File

@ -60,7 +60,9 @@ function useConsume(): UseConsume {
serviceType, serviceType,
accountId, accountId,
undefined, undefined,
marketFeeAddress marketFeeAddress,
undefined,
false
) )
Logger.log('order created', orderId) Logger.log('order created', orderId)
setStep(2) setStep(2)