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

1797 Commits

Author SHA1 Message Date
EnzoVezzaro
1a3d18460f
added total orders on teaser (#1570) 2022-07-05 18:49:47 +01:00
EnzoVezzaro
42956a3441
restored "Publishers with most sales" section (#1540)
* updated subgraph query

* rework AccountList

* fix missing 'a' elem in dom (<Link> is not rendering correct markup)

* restore PublishersWithMostSales section

* removed unnecessary params in AssetList

* use Blockies for all profile.image

* changed logic on getTopAssetsPublishers

* added aggregations op to getTopAssetsPublishers method

* fix build issues

* improve logic & added correct total sales on profile

* removed complex logic to unify query

* typography & markup cleanup

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-07-05 13:49:35 +01:00
Bogdan Fazakas
85013c1198 Merge branch 'main' into fix/change-c2dorders-order 2022-07-05 09:58:00 +03:00
Bogdan Fazakas
fccf097126 use proper docker hub images 2022-07-05 09:22:16 +03:00
dependabot[bot]
2d2ad78f89
Bump react-data-table-component from 6.11.8 to 7.5.2 (#1503)
* Bump react-data-table-component from 6.11.8 to 7.5.2

Bumps [react-data-table-component](https://github.com/jbetancur/react-data-table-component) from 6.11.8 to 7.5.2.
- [Release notes](https://github.com/jbetancur/react-data-table-component/releases)
- [Commits](https://github.com/jbetancur/react-data-table-component/compare/v6.11.8...v7.5.2)

---
updated-dependencies:
- dependency-name: react-data-table-component
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* refactor for new major versions

* fully typed styles

* border fix

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-07-04 15:48:54 +01:00
mihaisc
2e1618db3f
fix rounding when calc max (#1564) 2022-07-01 21:46:37 +01:00
mihaisc
423a4d90ac
proper null check for sales (#1563) 2022-07-01 10:56:36 +01:00
Bogdan Fazakas
b49ba6fa45 change compute assets order calls order and add a default checksum for algo 2022-07-01 11:12:51 +03:00
EnzoVezzaro
00576b8acf
added total orders to asset details (#1556)
* added total orders to asset details

* bump ocean.js to v1.1.5, bump web3 packages

* move component, rename copy

* center asset stats for now, cleanup

* tweak no sales condition style

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-30 13:58:24 +01:00
daf15a698f
remove onChange handlers on edit (#1555)
* remove onChange handler on edit compute

* move empty DID list condition
2022-06-29 13:54:03 +01:00
Bogdan Fazakas
d500c65d5d
fix fre order and bump ocean lib (#1553) 2022-06-28 14:09:30 +01:00
d5e5019cc8
header space saving & interaction tweaks (#1549)
* header space saving & interaction tweaks

* remove network name reveal interaction on small viewports
* increase header button sizes for all viewports for better tap targets
* tweak flex layout
* remove caret from version badge on smaller viewports

* fix NFT tooltip icon placement

* spacing tweak

* caret css cleanup

* remove reconnecting message

* squeeze more space out of network, test label

* more space from unsupported network indicator
2022-06-28 14:01:26 +01:00
Sebastian Abromeit
8249ff1397
update ui components for mobile (#1495)
* fix mobile layout for filter buttons

* fix tabs component mobile view

* fix zoom in on input focus on mobile devices

* reduce searchbar font-size
2022-06-28 13:55:29 +01:00
mihaisc
8396b705d3
Walletconnect fix for polygon (#1548)
* fix wc

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

* fix mumbai

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-06-27 11:19:26 +01:00
02beb0f8c3
Edit screen fixes (#1546)
* edit refactors

* fix logic around `publisherTrustedAlgorithms`

* typing fix

* copy & typos

* conditionally add compute tab to edit screen

* more logic fixes

* fix various app crashes because of Debug component
* semi-deal with publisherTrustedAlgorithmPublishers

* more fixes, bound submit button to touched state
2022-06-27 10:15:45 +01:00
EnzoVezzaro
6d800eda58
Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-06-24 09:13:49 -04:00
Enzo Vezzaro
7023247894 allow calculations on unsupported network & user not connected 2022-06-24 09:06:13 -04:00
Enzo Vezzaro
db1e1f8fae Merge branch 'feature/v4-c2d' into fix/issue-1069-c2d-unsupported-networks 2022-06-24 07:17:16 -04:00
Bogdan Fazakas
5387b9a3dd
Restore compute functionality (#1069)
* add balance check and check is consumable

* add isOrderable and other helpers

* finish start compute job

* removed unused methods

* add more comments

* add pool logic for order

* move asset selection to compute helper

* small fix

* fixed get algo list

* refactor start compute job and more fixes

* update order params

* use compute env and compute consumer address

* fix prices

* fix algorithms selection list on allowAllPublisher case

* fix edit compute settings

* update compute resources valid until logic

* fixes and cleanups

* wip compute jobs

* fix compute timeout value

* fixed compute jobs logic

* fix algo selection list name

* fixed compute jobs from profile loading

* update start compute flow messages

* update set algo access details

* update compute message logic

* added logs

* update package lock

* remove logs

* fix edit compute checksums for files and container

* 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>

* 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>

* fix build

* handle order price, NaN and default 0

* optional value for all fee, prevent breaking when no value

* fix aquarius call and added logs

* update provider compute status call

* remove percentage fee from price sum, depends smart contract calculation (#1249)

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>

* fix display of compute datasets with free price

* removed to lowerCase on eth address

* fix compute jobs section and your jobs

* bumo ocean lib to 1.0.0-next.32

* c2d show price with fee, exclude provider fee

* wip get results

* include loading when calculating data + algo price, tooltip show order price

* update get compute url and use oceanjs helper for download

* update computeStatus signature to fix build and CI

* added logs

* refactor setting price and fees for assets

* update compute details and compute results UI and style

* update flex value

* update download buttons style

* update download buttons text

* bump ocean lib version and lint fixes

* get provier uri for compute results based on job input did

* use zero adress for price and fees order

* some fixes

* 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>

* fix fixed rate

* fix build

* fix your compute jobs section when asset network not selected

* disable edit compute settings for algorithms

* fix compute jobs infinite loading when no jobs found

* fix compute form

* show token symbol for free assets also on compute price output

* removed swp file

* some decimal fixes

* partial fix for asset with pool fees, algo not working yet

* more decimal fixes

* fix algo with pool price and fees fetching

* fix selecting algorithms when on different network

* fix compute jobs table auto refresh and details  modal closing

* wip compute initialize

* order fixes

* fix lint

* fix conditions and cleanups

* fix compute status text display

* init prices and fees after starting a compute job

* start/order button tweaks

* kick in loader earlier

* update compute status feedback messages

* fixed initial price

* compute jobs refetch and reuse order

* remove logs

* removed logs and added some explanations

* use compute env max duration value in seconds

* error handling on intializeCompute and order

* removed console logs and added one new check

* use optional on initialized provider check

* remove toast from provider helper

* fix compute env issue on start order

* disable job selection during actions execution

* temporary fix publish algo with custom docker image

* fix provider fee display

* remove unnecessary condition

* fix alignment based button on action type (#1491)

* fix alignment based on action type

* moving to CSS modules

* send providerFeeAmount as string

* remove cast on providerFeeAmount

* removed some logs and added few comments

* update price output tooltip and total price logic

* set providerFee amount only when avaialable

* bump oceanlib to 1.1.2

* replace FIleMetadata to fix build

* used approveWei for approving provider fees

* fix free algo price selection and display

* fix provider fee load at first algo selection

* update compute help text

* fix provider fee approve for free assets

* cleanup

* remove commented out code
* remove unused state
* removed unused imports
* typos in comments, variables, props

* more typos

* shorten getAccessDetailsFromTokenPrice() a bit

* state & hooks access reordering

* Update src/@utils/ddo.ts

remove metadata from service type

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

* effect dependency fixes

* state renaming

* effect dependency fixes

* compute jobs profile visual fixes

* effect dependency fixes

* more comments removal

* add accountId as a dependency in effect

* move isOwner to asset provider

* refactor handleComputeOrder for less complexity and more useful error reporting

* more proper error throwing

* provider fee statement tweak

* more obvious edit action

* empty array for `publisherTrustedAlgorithms` & `publisherTrustedAlgorithmPublishers` by default

* ref #1538
* ref #1539

* don t use initial tx values as valid order use subgraph value

* fix algo list fetching

* closes #1537
* addresses #1538

* fix disable compute button if algo is consumable

* move isOwner check to single effect

* Correctly display trusted algorithms in compute asset (#1541)

* fix allowed algo

* fix trusted algo filter

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
Co-authored-by: Soon Huat <soonhuat.phan@hotmail.com>
Co-authored-by: Enzo Vezzaro <enzo-vezzaro@live.it>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-06-23 16:53:05 +01:00
mihaisc
aa37155a16
Correctly display trusted algorithms in compute asset (#1541)
* fix allowed algo

* fix trusted algo filter
2022-06-23 16:06:09 +01:00
2b025ea38c
move isOwner check to single effect 2022-06-23 15:40:59 +01:00
Bogdan Fazakas
8656a6c51b Merge branch 'feature/v4-c2d' of https://github.com/oceanprotocol/market into feature/v4-c2d 2022-06-23 17:20:58 +03:00
Bogdan Fazakas
e9ff4f7717 fix disable compute button if algo is consumable 2022-06-23 17:18:54 +03:00
ec34dc8f53
fix algo list fetching
* closes #1537
* addresses #1538
2022-06-23 14:52:39 +01:00
Bogdan Fazakas
98beb1c3af don t use initial tx values as valid order use subgraph value 2022-06-23 16:48:05 +03:00
edd80eed77
empty array for publisherTrustedAlgorithms & publisherTrustedAlgorithmPublishers by default
* ref #1538
* ref #1539
2022-06-23 14:30:28 +01:00
cf254aa7c6
more obvious edit action 2022-06-23 12:51:46 +01:00
30b654975a
provider fee statement tweak 2022-06-23 11:38:48 +01:00
7f104c9858
more proper error throwing 2022-06-23 11:38:03 +01:00
8edd3a4f60
refactor handleComputeOrder for less complexity and more useful error reporting 2022-06-23 11:05:16 +01:00
Bogdan Fazakas
e1168a451d move isOwner to asset provider 2022-06-23 08:04:39 +03:00
Bogdan Fazakas
a030cdecdb add accountId as a dependency in effect 2022-06-23 07:16:20 +03:00
498f7604da
more comments removal 2022-06-22 15:16:28 +01:00
c0c709e7f5
effect dependency fixes 2022-06-22 15:12:38 +01:00
18b487dd75
compute jobs profile visual fixes 2022-06-22 14:51:07 +01:00
Enzo Vezzaro
515eb19cbf Merge branch 'feature/v4-c2d' into fix/issue-1069-c2d-unsupported-networks 2022-06-22 09:39:21 -04:00
923569e61a
effect dependency fixes 2022-06-22 14:02:32 +01:00
e3b751ea8b
state renaming 2022-06-22 13:40:35 +01:00
40f9170eb4
effect dependency fixes 2022-06-22 13:40:22 +01:00
Bogdan Fazakas
3e4b79fc42
Update src/@utils/ddo.ts
remove metadata from service type

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-22 15:13:33 +03:00
36bc097c0b
state & hooks access reordering 2022-06-22 12:46:27 +01:00
c8ab4b18c5
shorten getAccessDetailsFromTokenPrice() a bit 2022-06-22 12:05:35 +01:00
b09dc6b953
more typos 2022-06-22 11:46:42 +01:00
db23ed6ada
cleanup
* remove commented out code
* remove unused state
* removed unused imports
* typos in comments, variables, props
2022-06-22 11:32:59 +01:00
Bogdan Fazakas
b37c85908d merge main into v4-c2d 2022-06-22 06:59:40 +03:00
Bogdan Fazakas
256744317f fix provider fee approve for free assets 2022-06-22 06:58:29 +03:00
d884a9529d
remove Portis (#1529)
* remove Portis

* cleanup
2022-06-21 14:18:40 +01:00
Enzo Vezzaro
56583c5e7a Merge branch 'feature/v4-c2d' into fix/issue-1069-c2d-unsupported-networks 2022-06-21 08:32:20 -04:00
Jamie Hewitt
f20a6a5a48
Opening blog post link in new tab (#1526)
* Opening link in new tab

* Adding styling to link

* Updating button font size
2022-06-20 17:46:13 +03:00
Bogdan Fazakas
455a68a29c update compute help text 2022-06-20 06:54:26 +03:00
Enzo Vezzaro
da934f789f adding dummyweb3 and zero_address to calculate price on unsupported network / not connected user 2022-06-17 08:51:16 -04:00
Bogdan Fazakas
e222b730af fix provider fee load at first algo selection 2022-06-17 12:14:25 +03:00
Bogdan Fazakas
a54a5dc0c6 fix free algo price selection and display 2022-06-17 10:16:01 +03:00
Bogdan Fazakas
a8ca31f02e merge main into v4-c2d and fixed conflicts 2022-06-17 07:18:43 +03:00
Bogdan Fazakas
888aeeb541 used approveWei for approving provider fees 2022-06-17 07:14:41 +03:00
mihaisc
33edc3f5f4
Update file (#1518)
* update version and file

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

* update label and description

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

* remove dot

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

* remove helper props so we don't add them on chain

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

* bump ocean.js to v1.1.2

* build fix

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-16 11:10:08 +01:00
Bogdan Fazakas
cc2e179d29 replace FIleMetadata to fix build 2022-06-16 08:32:48 +03:00
Bogdan Fazakas
fe06c2eb2c merge main into v4-c2d 2022-06-16 08:25:35 +03:00
Bogdan Fazakas
7a6df34be4 set providerFee amount only when avaialable 2022-06-16 07:12:56 +03:00
mihaisc
a47fb09b91
update publish form with DDO v4.1.0 structure (#1519)
* update publish form

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

* typing quick fix

* fix build

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

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-15 17:35:41 +03:00
Bogdan Fazakas
9eb47f6602 update price output tooltip and total price logic 2022-06-15 16:43:37 +03:00
d523c7f0f3
Retry failed transactions during publish (#1511)
* allow multiple runs of handleSubmit

* collect what we need in local state for reuse after method has run
* run each step conditionally

* split up handleSubmit

* switch submit button text

* empty values.feedback fix

* error copy

* tiny logic fix for consistency

* code comments

* submit button fixes

* add loader during submission
* add new white loader style
* button style override fixes
2022-06-15 12:35:37 +01:00
Bogdan Fazakas
88fbab5602 removed some logs and added few comments 2022-06-15 07:11:19 +03:00
Bogdan Fazakas
4d09240923 remove cast on providerFeeAmount 2022-06-15 06:56:23 +03:00
Bogdan Fazakas
a740e07b0d send providerFeeAmount as string 2022-06-15 06:54:06 +03:00
Bogdan Fazakas
9545788e3d merge main into v4-c2d 2022-06-15 06:39:34 +03:00
Enzo Vezzaro
6a048d4c5c fix build on CI 2022-06-14 13:47:13 -04:00
Enzo Vezzaro
f242cebefa fix unsupported network crash and allow price calculations to those networks 2022-06-14 12:30:35 -04:00
EnzoVezzaro
a986ecc3fc
fix alignment based button on action type (#1491)
* fix alignment based on action type

* moving to CSS modules
2022-06-14 13:21:56 +01:00
mihaisc
82e5f60e65
fix (#1517) 2022-06-14 03:57:06 -07:00
89a63f7cb2
NFT display tweaks (#1507)
* NFT display tweaks

* capitalization consistency

* refactor

* fix asset preview
2022-06-13 14:41:18 +01:00
mihaisc
a1856d79a4
fix global stats (#1512)
* fix global stats

* switch graph schema to ropsten

* minor fix
2022-06-10 17:11:37 +03:00
Bogdan Fazakas
0d3464848d merge main into v4-c2d fix conflicts 2022-06-08 17:08:50 +03:00
mihaisc
f901355e98
fix profile (#1499)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-06-08 14:32:13 +02:00
mihaisc
6dfeead4fd
Release (#1492)
* update contracts

* add version selector

* show banner on all pages

* show banner on all pages

* Announcement/warning messages cleanup

* new main announcement message
* contextual compute-to-data warnings in publish form & asset action

* copy update

* change hardcoded URLs

* change localStorage key

* to prevent user preferences clashes when switching between v3 & v4

* footer stats note changes

* move copy into content file
* mention external markets

* footer stats note copy changes

* modified pool widget footer

* take out pool reserve display
* style & spacing updates for fees

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-08 11:46:46 +03:00
mihaisc
857409d5ad
remove display of dt in setup (#1488)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-06-07 11:54:10 +03:00
Bogdan Fazakas
7ef70100fb
Merge pull request #1482 from oceanprotocol/feature/disable-selection-when-job-starts
disable job selection during actions execution
2022-06-07 07:56:53 +03:00
Enzo Vezzaro
a1fdc28136 block users from selection when on unsupported asset 2022-06-06 10:46:20 -04:00
Enzo Vezzaro
48a3962be1 remove unnecessary condition 2022-06-06 10:36:59 -04:00
Luca Milanese
e412dc10d6
add v3 assets redirect (#1446)
* feat: add v3 assets redirect

* feat: add fallback return value to checkV3Asset

* fix: rename env variables for v3 related uris
2022-06-06 12:25:09 +02:00
Bogdan Fazakas
2c726599b4 merge v4 into v4-c2d 2022-06-05 01:50:17 +03:00
Bogdan Fazakas
2c288f2591 fix provider fee display 2022-06-05 01:49:04 +03:00
Bogdan Fazakas
ed3d736faf temporary fix publish algo with custom docker image 2022-06-03 07:25:27 +03:00
Enzo Vezzaro
37f7faf7e2 disable job selection during actions execution 2022-06-02 11:41:06 -04:00
claudiaHash
e9a3513cac
add error message title (#1473)
Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-06-02 16:44:09 +03:00
Bogdan Fazakas
c2995223a7 fix compute env issue on start order 2022-06-02 07:38:07 +03:00
Bogdan Fazakas
3232460f38 remove toast from provider helper 2022-06-01 17:40:51 +03:00
Bogdan Fazakas
0901ff7141 use optional on initialized provider check 2022-06-01 17:28:39 +03:00
Bogdan Fazakas
c25ab289fd removed console logs and added one new check 2022-06-01 17:25:51 +03:00
Bogdan Fazakas
9ff04d3c04 error handling on intializeCompute and order 2022-06-01 17:03:18 +03:00
Bogdan Fazakas
2e9898907d use compute env max duration value in seconds 2022-06-01 09:51:51 +03:00
Bogdan Fazakas
cc5c761aca merge v4 into v4-c2d 2022-06-01 09:44:53 +03:00
Jamie Hewitt
ea897c8e7a
Fix edit form validation (#1371)
* Fixing logic for showing error messages

* Removing unused code

* Refactoring

* fixing sample file validation

* Removing console logs

* Minor formatting
2022-05-31 11:18:10 +01:00
Bogdan Fazakas
b04d1cd9f4 merge v4 into v4-c2d 2022-05-30 12:22:30 +03:00
Bogdan Fazakas
4f14ffc265 removed logs and added some explanations 2022-05-26 17:58:17 +03:00
Bogdan Fazakas
aec4568412 remove logs 2022-05-26 08:38:38 +03:00
Bogdan Fazakas
565e7bfa31 compute jobs refetch and reuse order 2022-05-26 08:37:31 +03:00
claudiaHash
d53ea3f187
remove unnecessary text replacement (#1448)
Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-05-23 17:47:43 +03:00
Bogdan Fazakas
9ffa3419a6 merge v4 into v4-c2d 2022-05-23 17:33:16 +03:00
Bogdan Fazakas
589d174abf fixed initial price 2022-05-23 17:28:40 +03:00
claudiaHash
6d2dea8c9d
Atomic components stories (#1422) 2022-05-23 12:29:37 +01:00
Bogdan Fazakas
ea6a350796 merge v4 into v4-c2d 2022-05-20 08:20:49 +03:00
Bogdan Fazakas
f0b22ee8e4
fix forever timeout for assets (#1445) 2022-05-19 17:48:13 +01:00
mihaisc
bf31cdfed5
Various fixes (#1441)
* fixes

* more fixes
2022-05-18 17:25:44 +01:00
Bogdan Fazakas
06e6290613 merge v4 2022-05-18 17:21:07 +03:00
mihaisc
4b6baa9cd5
Update contracts and math (#1436)
* update contracts and math

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

* change fee name

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

* bump to ocean.js v1.0.0-next.44

* rename consumeFee to orderFee

* prevent variable naming clash

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
2022-05-18 14:38:08 +01:00
Bogdan Fazakas
6d7852672d update compute status feedback messages 2022-05-17 11:45:37 +03:00
Bogdan Fazakas
9a22e92a4a kick in loader earlier 2022-05-17 11:20:19 +03:00
EnzoVezzaro
593039f894
Fix svgr in storybook & jest (#1428)
* fix svg loader

* added Logo component to be able to test storybook

* added svg mock for svgr as suggested (still not working)

* package cleanup

* make svg moduleNameMapper match first

* cleanup

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-05-16 17:11:43 +01:00
Bogdan Fazakas
4631ae9af7 start/order button tweaks 2022-05-16 17:58:12 +03:00
Bogdan Fazakas
c1648cb7e6 merge v4 2022-05-16 15:51:28 +03:00
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