1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-30 13:51:42 +02:00
Commit Graph

1473 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8f93d9bc2f
bump oceanlib to 1.0.0-next.32 (#1282) 2022-03-30 14:06:40 +01:00
Norbi
aa4bdda207
display token approval message on loading (#1280) 2022-03-30 11:30:41 +01: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
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
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
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
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
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
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
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
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
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
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
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
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
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