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

2152 Commits

Author SHA1 Message Date
Bogdan Fazakas
cd2565d5e7 fix error when sample on edit is empty 2022-03-31 11:51:21 +03:00
Bogdan Fazakas
f36f3bcc14 wip get results 2022-03-31 11:49:42 +03:00
Soon Huat
795ba0c01b c2d show price with fee, exclude provider fee 2022-03-30 22:44:10 +08:00
Bogdan Fazakas
8f93d9bc2f
bump oceanlib to 1.0.0-next.32 (#1282) 2022-03-30 14:06:40 +01:00
Bogdan Fazakas
6708b91400 bumo ocean lib to 1.0.0-next.32 2022-03-30 15:11:30 +03:00
Bogdan Fazakas
72c7cc9f00 merge v4-c2d into compute-jobs 2022-03-30 14:58:20 +03:00
Bogdan Fazakas
d244b9b394 merge v4 into v4-c2d 2022-03-30 14:40:53 +03:00
Norbi
aa4bdda207
display token approval message on loading (#1280) 2022-03-30 11:30:41 +01:00
Bogdan Fazakas
9171db8b6e fix compute jobs section and your jobs 2022-03-30 09:12:14 +03:00
Norbi
905be83a00
check if config is null (#1276) 2022-03-29 16:18:13 +01:00
Norbi
f4a0376f99
set transactions to an empty list if dtList lengths is 0 (#1274) 2022-03-29 15:15:30 +01:00
claudiaHash
90f841bb13
No error shown for invalid file url (#1221)
* check file url

* logic fix

* display error message

* use x mark sign

* change border and background color for wrong input

* invalid input red border

* make error visible only for touched field

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-03-29 15:14:46 +01:00
6e2e46d8ea
Disable pool fetching interval (#1265)
* disable pool fetching interval

* change requestPolicy

* trigger refetch on back button click for add/remove

* fix memory leak error

* refetch on refocus

* add manual refresh button
2022-03-29 14:32:45 +01:00
EnzoVezzaro
90a8bc00bb
fix preview nft on step preview in publish (#1226)
* fix preview nft on step preview in publish

* remove image data from asset interface

* change dataImage implementation

- remove FormPublishData hook
- get NFT image from asset

* improved documentation

* restore formikContext and add warnings
2022-03-29 13:47:21 +01:00
Norbi
4a102722b7
query pool transactions only by pool address (#1251) 2022-03-29 10:19:00 +03:00
Bogdan Fazakas
70f181a595 removed to lowerCase on eth address 2022-03-28 18:36:52 +03:00
claudiaHash
b9ee145aed
Get valid pool transaction link (#1268)
* get transactions link

* cleanup

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-03-28 17:57:16 +03:00
claudiaHash
2e74d42edb
Get correct transaction label (#1270)
* get correct transaction label

* remove log

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-03-28 17:48:51 +03:00
Bogdan Fazakas
cabd3c2105 fix display of compute datasets with free price 2022-03-28 16:23:38 +03:00
Bogdan Fazakas
c05fa7c7b2 Merge branch 'v4' into feature/v4-c2d and fix conflicts 2022-03-28 16:20:58 +03:00
Bogdan Fazakas
d42b0b6a2d merge branch v4-c2d into fix/compute-jobs 2022-03-28 10:23:58 +03:00
9df8ed49a3
disable all actions on publish preview (#1257)
* disable all actions on publish preview

* remove asset actions disabled mechanism
2022-03-25 17:16:52 +02:00
Norbi
63f0b41006
added slippage to trade approval (#1252) 2022-03-25 12:51:56 +00:00
Soon Huat
ba672e99ac
remove percentage fee from price sum, depends smart contract calculation (#1249)
Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-03-24 16:56:09 +02:00
Luca Milanese
300b5b9ef3
fix: assign viewBox property to svg waves (#1247) 2022-03-24 12:11:41 +00:00
Bogdan Fazakas
61d60fd173
Fix edit asset issues (#1190)
* fix loading

* fix cancel acction and some cleanups

* style typo

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

* fix title and replace router with link

* add proper loading to edit components

* add page title

* add more top spacing to form description

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-23 15:11:42 +00:00
EnzoVezzaro
aeb6f06f75
catch user signing rejection on download (#1237)
* catch user signing rejection on download

* change LoggerInstance.log to LoggerInstance.error

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-23 14:59:57 +00:00
claudiaHash
5f174bca88
Remove collect tokens button (#1235)
Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-03-23 13:30:03 +00:00
EnzoVezzaro
926838862a
Fix No error message for swapping more than max tokens (#1230)
* moved Error (field) component in shared components

- moved Error.tsx from Pricing
- change paths to Error.tsx in publish

* added Error component with field validation

* change setTimeout with lodash.debounce
2022-03-22 15:50:51 +00:00
69c3db2caa
SEO & favicon fixes (#1229)
* fix URLs and title

* solve all favicon things

* image optimizations through ImageOptim

* typing fix
2022-03-22 14:57:33 +00:00
Bogdan Fazakas
c201688c4a merge branch v4main into v4-c2d 2022-03-22 11:06:35 +02:00
Bogdan Fazakas
91ecdcdf05
Merge pull request #1216 from oceanprotocol/feature/v4-c2d-order-price-and-fee
handle order price, NaN and default 0
2022-03-22 11:03:51 +02:00
Bogdan Fazakas
ad09e2c99d
bump oceanjs to 1.0.0.next.29 (#1228)
* bump lib to 1.0.0.next.29

* add mising param to collectBT
2022-03-22 10:14:01 +02:00
Bogdan Fazakas
4195e8df81 update provider compute status call 2022-03-22 08:16:54 +02:00
7701652e89
Default to test networks (#1224)
* limit to test networks

* hide network list group when no networks in it

* remove warning, hide announcement banner on empty warning
2022-03-21 13:06:00 +00:00
Bogdan Fazakas
51b882f256 fix aquarius call and added logs 2022-03-21 11:10:09 +02:00
Soon Huat
9da987ea9d optional value for all fee, prevent breaking when no value 2022-03-21 15:35:06 +08:00
Soon Huat
4ad5f12398 handle order price, NaN and default 0 2022-03-21 11:58:19 +08:00
Norbi
d1d24ef4d5
disable price calculation for free price (#1198)
* disable price calculation for free price

* make file icon visible on component mount

* check if accessDetails are present
2022-03-18 13:22:26 +00:00
Bogdan Fazakas
a1abc9cff0 fix build 2022-03-17 11:59:21 +02:00
Bogdan Fazakas
08b90b3635 merge branch v4 into v4-c2d fixed conflicts 2022-03-17 11:29:02 +02:00
mihaisc
a0abe7e17c
Fix previous order tx (#1197)
* rename nft update query

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix previous order

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-03-16 22:29:27 +02:00
Moritz Kirstein
9d1b7794a3
Feat: Display NFT in asset details (#1125)
* feat: add decodeTokenUri helper

* refactor: restructure of MetaMain component

* feat: add nft tooltip

* feat: add opensea link for nfts

* style: adjust nft image size in tooltip

* feat: add nft data to publish preview

* fix: readd owner to nft metadata

* refactor: conditional display of nft tooltip

* style: fix link styles in nft tooltip

* feat: add placeholder graphic as fallback if nft data does not contain one

* fix: display openSea link only on supported networks

* fix: rename ddo props to asset in metamain related components

* feat: add original publisher to asset details

* chore: remove unused imports

* fix: remove unused prop

* feat: convert publisher address to checksum address

* chore: remove console.error when decoding tokenURI

* Revert "chore: remove console.error when decoding tokenURI"

This reverts commit f387175970.

* feat: shorten nft address in tooltip preview

* fix: use Web3.utils instead of the actual web3 instance to convert wei in ether

Co-authored-by: Luca Milanese <luca.milanese90@gmail.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-16 19:01:51 +00:00
Norbi
8b331c0a63
Fix/issue 1151 pool chart fill color (#1193)
* added colours for dark and light mode and refetch on appearance change

* keep same border colour
2022-03-16 15:35:31 +00:00
mihaisc
8aa6b3997a
Fix compute dataset algorithm list (#1194)
* fix query

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove comment

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-03-16 17:12:09 +02:00
EnzoVezzaro
8d852323ad
fix txCount on 'Create tokens & pricing' in publish (#1187)
* fix txCount on 'Create tokens & pricing' in publish

* fix description on submit step in publish
2022-03-16 14:37:28 +00:00
Luca Milanese
bea8635a53
Feat: add final did to tokenURI in NFT metadata (#1167)
* feat: set NFT metadata and tokenURI in a single transaction

* feat: move token uri encoding in second publish transaction

* feat: add final asset did in tokenURI

* fix: edit metadata and computeDataset submit functions

* feat: extract decodeTokenURI function

* fix: revert to previous metadata edit flow

* fix: revert to generateNftCreateData

* feat: add final asset link in tokenURI description
2022-03-16 13:19:08 +00:00
ecad0ebb50
package updates (#1191)
Notable updates:

* ocean.js v1.0.0-next.28
* @walletconnect/web3-provider v1.7.5
* @portis/web3 v4.0.7
* urql v2.2.0
* web3 v1.7.1
* npm audit fix
2022-03-16 12:56:09 +00:00
Norbi
822cec3753
Keep algorithm private checkbox fixes (#1174)
* fix set access inside publish form

* added initial value for service access to fix continue button disabled

* removed compute environment options field

* removed compute options from form.json

* update access and algorithmPrivacy fields based on asset type

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-16 12:52:05 +00:00
EnzoVezzaro
f2ecf1666b
added freeAgreement to pricing validation (#1188) 2022-03-16 12:17:02 +00:00