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

1836 Commits

Author SHA1 Message Date
Bogdan Fazakas
50fc6d84cb init prices and fees after starting a compute job 2022-05-16 08:09:38 +03:00
Bogdan Fazakas
50b1af53ac fix compute status text display 2022-05-16 08:08:15 +03:00
Bogdan Fazakas
feb1f41d5c fix conditions and cleanups 2022-05-16 07:57:48 +03:00
EnzoVezzaro
29e6636d71
handle poolData shares when empty (#1424)
* handle poolData shares when it's empty

* rm log
2022-05-13 12:48:24 +01:00
Bogdan Fazakas
24aa157f92 fix lint 2022-05-13 10:53:38 +03:00
Bogdan Fazakas
be21be9559 order fixes 2022-05-13 10:27:41 +03:00
Bogdan Fazakas
936985a0f8 merge v4 2022-05-12 14:42:28 +03:00
Bogdan Fazakas
15af847a9c wip compute initialize 2022-05-12 14:39:14 +03:00
5f3ee32ca2
Test setup tweaks (#1415)
* unused package cleanup

* make storybook use webpack 5

* see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5

* bump react, cleanup

* button story tweaks

* add Alert stories

* bump Jest to v28.1.0

* try original storyshots initialization

* split up build & test CI jobs

* stop testing Node.js v14

* set jest coverage flag

* downgrade paambaati/codeclimate-action again

* move  jest config files, remove coverageReporter override

* collect coverage from `src/` only

* another paambaati/codeclimate-action bump test

* create additional button markup test

* downgrade paambaati/codeclimate-action again

* more downgrade

* render default button without optional style prop

* ignore some folders for Jest

* full coverage for Alert

* more package updates

* add eslint-plugin-testing-library & eslint-plugin-jest-dom

* bump ESLint packages, follow new rules

* start storybook in quiet mode

* update docs

* test storybook build as part of CI

* more testing docs clarification

* add jest:watch command

* add body background colors switch in toolbar

* TypeScript voodoo

* test codeclimate-action@v2.7.3 for default coverageCommand

* downgrade codeclimate-action and running in debug mode

* make coverage artifacts OS agnostic

* subgraph typings as artifact for coverage job

* disable coverage sending job for now

Co-authored-by: Enzo Vezzaro <enzo-vezzaro@live.it>
2022-05-12 11:35:07 +01:00
claudiaHash
a2bf3b2a1c
fix community fee displayed value (#1417)
* fix community fee displayed value

* get value fix

* Revert "fix community fee displayed value"

This reverts commit 06258f8904.

* import fix

* naming fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-05-11 18:44:02 +01:00
Jamie Hewitt
8819a66e67
Remove risks warning (#1420)
* Removing risks warning from add liquidity tab

* Removing risks warning from add trade tab

* Removing isWarningAccepted state variable
2022-05-11 13:29:07 +01:00
claudiaHash
e30786c97b
Error placement in publish pricing form (#1419)
* quick fix

* log removed

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-05-11 13:05:13 +03:00
mihaisc
88b40e5985
fix pool context (#1416)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-05-10 20:10:16 +01:00
mihaisc
aa54795c2b
add decimals to pool calls (#1393)
* add decimals to pool calls

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

* fix lock

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

* fix ssh

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

* update ocean

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

* update ocean

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

* remove screen fixes

* update lib, contracts

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

* fix package-lock

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

* fix

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

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-05-10 14:19:41 +03:00
EnzoVezzaro
1fcc3b1356
sanitize urls as code scanning suggestions (#1412)
* sanitize url on DebugEditMetadata as code scanning suggestion

* sanitize urls
2022-05-10 10:11:53 +01:00
EnzoVezzaro
89f2521025
Storybook and unit testing setup (#1354)
* install and config Storybook

* create basic component for initial setup

* added testing-library / jest for testing

* restore coverage for testing

* downgrade codeclimate-actions to fix viable formatter issue

* clean up - remove unnecessary components in stories

* update readme with storybook and testing

* remove unnecessary file extensions on stories config

* remove babel and moved jest-dom to devDependencies

* delete introduction stories

* change test to .tsx

* change testing description on docs

* added interface to button story

* added build phase and update test phase

* restore build in ci

* added storyshots (automate testing) to Storybook

* simplify and update codeclimate-action

* restore workable version of codeclimate-action

* test unified test action for CI

* Revert "test unified test action for CI"

This reverts commit 039cbf3485.

* test documented solutions for CI

* fix error on coverage CI

* added codeCoverage on jest setup

* upload coverage report from jest

* added download artifact to coverage CI

* added upload artifact to coverage CI

* remove collectCoverageFrom

* moved test step on CI

* remove coverageLocations to allow default

* load Ocean typography into storybook

* skip all PRs coming from dependabot

* improve docs (Storybook)

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-05-09 14:33:44 +01:00
Bogdan Fazakas
ab48abe73c merge feature/v4 into feature/v4-c2d 2022-05-05 17:09:33 +03:00
Bogdan Fazakas
692fb509f6 fix compute jobs table auto refresh and details modal closing 2022-05-05 17:06:11 +03:00
claudiaHash
6324e85b0f
Incorrect wallet balance on trade tab fix (#1310)
* display the actual base token wallet amount

* delete logs

* balance dt fix

* width changes

* remove last commit changes

* sell values

* balance fix for dt item

* logs and comments removed

* fix max calculations

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

* disable inputs on trade actions

* clear inputs after submit and catch tx errors

* fix dep

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

* fetch reserver from contracts

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

* fix null and tag key

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

* fix

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

* label change and cleanup

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

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Enzo Vezzaro <enzo-vezzaro@live.it>
2022-05-05 15:14:37 +03:00
EnzoVezzaro
1ed3fd8a04
added enableReinitialize to update price value on edit view (#1385) 2022-05-05 12:48:52 +01:00
Bogdan Fazakas
dff4a0ca1c merge feature/v4 into feature/v4-c2d 2022-05-04 15:55:59 +03:00
Bogdan Fazakas
83c271dbab fix selecting algorithms when on different network 2022-05-04 14:04:06 +03:00
Bogdan Fazakas
86c7e7f7cc fix algo with pool price and fees fetching 2022-05-04 11:27:44 +03:00
EnzoVezzaro
23f256b36c
added optional chaining to oceanConfig (#1380) 2022-05-03 11:15:39 +01:00
Jamie Hewitt
4fd310cf6e
Converting accountId and owner to lowercase for the comparison to avoid problems caused by inconsistent cases (#1377)
* Showing loader on the edit formm until everything has loaded

* Changing logic so that loader is the fallback

* Making sure account Ids are in lowercase when comparing them

* Fix crash when no account is connected
2022-05-03 11:42:41 +03:00
Bogdan Fazakas
31a7703822 more decimal fixes 2022-05-03 11:14:00 +03:00
Bogdan Fazakas
5030b346e1 partial fix for asset with pool fees, algo not working yet 2022-05-02 18:46:32 +03:00
Bogdan Fazakas
f3fabdd3d9 some decimal fixes 2022-05-02 17:36:51 +03:00
Bogdan Fazakas
06dde32177 removed swp file 2022-05-02 15:12:27 +03:00
Bogdan Fazakas
ff353753ba show token symbol for free assets also on compute price output 2022-05-02 14:26:39 +03:00
Bogdan Fazakas
e8fc728523 fix compute form 2022-05-02 11:15:50 +03:00
Bogdan Fazakas
e23e4b6b97 merge feature/v4 into feature/v4-c2d fix conflicts 2022-05-02 09:25:18 +03:00
mihaisc
2107eab979
Fix order and price (#1375)
* fix loading

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

* add order fee

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

* fix opc

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

* remove cache from urql

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

* update urlq dep

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

* update urlq dep

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

* fix lock

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

* fix states

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-04-29 21:14:14 +02:00
Bogdan Fazakas
3ef91048b3 fix compute jobs infinite loading when no jobs found 2022-04-29 13:17:06 +03:00
Bogdan Fazakas
72bf0da6c5 disable edit compute settings for algorithms 2022-04-29 10:30:55 +03:00
Bogdan Fazakas
759c9332a0 fix your compute jobs section when asset network not selected 2022-04-29 10:18:26 +03:00
claudiaHash
97744820ac
Display generic info message for file inputs (#1334)
* display generic message

* add helper message

* bold text in json, remove unused css file

* fixes

* different help message displayed as tooltip

* tooltip help not displayed for files/links fields on publish

* conditionally hide/show tooltip

* use same mechanism for edit form

* add prominentHelp file into content pages

* type fix

* remove unused code

* error message position fix

* error doesn't overlap help message

* show validation error message fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-04-28 15:39:46 +02:00
Bogdan Fazakas
ad9ecd034c fix conflicts 2022-04-28 14:59:30 +03:00
Bogdan Fazakas
09fcd6ac30 fix build 2022-04-28 14:43:02 +03:00
EnzoVezzaro
6ef2082724
restore order for assets with fixed pricing (#1360)
* restore button if there's not pool data

* restore order for fixed pricing and download button after purchase

* minor fixes

- avoid errors when providerFee is null
- fix disabled download/buy button when user is on different network as asset's

* added improvements
2022-04-28 13:35:00 +02:00
Bogdan Fazakas
787588f20b fix fixed rate 2022-04-28 10:59:54 +03:00
Bogdan Fazakas
290e339fb1 merge feature/v4 into feature/v4-c2d 2022-04-28 10:18:20 +03:00
Bogdan Fazakas
6bb4466d4a merge feature/v4 into feature/v4-c2dr 2022-04-28 10:11:19 +03:00
claudiaHash
b6ad55dda4
price validation fix (#1366)
Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-04-27 21:42:25 +02:00
Jamie Hewitt
8271963292
Making error message more generic (#1368) 2022-04-27 16:28:02 +02:00
Corrie Sloot
88d5179a29
SEO fix (#1359) 2022-04-27 08:55:51 +02:00
ce07740ef8
remove loading feedback during price fetching (#1361) 2022-04-27 08:50:17 +02:00
EnzoVezzaro
6a6f1acd84
add steps back history to publish (#1342)
* added step route to publish

* moved hooks to navigation

* handle back history and load on refresh

* clean up

* changed to nested routes in publish

* fix warning code climate (similar blocks)

* fix header publish link

* moved scrollIntoView() after routing change

* fix `Type 'string[]' is not assignable to type 'string'.` error

* Revert "fix header publish link"

This reverts commit 82e00398c0.

* serverside redirect from `/publish`

* client side redirect from `/publish`

* fix issue with redirect on publish

- remove index publish (redirect taken care server side)
- change link in menu to step 1
- refactor router push on navigation

* simplify handleStepClick function
2022-04-26 12:09:51 +02:00
d6bc5a2b87
package updates (#1355)
* package updates, ocean.js v1.0.0-next.37

* activate portis components again

* console error fix
2022-04-25 14:50:20 +02:00
e77dcaf60a
fix opcFees before data is present (#1353) 2022-04-22 11:29:37 +02:00
Jamie Hewitt
97e0921e1e
Unsupported Network Tooltip (#1331)
* Moving isSupportedOceanNetwork to Web3 context

* Removing page title and replacing it with a warning message

* Creating Error state in title for the wrong network

* Creating UnsupportedNetwrok component

* Adding different networks into tooltip

* Adding button + styling

* Adding change netwrok function

* Adding Change Network tooltip to submit page

* Reducing code duplication

* Removing unnecessary changes

* Fixing logic for checking which chainIds are supported

* Simplifying isSupportedOceanNetwork check logic

* Default to not showing unsupported network message when no wallet is connected

* Always showing available networks in tooltip

* Adding info icon to action button

* adding padding to AvailableNetworks component

* Changing label to list components

* Changing brand-white to currentColor

* Revert "Changing brand-white to currentColor"

This reverts commit 278f0d4ab9.

* CHanging --brand-white to currentColor

* Info Icon in currentColor

* Changing NetworkOptions component name to Network

* Simplifying tooltip logic in title

* Removing unused classname

* Fixing repeating <ul> issue

* Removing unused class

* Refactoring AvailableNetworks component into src/components/Publish

* Moving tooltip message into content/publish/index.json

* Reducing duplication in css

* Removing duplication of infoIcon css styles

* Tidying up logic in setIsSupportedOceanNetwork useEffect

* Updating setIsSupportedOceanNetwork effect dependancies

* merge fixes for new MarketMetadata context

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-04-22 02:54:04 +02:00
mihaisc
d1e21b7f03
Various fixes in the pool component (#1327)
* remove legacy check to prevent rug pull

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

* various fixes

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

* remove old prop

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

* remove old prop

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

* add expected output to remove

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

* remove console.logs

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

* fix max calculations

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

* refactors

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

* temp fixes for build

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

* fixes

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

* local calc for pice and liquidity

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

* remove var

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

* fix

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

* fix

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

* fix profile liquidity

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

* global context, opc fee

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

* comment

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

* various fixes

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

* refactor global context

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

* remove nesting from market context

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

* fix build

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

* fix undefined appConfig

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

* direct import of appConfig & siteContent

* this never changes on run time, so we should never have to wait for it and have it in js bundle at all times
* in utility methods, import directly
* for components, import directly in MarketMetadata context  and pass through

* remove screen CSS fixes

* put back auto-fetching indicator, move manual refresh action behind debug

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-04-22 02:38:35 +02:00
Bogdan Fazakas
ef744c1a2c
Add reuse order in start compute flow (#1352)
* wip add reuse order logic

* add reuse order in start job

* added missing check if no jobs found

* update lib

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

* fix lint

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

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-04-21 17:30:12 +03:00
Bogdan Fazakas
a0558efaab some fixes 2022-04-20 12:32:04 +03:00
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
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
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
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
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
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
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
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
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
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
claudiaHash
65f0c5c675
Price length and decimals number validation (#1225)
* price length and decimals number validation

* undefined parameter fix

* fixes

* use  the decimals constant in regex

* validation added for moire fields

* cleanup

* swap fee decimals fixes

* constant fix

* use max 6 decimals for swap fee

* remove unused code

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-04-01 11:38:32 +03:00
EnzoVezzaro
47144d80b5
fix remove liquidity issues (#1258)
* reset slider after transaction

* fix issue on remove button hover

* restore transform on Button.module.css

* added check on accountId to avoid failing calls

* disable remove button on amountPercent = 0
2022-04-01 11:22:38 +03:00
Soon Huat
31167856fc include loading when calculating data + algo price, tooltip show order price 2022-03-31 23:55:22 +08:00
mihaisc
45dad876e2
fix pool tx (#1288)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-03-31 12:50:32 +01:00
claudiaHash
eb3ddcee90
Undefined graph labels fix (#1283)
* get format price

* added price format fix, removed logs

* remove all commas from the price string

* space fixes

* fix

* fix locale in graph, undo price fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-03-31 12:49:15 +01:00
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
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
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
Bogdan Fazakas
2ef29d905e fix edit compute checksums for files and container 2022-03-16 12:20:50 +02:00
Bogdan Fazakas
74f211d45d remove logs 2022-03-15 16:54:36 +02:00
Bogdan Fazakas
bad0b12d50 added logs 2022-03-14 23:58:21 +02:00
Bogdan Fazakas
7ee2bdab98 merge v4 into v4-c2d 2022-03-14 16:47:34 +02:00
Bogdan Fazakas
21dad4fda2 update compute message logic 2022-03-14 16:38:31 +02:00
Bogdan Fazakas
cb6b71c4ce update set algo access details 2022-03-14 16:27:20 +02:00
Bogdan Fazakas
62f5803e49 update start compute flow messages 2022-03-12 14:44:12 +02:00
3ea832d270
update compute service options (#1180)
* bump ocean.js to v1.0.0-next.26

* update compute service options
2022-03-11 11:26:04 +00:00
EnzoVezzaro
fc6e00669c
Feature/issue 1175 catch user rejection buy (#1177)
* fix approval rejection on buyDtFromPool

* fix approval rejection on order
2022-03-11 11:25:51 +00:00
Bogdan Fazakas
4eb41bba2c merge v4 into v4-c2d and fixed conflicts 2022-03-10 02:10:43 +02:00
Bogdan Fazakas
e6b7acb1d9 fixed compute jobs from profile loading 2022-03-10 01:14:27 +02:00
Bogdan Fazakas
38bf327b89 fix algo selection list name 2022-03-10 01:12:09 +02:00
Bogdan Fazakas
a8b31131c4 fixed compute jobs logic 2022-03-10 01:10:57 +02:00
EnzoVezzaro
1eacf9d93e
stop execution on publish if user rejects approval tokens (#1173) 2022-03-09 16:06:55 +00:00
cfd31905dd
Fix profile image (#1172)
* tinker

* use !important
2022-03-09 14:12:48 +00:00
ccb50b56e5
Preview action fixes (#1171)
* disable pool/trade tab in preview again

* hide collection button on preview

* cleanup

* render fix
2022-03-09 14:12:37 +00:00
claudiaHash
4331c24c0d
Restore Pool Shares section (#1139)
* get poolShares dt addresses

* style fixes

* class names fix

* remove useless changes

* fix

* try/catch blocks, loading fix

* show pool shares fix

* delete logs, fix build

* more try/catch blocks

* check subgraph url, add try/catch block

* fixes

* pool fields fix

* minor code fixes

* fix subgraph fetch

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

* remove unused function, fixes

* use LoggerInstance, remove useless setter

* error messages fix, get rid of dt column

* small tweaks and tests

* fixes

* fixes

* modified flow for pool shares

* loading UX fixes

* unified calculations for pool liquidity

* stop the refetch madness

* profile provider already sets interval fetching for pool shares
* pool shares will change when chainIds, accountId is changed so no need to listen for changes again

* calculation tweaks

* pool stats tweak

* fix pool transactions

* fix data display in pool shares section

* minor fix, delete comment

* subgraph typings generation fix

* pool stats display tweaks

* price sizing fix

* rabbit hole fixes

* more price UI fixes

* cleanup

* wording consistency

* render all frontpage sections by default, load in assets after

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-09 12:58:54 +00:00
Bogdan Fazakas
8aaae669f7 fix compute timeout value 2022-03-08 01:23:54 +02:00
Bogdan Fazakas
95a65e784d wip compute jobs 2022-03-08 01:13:36 +02:00
Bogdan Fazakas
f1f1c17535 fixes and cleanups 2022-03-08 00:09:53 +02:00
Bogdan Fazakas
809429b728 update compute resources valid until logic 2022-03-04 01:07:00 +02:00
Bogdan Fazakas
fcc1e440fd fix edit compute settings 2022-03-03 21:09:37 +02:00
Bogdan Fazakas
2c05e1f945 merge v4 into v4-c2d 2022-03-03 17:45:47 +02:00
Bogdan Fazakas
fac744e94a fix algorithms selection list on allowAllPublisher case 2022-03-03 17:42:29 +02:00
mihaisc
af60018500
fix max add/remove liquidity (#1141)
* fix max add/remove liquidity

* fix graph liquidity

* small comment

* change liquidity graph to tvl, fix swap

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

* change label

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

* remove todo

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

* fix max remove liquidity
2022-03-03 12:23:23 +00:00
claudiaHash
8a5bddbf6e
Restore trade tab (#1047)
* get swap fee, max values

* use baseToken instead of ocean

* build fixes

* set form trade tx - WIP

* use pool info

* logs deleted

* merge fixes

* use local ocean.js, get spot price

* handle value changes, logs deleted

* fixes after v4 merge

* valid user liquidity displayed

* get correct token amount

* more fixes

* form trade fixes

* positive input values fix

* use proper swap functions

* use appConfig's marketFeeAddress

* remove redundant setters

* use consumeMarketPoolSwapFee

* use poolInfo, remove log

* code fixes

* some more fixes

* fees fix

* use poolInfo data

* various fixes

* fixes and cleanup

* fix build

* partial decimal fix

* add swap fee

* fix sub updates

* remove console

* fix package

* fix package-lock

* remove ssh

* fix blockies and package

* fix comments

* remove unused var

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-03-03 10:49:04 +00:00
Bogdan Fazakas
6a449eadcb fix prices 2022-03-02 16:42:50 +02:00
Bogdan Fazakas
b50c46e1f4 use compute env and compute consumer address 2022-03-01 12:11:20 +02:00
Bogdan Fazakas
5790ffd122 update order params 2022-03-01 11:59:26 +02:00
Bogdan Fazakas
109b9dcbb9 refactor start compute job and more fixes 2022-03-01 01:43:57 +02:00
Bogdan Fazakas
27665c277d fixed get algo list 2022-02-28 14:56:13 +02:00
Bogdan Fazakas
0085174e8d merge v4 into v4-c2d 2022-02-25 14:26:39 +02:00
Bogdan Fazakas
404f4edca1 small fix 2022-02-25 14:15:25 +02:00
claudiaHash
b63c644962
Collect tokens by publisher (#1120)
* get tokens balance wip

* use ButtonBuy component

* collect and sum base tokens

* delete logs, get tx

* center button

* feedback and loader added

* query by exchangeId

* fixes

* correct token symbol, set balance to 0 after collect

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-02-25 02:36:32 -08:00
Bogdan Fazakas
73f3080daf
Restore edit functionality (#1107)
* add content on edit pages

* display edit for user only

* add form actions

* add restore part of edit metadata logic

* adjust edit metadata

* wip edit compute settings

* added console logs

* wip edit compute

* updated edit compute flow

* updated style

* fix pricing various fixes

* fix edit acctions

* add debug on edit compute tab

* add debug on edit metadata  tab

* more fixes

* lint fixes

* add pricing to edit metada

* restore timout edit

* protect edit route

* small fixes

* fixes and add edit feetback, loading, error, succes on submit

* timeout init values fix

* added setNftMetadata helper

* moved transfor asset to assetSelection from aquarius class

* fixed links, removed dispenser hacks

* fixed sample

Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-02-25 02:33:07 -08:00
Norbi
ed9b1ce2d2
Update fee display inside publish form (#1128)
* use fixed and pool swap fees from app config inside publish form price

* get opc fees from subgraph

* fixed undefined opcFees

* fixed get opc fees query

* removed logs, unused imports and added types

* remove unused import

* fetch opc fees from wallet network

* use fallback chainId and add chainId to dependencies array

* get app config from site metadata

* fixed getOpcFees typo

* changed community fee field value
2022-02-24 07:21:45 -08:00
EnzoVezzaro
8599835be4
remove unnecessary appearance (#1142) 2022-02-24 07:17:54 -08:00
Bogdan Fazakas
d4570aa1cb merged v4 into c2d 2022-02-23 15:58:20 +02:00
mihaisc
6541068364
fix exchange id (#1137)
* fix exchange id

* fix

* fix dispenser
2022-02-22 08:10:26 -08:00
claudiaHash
db7ae82f4a
Restore profile header and downloads tab (#1129)
* show results

* sales number displayed correctly

* get downloads

* use totalSales parameter

* fixes

* sum sales fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-02-21 17:15:33 +02:00
c1ab042c5e
Restore global stats (#1123)
* start with a good refactor

* split up into multiple files
* split up data fetching and manipulation into multiple effects
* adapt for new subgraph

* bookmarks error fixes

* make numbers show up when a subgraph is down

* use testnets, make numbers show up

* style fixes

* making sense of existing numbers

* more stats

* use original total OCEAN

* output datatokenCount

* state data structure change for all sum values

* copy

* output networks at all times

* switch to mainnets numbers
2022-02-18 15:53:31 +00:00
EnzoVezzaro
6c7a474136
Free pricing: added confirm checkbox (#1086)
* added confirm checkbox and connect logic to wizard

* add 'accessDetails' to displayed asset

* restore initial state

* adding 'freeAgreement' option to constants

* moved checkbox for free item aggreament

* improvement on amountDataToken validation

* change Field component with Input and improve UI

* change `onChange` property with `useField` hook

* switch back to Formik Field

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-02-18 11:55:46 +00:00
3a424bc44c
bookmark fixes (#1127) 2022-02-18 11:46:34 +00:00
5a4a30e0b0
fix search title (#1122) 2022-02-17 21:38:40 +00:00
d2fb4db7c6
revised asset not found message (#1124) 2022-02-17 21:37:59 +00:00
EnzoVezzaro
ab73a5b5d9
Mobile publish fixes (#1076)
* aligned inputs for mobile

* correction for mobile first approch

* change nft layout on publish mobile (metadata section)

* align datatokens view on publish widzard for mobile

* remove unnecessary margin around nft, datatoken UI

* reduce min-width for xs viewports

* fix mobile layout for pricing tab / submit tab on publish
2022-02-17 16:03:27 +00:00
mihaisc
677563d7c2
fix pool tab (#1121)
* query update

* fixes
2022-02-17 16:00:08 +00:00
Luca Milanese
1b9987ce89
fix: set default svg output to fill color (#1115) 2022-02-17 15:59:39 +00:00
mihaisc
60c5520548
update to ocean.js.next.20 (#1099)
* update and fix fees

* update lib

* update aquarius endpoint

* update lib and fix changes

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-02-16 18:42:35 +00:00
mihaisc
8d1782a800
Restore order (#1068)
* minor refactors

* minor refactors

* fixes

* buy dt

* consumePrice + estimation

* various fixes

* cleanup

* fix build

* fix ssh issue

* feedback

* build fix

* ssh fix

* remove console.log

* suggested fixes

* other fixes

* switch to decimal

* more fixes

* more fixes

* fix

* some fee refactors

* more fee refactoring

* lib update, fre rename

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

* minor refactors

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

* build fixes

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

* update + more refactoring

* calc price

* fix build

* restore accountId in effect

* fix order

* fix build and update lib

* fix order index

* fix comments

* pool fix

* remove console.log

* fix order fixed rate exchange

* fixed free order and messaging

* add comment

* minor type fix

* more type fixes
2022-02-14 08:27:36 -08:00
EnzoVezzaro
c438ba0a04
Fix mapping in search component and ux improvements (#1092)
* clear search input after submit

* fix mapping on sorting by tag (search query)

* fix property of undefined errors

* Revert "clear search input after submit"

This reverts commit 93dd57ae0b.
2022-02-14 15:33:46 +00:00
942ead1b4c
disable exhaustive-deps warning in Pool context (#1094) 2022-02-14 15:23:18 +00:00
EnzoVezzaro
b6dc52c0ab
change undefined with 0 as value to fix new Decimal error (#1089)
* change undefined with 0 as value to fix new Decimal error

* correction for fix changed undefined value with 0 as value to fix new Decimal error
2022-02-14 15:22:50 +00:00
Moritz Kirstein
d688b81a80
Feature: SVG Generator (#1032)
* use smaller SVG for publishing test, siwtch to Buffer encoding/decoding

* shorter NFT name & symbol

* fix: fix small test svg

* feat: first draft random wave svg generation

* refactor: utilize join to remove unecessary ',' separator

* feature: add gas cost estimation for nft artwork

* refacotr: allow fillColor as array and adjust opacity

* refactor: adjust random wave generation

* refactor: change nft help text

* refactor: trying tooltip for nft image info

* feat: add custom algorithm to generate svg waves

* fix: use text colors for nft form field svgs

* refactor: code cleanup nft utils

* refactor: improve readability

* refactor: improve comment

* refactor: (re)move comments, cleanup

* refactor: remove console log

* refactor: adjust default svg wave values & remove logging

* refactor: tweak default SvgWave prop values

* fix: svg preview with disconnected wallet

* feat: show artwork gas fee estimation in user preferred currency

* refactor: extract gas fee estimation logic to new component

* cleanup: remove oceanWaves, remove d3

* icon visual weight tweak

Co-authored-by: Luca Milanese <luca.milanese90@gmail.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-02-14 12:16:29 +00:00
mihaisc
fc1f396c96
updates (#1084)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-02-11 13:26:58 +02:00
claudiaHash
aec34dc712
Restore highest liquidity tab (#1077)
* get highest liquidity pools WIP

* logs deleted

* order fix

* query fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-02-10 16:41:07 +02:00
EnzoVezzaro
e2c468c128
added radio to pricing tabs on publish (#1067)
* added radio to pricing tabs on publish

* adding padding to tabs with radio

* correct unnecessary component and style class

* adding attribute selector to css rule
2022-02-10 14:37:34 +00:00
Bogdan Fazakas
cd2a4da8c5 move asset selection to compute helper 2022-02-10 16:33:16 +02:00
claudiaHash
fab181be34
filtering fix (#1071)
Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-02-09 13:18:27 +00:00
EnzoVezzaro
b79385bbcf
fixed bookmarks not showing on homepage (#1072) 2022-02-09 13:14:32 +00:00
Bogdan Fazakas
24ad553765 add pool logic for order 2022-02-08 11:30:16 +02:00
Bogdan Fazakas
b4a60b833c Merge branch 'v4' into feature/v4-c2d 2022-02-08 09:03:07 +02:00
mihaisc
463c850fc4
update (#1065) 2022-02-07 08:31:22 -08:00
b8c2b01b54
Pool stats updates and pool context provider (#1057)
* remove datatokens from liquidity stats, multiply base token

* naming: Pool Creator Statistics → Owner Liquidity

* remove all the noise

* more pool stats data

* simplify user liquidity data structure, remove datatoken calculations

* chart tweaks, new calculation for liquidity

* tweaks

* todo

* frontpage error fixes

* account switch fixes

* comment out fees

* pool context provider

* double pool share

* move subgraph-related methods into context provider

* typing fix
2022-02-07 14:58:47 +00:00
Bogdan Fazakas
d69de16102 add more comments 2022-02-07 15:36:32 +02:00
d51d909a66
disable all inputs during submission in add/remove liquidity (#1062) 2022-02-04 18:21:35 +00:00
24fd4de584
fix file info (#1061) 2022-02-04 15:58:11 +00:00
6ffb417724
use v4 label 2022-02-04 15:51:16 +00:00
Bogdan Fazakas
aee75a2fc6 merge v4 branch into restore c2d 2022-02-03 23:21:02 +02:00
Bogdan Fazakas
2e39ef93e4 merge v4 branch into c2d restore and fix merge conflicts 2022-02-03 23:18:45 +02:00
64255f2b37
Remove asset purgatory workaround (#1056)
* revert asset purgatory workaround

* reverts #1016

* asset loading fix
2022-02-03 15:26:49 +00:00
8074a6143c
Refactor Asset context provider (#1055)
* refactor Asset context provider

* use useIsMounted hook

* typings and effect tweaks

* use chainId

* effect tweak
2022-02-03 14:31:43 +00:00
Bogdan Fazakas
5ed369c0b7 removed unused methods 2022-02-03 15:50:31 +02:00
Bogdan Fazakas
ebcced9733 finish start compute job 2022-02-03 15:43:27 +02:00
mihaisc
57be62a6b1
Refactor pricing and various components that are involved (#1046)
* update

* merge pr #1012

* fix header

* fix

* abort controller

* up next.8

* build fix

* update lock

* fix

* another fix

* ssh fix

* another ssh fix

* remove optional

* order mock

* small cleanup

* fix package

* price updates

* finish getPrice

* fix consume

* fix consume

* getConsumeDetails  comments

* restore functionality after consumeDetails

* fix some compute typings

* more price fetching updates

* 'minor' refactors and fixed build

* package-lock fix

* minor comments

* minor naming changes

* fix

* fix pool badge

* remove console.log
2022-02-03 03:29:39 -08:00
claudiaHash
77c4ed42cc
Pricing tab validation fix (#1015)
* pricing validation - visited tabs

* use step as number

* remove unused import

* use price empty field

* merge fixes

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-02-02 05:53:15 -08:00
ef6a5fda7f
calculate user liquidity with subgraph values (#1053) 2022-02-02 11:49:59 +00:00
Bogdan Fazakas
ff1f953ffe merge v4 branch into c2d restore 2022-01-31 16:52:54 +02:00
2fb7ed3516
Merge pull request #1020 from oceanprotocol/v4-pool-graph
Pool chart updates, combine all pool data subgraph queries
2022-01-31 13:58:57 +00:00
claudiaHash
4b6be6da0c
Invalid transction link fix (#1035)
* get nft updates fix

* fix

* use nft update type

* message case fixed

* update message fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-01-31 13:15:52 +00:00
1eaec10ea9
center single data point 2022-01-31 12:42:23 +00:00
1c515496a9
fiix pool transaction titles 2022-01-31 12:42:23 +00:00
d4b42bf7a4
generated typing fix 2022-01-31 12:42:23 +00:00
9ebb57d2af
subgraph pool address type workaround 2022-01-31 12:42:23 +00:00
1e54a9d573
merge all the pool data subgraph queries into one 2022-01-31 12:42:23 +00:00
1e24972aa7
tooltip styling fixes 2022-01-31 12:42:23 +00:00
fde7449aad
typescript, yolo 2022-01-31 12:42:23 +00:00
5683d7b187
re-render fixes 2022-01-31 12:42:23 +00:00
7a5651e3a8
spacing, more file moving around 2022-01-31 12:42:22 +00:00
58f1c884de
split up fetching & data manipulation, refactor 2022-01-31 12:42:22 +00:00
1e4446116b
update and migrate to chart.js & react-chartjs new major versions 2022-01-31 12:42:22 +00:00
52437616f2
add volume graph 2022-01-31 12:42:22 +00:00
d43920548f
fix liquidity & price graph 2022-01-31 12:42:22 +00:00
8293e9ad5f
subgraph update fixes 2022-01-31 12:41:58 +00:00
2f6323f141
Merge pull request #1017 from oceanprotocol/v4-liquidity
Restore add/remove liquidity
2022-01-28 11:54:41 +00:00
claudiaHash
c0f87410c5
No file info shown for valid files (#1029)
* get asset file info

* additional verification, logs deleted

* fixes

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-01-28 11:49:14 +00:00
e113ba5300
V4-publish-fixes (#1030)
* tweak file URL input

* remove logging
2022-01-28 11:46:09 +00:00
Bogdan Fazakas
d6823184ca merge v4 branch into c2d restore 2022-01-27 10:56:10 +02:00
Bogdan Fazakas
0077ac728e add isOrderable and other helpers 2022-01-27 10:52:53 +02:00
9ce1f6f7d5
remove all the custom field change overwrites 2022-01-26 14:07:33 +00:00
a9aeed4aec
define token address & symbol only once 2022-01-26 12:41:21 +00:00
0db0bea3f6
more generic TokenApproval props, more logging 2022-01-26 12:06:09 +00:00
c10ca06dbc
fixes 2022-01-26 11:55:21 +00:00
08a691ceee
token approval & allowance fixes 2022-01-26 10:43:32 +00:00
8b31746e57
make remove output calculation work 2022-01-26 10:23:33 +00:00
bfdf7e1b24
prepare to use getAmountInExactOut 2022-01-26 10:23:33 +00:00
eaf29003c3
make remove work 2022-01-26 10:23:33 +00:00
a541cbcee0
refactor to use less hardcoded OCEAN
* ref #468
2022-01-26 10:23:33 +00:00
4dc188d3e4
add/remove baseToken only 2022-01-26 10:23:33 +00:00
c140cdc82c
restore submit methods, token approval workaround 2022-01-26 10:23:33 +00:00
0c5c8effde
restore live calculations 2022-01-26 10:23:33 +00:00
mihaisc
487bcad8b4
Update ocean.js (#1013)
* update

* merge pr #1012

* fix header

* fix

* abort controller

* up next.8

* build fix

* update lock

* fix

* another fix

* ssh fix

* another ssh fix

* remove optional
2022-01-26 10:17:41 +00:00
Bogdan Fazakas
5f9bc14095 Merge branch 'v4' into feature/v4-c2d 2022-01-25 11:03:35 +02:00
409f0c51fb
faulty purgatory response workaround (#1016) 2022-01-24 10:51:51 +00:00
f55d8d9a91
Pool tab refactor (#1009)
* refactor and simplify

* fix user pool transaction section

* split up fetching and data manipulation

* restore refetch after add/remove, rename all the things

* more naming and logging

* new state structure unifying multiple data structures

* another response failsafe

* naming
2022-01-21 14:09:15 +00:00
claudiaHash
42323cb8c4
Use asset's ddo.purgatory (#1006)
* set purgatory state

* merge v4 changes, use ddo.purgatory

* delete commented code, fix verification

* unused files and function deleted, small fix

* comment removed

* use purgatory.state for filtering assets

* remove unnecessary check

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-01-19 16:30:04 +00:00
Bogdan Fazakas
afd1c2d9db add balance check and check is consumable 2022-01-19 09:12:59 +02:00
2622a807f6
Subgraph updates (#1007)
* subgraph updates

* swap title fixes
2022-01-18 20:29:28 +00:00
claudiaHash
6689f55808
Fix: show test label according to network type (#1002)
Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-01-17 19:47:03 +00:00
0129806159
pregenerate warning fix 2022-01-17 17:06:46 +00:00
44a0589420
remove subgraphError params 2022-01-17 14:14:01 +00:00
606654b533
more pool query refactor 2022-01-17 13:53:15 +00:00
f3c85ccb95
refactor PoolTransactions title component 2022-01-17 13:28:31 +00:00
5401390c44
simplify and refactor pool charts 2022-01-17 13:06:24 +00:00
25204b2393
graph sync status fix 2022-01-17 11:37:58 +00:00
4706029029
make datatoken balance work again in multiple places 2022-01-14 17:40:05 +00:00
c6011d29ef
fail safe against empty creator liquidity, just read out weights 2022-01-14 17:25:20 +00:00
8996722fcb
pool graph tinkering with poolSnapshots 2022-01-14 17:10:24 +00:00
c28cdd318f
add todo 2022-01-14 14:38:30 +00:00
ce4e0cfba5
market stats tinkering 2022-01-14 14:25:26 +00:00
1726fe1d0d
isolate apollo stuff into npm script, more generic folder name output 2022-01-13 23:50:47 +00:00
de87e16906
remove graphql-codegen stuff
* keep existing apollo-based generation as it just works
* can be put back from this commit when doing #722
2022-01-13 22:27:00 +00:00
68ad4cc160
migrate most components using GraphQL queries 2022-01-13 22:03:36 +00:00
d78676fa3b
migrate data in subgraph.ts 2022-01-13 21:41:19 +00:00
829333e1e1
migrate all subgraph.ts queries, making typings generation work 2022-01-13 21:24:06 +00:00
2af3b68603
migrate PoolTransactions queries 2022-01-13 20:10:55 +00:00
18d7223297
migrate Consume query 2022-01-13 19:31:46 +00:00
ca32de2dd7
migrate pool graph query 2022-01-13 19:26:15 +00:00
0dca59ac64
migrate metadata history query 2022-01-13 19:25:51 +00:00
c5583c691c
migrate Pool index query 2022-01-13 19:08:34 +00:00
76bb997fe1
start adapting queries 2022-01-13 18:38:51 +00:00
claudiaHash
8838ae533e
Adapt aquarius queries (#986)
* get aquariusv4 assets

* subgraph url fix

* make asset details work as much as possible

* sort and size fix, comments deleted

* get published assets

* search wip

* page change  fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-01-13 18:17:09 +00:00
2e794f51a8
use generateDtName from ocean.js (#992) 2022-01-13 17:51:33 +00:00
3bac4a1eb8
fix useGraphSyncStatus error 2022-01-13 17:51:08 +00:00
f6097bf158
remove OceanProvider (#988) 2022-01-13 13:15:15 +00:00
329ac9bbc3
shorten NFT symbol
* ref #944
2022-01-13 12:07:55 +00:00
181dce9ba5
publish feedback tweaks, make content switching based on price type work 2022-01-12 19:24:49 +00:00
25920b7763
more logging within createTokensAndPricing 2022-01-12 19:05:15 +00:00
5d40121adc output error messages in UI 2022-01-12 18:02:56 +00:00
bd561a2510 add basic full success state 2022-01-12 18:02:56 +00:00
8a20552268 more styling, button disabling, hack in isContinueDisabled
* closes #978
2022-01-12 18:02:56 +00:00
0b97994a9e spacing, styling, sizing 2022-01-12 18:02:56 +00:00
5f50379f63 tx link tweaks, output tx count beforehand 2022-01-12 18:02:56 +00:00
b139346b35 output transaction links 2022-01-12 18:02:56 +00:00
a65c971ea6 hack in our loader 2022-01-12 18:02:56 +00:00
e5ee3e10c7 working feedback state switching 2022-01-12 18:02:56 +00:00
82dce7e219 more UI elements and copy 2022-01-12 18:02:56 +00:00
claudiaHash
44114345bb
Integrate provider fileinfo (#965)
* provider functions added

* working validation

* fixes, comments deleted

* lint fix, comment deleted

* fixes over the provider functions integration

* remove unused provider.ts exports

* provider checkFileUrl() integration

* provider encrypt method changes

* use fetch method

* axios request reused

* dependency removed

* getFileInfo fixes

* remove unused const

* function call fix

* use providerUrl form value

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-01-12 17:02:47 +00:00
af99d3bc37
reactivate user balance check 2022-01-11 23:19:38 +00:00
245a604a99
prototype feedback data structure & flow 2022-01-11 23:11:15 +00:00
453458814e
move token & price creation into method 2022-01-11 22:18:33 +00:00
efb4cd5bbd
lint fix 2022-01-11 20:14:04 +00:00
a1c75c94fe
fix preview crash 2022-01-11 20:09:14 +00:00
a084c038c5
merge fixes 2022-01-11 19:58:39 +00:00
38ce25225f
Merge branch 'v4' into feature/publish 2022-01-11 19:49:11 +00:00
64a25f3f3e
use Asset from ocean.js, adapt to new structure 2022-01-11 19:45:14 +00:00
d9b52e6da5
Merge branch 'v4' into feature/publish 2022-01-11 19:06:16 +00:00
b5b0297ae4
refactor for new ocean.js, make the build work 2022-01-11 19:05:07 +00:00
fee5973f81
naming: NftOptions → NftMetadata 2022-01-11 15:40:40 +00:00
c3301fb437
NFT metadata updates
* switch to `image_data` instead of `image` key
* add `external_url` & `background_color`
* make following OpenSea standard more clear
* ref #944
2022-01-11 14:52:01 +00:00
a235255cc0
Merge branch 'v4' into feature/publish 2022-01-11 13:23:40 +00:00
e87bdfadfc
activate form validation 2022-01-11 13:13:13 +00:00
9e315a71f1
Merge pull request #960 from oceanprotocol/fix/issue948-remove-dependency
Integrate provider isValidUrl()
2022-01-11 13:12:03 +00:00
mihaisc
f576aadbfe fix service id 2022-01-11 13:03:54 +02:00
mihaisc
7cac17d906 fix publish with pool 2022-01-11 12:57:22 +02:00
ae71ce706a
Merge branch 'v4' into feature/publish 2022-01-11 10:31:08 +00:00
b1399bd579
network metadata updates
* move over b2330fdc99 (#980)
2022-01-11 09:59:44 +00:00
mihaisc
8e60738071 fix publish with pool 2022-01-10 17:49:46 +02:00
ClaudiaHolhos
e716f96d67 removed unused import 2022-01-10 13:06:07 +02:00
ClaudiaHolhos
5050621e28 isValidUrl called directly, extra function removed 2022-01-10 12:13:53 +02:00
mihaisc
c9faca8666 fixes 2021-12-23 14:36:22 +02:00
mihaisc
c7d6616874 fixes & hacks 2021-12-21 22:26:08 +02:00
mihaisc
695011fe8b
remove hardcoded url
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-12-21 20:30:14 +02:00
mihaisc
16475b55d1 publish draft 2021-12-21 15:54:39 +02:00
mihaisc
b86ac219f3 interm 2021-12-20 16:38:54 +02:00
ClaudiaHolhos
62ced13eaf remove fetchMehod() 2021-12-15 13:10:11 +02:00
ClaudiaHolhos
e028dd9674 working check 2021-12-14 14:59:16 +02:00
ClaudiaHolhos
1669df0e78 lint fix 2021-12-13 17:41:22 +02:00
ClaudiaHolhos
6813462cb0 use new provider 2021-12-13 17:23:29 +02:00
mihaisc
4caf72d0c9
Fix/old lib dep (#959)
* fixes

* change aqua url

* update future v4 url
2021-12-10 03:33:47 -08:00
mihaisc
b0adbf8071
add account teaser, various refactors (#957)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-12-10 01:50:00 -08:00
9586bd9fd5
output default gpu & gpuType when present 2021-11-29 17:01:56 +00:00
318bc44f43
compute options dataflow tweak 2021-11-29 16:55:15 +00:00
9d9a33393f
fix checked state 2021-11-29 16:51:08 +00:00
9bd9156553
integrate compute options into form data, expose default option 2021-11-29 16:49:38 +00:00
8a60aaf3f5
add default compute environment options 2021-11-29 15:57:12 +00:00
3aa739fce0
add Docker image presets, populate algo Docker field from them 2021-11-29 13:25:30 +00:00
7c98659c86
free price tweaks 2021-11-26 13:05:53 +00:00