1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-30 22:01:44 +02:00
Commit Graph

330 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Jamie Hewitt
8271963292
Making error message more generic (#1368) 2022-04-27 16:28:02 +02:00
ce07740ef8
remove loading feedback during price fetching (#1361) 2022-04-27 08:50:17 +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
3b535aadb8 use zero adress for price and fees order 2022-04-19 09:32:10 +03:00
Bogdan Fazakas
0b1d9cc436 merge v4 into v4-c2d 2022-04-15 12:04:49 +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
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
Bogdan Fazakas
0c87abe24d Merge branch 'v4' into feature/v4-c2d 2022-04-04 15:19:31 +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
Soon Huat
795ba0c01b c2d show price with fee, exclude provider fee 2022-03-30 22:44:10 +08: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
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
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
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
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
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
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
Bogdan Fazakas
74f211d45d remove logs 2022-03-15 16:54:36 +02:00
Bogdan Fazakas
7ee2bdab98 merge v4 into v4-c2d 2022-03-14 16:47:34 +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
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
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
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
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
Bogdan Fazakas
d4570aa1cb merged v4 into c2d 2022-02-23 15:58:20 +02: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
mihaisc
fc1f396c96
updates (#1084)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-02-11 13:26:58 +02:00
Bogdan Fazakas
cd2a4da8c5 move asset selection to compute helper 2022-02-10 16:33:16 +02: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
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
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
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
d4b42bf7a4
generated typing fix 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
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
Bogdan Fazakas
5f9bc14095 Merge branch 'v4' into feature/v4-c2d 2022-01-25 11:03:35 +02: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
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
5401390c44
simplify and refactor pool charts 2022-01-17 13:06:24 +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
1726fe1d0d
isolate apollo stuff into npm script, more generic folder name output 2022-01-13 23:50:47 +00:00
68ad4cc160
migrate most components using GraphQL queries 2022-01-13 22:03:36 +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
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
f6097bf158
remove OceanProvider (#988) 2022-01-13 13:15:15 +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
a084c038c5
merge fixes 2022-01-11 19:58:39 +00:00
64a25f3f3e
use Asset from ocean.js, adapt to new structure 2022-01-11 19:45:14 +00:00
b5b0297ae4
refactor for new ocean.js, make the build work 2022-01-11 19:05:07 +00:00
mihaisc
4caf72d0c9
Fix/old lib dep (#959)
* fixes

* change aqua url

* update future v4 url
2021-12-10 03:33:47 -08:00
c484a5b40c
new publish preview (#947)
* refactor preview

* make preview render

* more preview elements, proper debug output

* make more elements work

* cleanup and fixes

* make asset actions preview work, kinda

* more fixes

* reorg

* make preview price display work

* fix timeout

* layout tweaks

* fixes

* another fix

* make file info preview work

* empty render fix
2021-11-23 12:53:09 +00:00
82951548ef
reorg Form components one level up 2021-11-15 18:29:20 +00:00
fc1966aa4e
copy 2021-11-15 15:42:50 +00:00
704b52a3c4
more publish flow preparation
* consolidate scattered methods into publish utils
* new encrypt method
* remove DDO File typings
2021-11-11 13:40:38 +00:00
4e985ba633
ddo updates 2021-11-11 09:22:22 +00:00
3d4b30c00f
new DDO (#941)
* type out new DDO

* remove all DDO ocean.js imports

* move over as much as possible to new DDO structure

* DDO/Asset split-up

* use Asset typing instead of DDO almost everywhere

* more typings

* more DDO refactor

* ddo typings updates

* more DDO updates

* updates

* ddo updates
2021-11-11 07:51:13 +00:00
d67529409c
styling tweaks, prepare AssetContent for preview 2021-11-01 19:04:18 +01:00
235d8333eb
pricing defaults changes, fixes 2021-10-29 11:29:56 +01:00
66adc097b6
declarative metadata & services form setup, prepare transformPublishFormToDdo method 2021-10-28 10:38:40 +01:00
f2b1a33261
restructure form, dial back on overwriting native Formik functionality 2021-10-27 18:35:18 +01:00
99453623d2
new publish form data setup 2021-10-27 18:35:04 +01:00
70470a9459
more refactor 2021-10-27 18:35:01 +01:00
c023f45138
reorganize all the things 2021-10-27 18:34:37 +01:00
3729c63581
migrate to Next.js (#935)
* migrate to Next.js

* migrate scripts

* generate markdown pages

* make all the markdown work

* fix profile, fix image loading

* git+ssh → git+https, again

* bump packages

* maybe windows build fix

* add public to gitignore

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

* Next.js v12! Webpack 5! No build hacks anymore

* json import fixes

* fixes

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-10-27 11:30:32 +01:00
032b3e1496
quick refactor of AssetList data flow 2021-10-27 11:30:32 +01:00
b6cfe6de34
more refactor 2021-10-27 11:30:28 +01:00
51785d54dd
more reorganization 2021-10-27 11:29:03 +01:00
1d4917817a
remove everything we do not expose in our live market 2021-10-27 11:29:03 +01:00
f951910dc2
reorganize all the things 2021-10-27 11:28:59 +01:00