oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity
2,158 Commits 36 Branches 5 Tags 85 MiB
feature/calica-integration
Commit Graph

2158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bogdan Fazakas
3b535aadb8 use zero adress for price and fees order 2022-04-19 09:32:10 +03:00
Bogdan Fazakas
7c0904ce08 merge v4 into v4-c2d 2022-04-18 14:42:13 +03:00
claudiaHash
986fd37d3e
Sample file validation in edit form fix (#1351) 
* fix missing asset provider

* comment removed

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
 2022-04-18 14:39:23 +03:00
Matthias Kretschmann
967b869b02
Move auto-changing providerUrl (#1256) 
* move auto-changing providerUrl

* remove comments

* new custom provider → change network interaction

* more interaction tweaks for custom provider → change network case

* fix adding custom provider

* add provider chainId check

* initialValues from form context

* user chainId fallback
 2022-04-15 14:28:45 +01:00
claudiaHash
cc0da26740
max param for description length (#1349) 
Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
 2022-04-15 15:33:51 +03:00
Bogdan Fazakas
0b1d9cc436 merge v4 into v4-c2d 2022-04-15 12:04:49 +03:00
Bogdan Fazakas
c86a9f8429
Merge pull request #1217 from oceanprotocol/fix/compute-jobs 
Fix compute jobs
 2022-04-15 11:22:22 +03:00
Bogdan Fazakas
b79d5f02c2 get provier uri for compute results based on job input did 2022-04-15 11:07:14 +03:00
Bogdan Fazakas
ffd1c3ebe1 bump ocean lib version and lint fixes 2022-04-15 09:25:55 +03:00
mihaisc
e4a8c0df64
update ocean (#1348) 
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
 2022-04-14 18:49:12 +03:00
mihaisc
2985e1a45a
update ocean.js (#1346) 
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
 2022-04-14 15:31:37 +01:00
Norbi
36a75e6736
Dynamic price publish input fields fixes (#1302) 
* update ocean amount on price change

* add min ocean amount requirement

* add min ocean value when price is not grater than 0

* review fixes

* use min ocean and dataToken amounts from initialValues

* removed weightOnDataToken from useEffect and updated comments

* fix amountOcean bug

* remove min attribute from Coin, move logic to yup validation

* remove unused imports and change min amountOcean test name

* default amountDataToken from 50 → 100

* ref #1340

* change min datatoken and ocean amount to 100

* update ocean amount min validation and validation message

* replace data tokens with datatokens in min ocean amount message

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
 2022-04-14 13:48:56 +01:00
Bogdan Fazakas
5b415e615c update download buttons text 2022-04-14 12:38:13 +03:00
claudiaHash
1256c20904
Trade input accepts decimals with leading 0 (#1294) 
* input accepts number with leading 0 decimals

* input fields changes

* value type fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
 2022-04-13 18:24:19 +03:00
Jamie Hewitt
9ebddd814d
Improve footer links (#1338) 
* Opening external links in a new tab

* Main site links opens in a new tab + adding external link arrow
 2022-04-11 16:13:52 +03:00
Jamie Hewitt
274d0d3809
Showing connect wallet button on submit page when no wallet is connected (#1329) 
* Showing connect wallet button on submit page when no wallet is connected

* Fixing connect button when form hasn't been filled out
 2022-04-08 13:05:06 +01:00
Bogdan Fazakas
bc6af3a839 update download buttons style 2022-04-07 16:03:13 +03:00
Bogdan Fazakas
16eaff62d9 update flex value 2022-04-07 14:18:38 +03:00
EnzoVezzaro
4bd9dddf3b
show proper errors on submit publish (#1105) 
* exit when user rejects the transaction

* if the message is too long, return generic label

* in the case (should not happen) the message is longer than one row, then show ellipsis
 2022-04-07 11:10:36 +01:00
Bogdan Fazakas
47332703cc update compute details and compute results UI and style 2022-04-07 11:34:45 +03:00
EnzoVezzaro
ed15952a85
added key prop to Fragment to clear warning (#1333) 2022-04-06 17:18:52 +01:00
Matthias Kretschmann
ced16eecc9
Ocean Asset NFT → Ocean Data NFT (#1328) 2022-04-06 16:38:43 +03:00
Jamie Hewitt
cd5ff7cf73 Revert "Adding connect wallet button to submit page" 
This reverts commit e24de81b65.
 2022-04-06 16:35:20 +03:00
Jamie Hewitt
d65161ef41 Revert "Removing unneccessary conditions" 
This reverts commit ea3f91f79b.
 2022-04-06 16:34:44 +03:00
Jamie Hewitt
00961c47c0 Merge branch 'v4' of github.com:oceanprotocol/market into v4 2022-04-06 16:20:59 +03:00
Jamie Hewitt
ea3f91f79b Removing unneccessary conditions 2022-04-06 16:13:46 +03:00
claudiaHash
483bc90dec
Content width changes (#1325) 
* width changes

* revert change for @media

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
 2022-04-06 14:02:01 +01:00
Jamie Hewitt
d61f9c7940 Merge branch 'v4' of github.com:oceanprotocol/market into v4 2022-04-06 15:53:26 +03:00
Jamie Hewitt
e24de81b65 Adding connect wallet button to submit page 2022-04-06 15:52:55 +03:00
Jamie Hewitt
9b19aed5ad
Removing dashes from timeout field (#1326) 2022-04-06 13:31:31 +01:00
Bogdan Fazakas
6d544cc0ba refactor setting price and fees for assets 2022-04-06 12:17:28 +03:00
Matthias Kretschmann
f2e7db0260
Pool components UI refactor (#1295) 
* reorder UI

* refactor with new PoolSection component

* move all the things

* layout tweaks

* fix pool data without wallet

* fix undefined user pool share

* fix max remove calculation

* make conversion use our decimals definition
 2022-04-06 11:47:41 +03:00
Jamie Hewitt
d64fe4e32c
Adding space to ConnectWallet (#1323) 
* Adding space to ConnectWallet

* Adding <span> back in, keeping the space
 2022-04-05 21:21:11 +03:00
EnzoVezzaro
3b023054dd
restore fetchAllData for any user (#1318) 2022-04-05 10:09:28 -07:00
Matthias Kretschmann
a9e1776499
More footer links (#1322) 
* tweaked footer layout

* add more links

* source links from content file
 2022-04-05 10:08:12 -07:00
Bogdan Fazakas
1b744760ce Merge branch 'feature/v4-c2d' into 'fix/compute-jobs' 2022-04-04 22:35:37 +03:00
Bogdan Fazakas
6e2e9875f1 Merge branch 'v4' into feature/v4-c2d 2022-04-04 22:26:13 +03:00
Bogdan Fazakas
fa47876fd3 added logs 2022-04-04 22:24:09 +03:00
Matthias Kretschmann
fc2681231b
fix transferable NFTs (#1309) 
- send along `transferable` param when creating NFT
- new optional `transferable` param in our `generateNftCreateData()` helper, default to `true`. So we don't need to bother adding this to the publish tx fee component
- capture new key in form data, `metadata.transferable`, set to `true` by default. This prepares this to be added as a UI option later on
 2022-04-04 20:13:39 +01:00
mihaisc
3dd21bd20d
update publish params for new contracts (#1308) 
* fix params

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

* fix params

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
 2022-04-04 18:16:04 +03:00
mihaisc
dfc8af0d6c
update ocean.js (#1307) 
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
 2022-04-04 17:56:18 +03:00
EnzoVezzaro
4ded93afed
fix missing chain id on preview (#1305) 
* fix missing chain id when user is not connected

* remove log
 2022-04-04 17:56:05 +03:00
Matthias Kretschmann
48c3190fed
Warn about publishing html files, unified file error states (#1279) 
* cleanup

* warn about html files

* kick out toast error

* unify and simplify all file error states

* remove unused CSS

* same principles for provider check

* copy

* copy & comments

* fix files reset with correct initialValues, shorter optional chaining

* messaging change

* fix error message placement for provider field
 2022-04-04 15:34:48 +01:00
EnzoVezzaro
b574daee30
fix wrong TVL on pool tab (#1281) 
* remove multiplier from totalLiquidityInOcean

* Revert "remove multiplier from totalLiquidityInOcean"

This reverts commit e6b5cc15d6.

* restore totalLiquidityInOcean calculation

* getting user / owner liquidity from calcSingleOutGivenPoolIn + some clean up

* removed web3 hook in favor of dummyWeb3 connection

* remove calc on user liquidity (YVL)
 2022-04-04 14:29:31 +01:00
EnzoVezzaro
0ade87c971
fix "owned by" label on preview (#1303) 
* fix "owner by" label on preview

* cleanup - remove unused code

* restore 3box
 2022-04-04 14:16:22 +01:00
Bogdan Fazakas
84afa42903 update computeStatus signature to fix build and CI 2022-04-04 15:56:36 +03:00
Bogdan Fazakas
2dc12a2542 Merge branch 'feature/v4-c2d' into 'fix/compute-jobs' 2022-04-04 15:22:18 +03:00
Bogdan Fazakas
0c87abe24d Merge branch 'v4' into feature/v4-c2d 2022-04-04 15:19:31 +03:00
Bogdan Fazakas
10b66d3e0e update get compute url and use oceanjs helper for download 2022-04-04 15:17:51 +03:00
Bogdan Fazakas
08790cae05
Merge pull request #1284 from oceanprotocol/feature/v4-c2d-data-algo-price-with-fee 
c2d show price with fee, exclude provider fee
 2022-04-04 15:14:09 +03:00