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

1184 Commits

Author SHA1 Message Date
db5b892e23
Merge pull request #774 from oceanprotocol/feature/account_page 2021-09-22 18:05:17 +02:00
212865110e
ENS names (#860)
* prototype getting ENS names

* get ENS name with subgraph

* ENS name for publisher line

* inject ENS name in profile page

* refactor to cover all use cases for profile URLs

* fixes for switching between own and other profiles

* remove testing ENS libraries

* more cleanup

* any solves everything

* build fix

* more profile switching tweaks

* link publisher line to ens name

* another profile switching fix

* show ENS link in meta line
2021-09-20 13:47:15 +02:00
Norbi
56993904cf
Error when switching to a network that is not added in Metamask (#846)
* use nodeUri instead of providerUri

* get rpc node from query

* remove ocean config

* fix and complete data for new network config
2021-09-16 19:44:34 +02:00
Norbi
0eb6c15cda
Fix pagination breaks on to many results (#831)
* handle to many results

* update search test

* get transaction history based on ddo chainId

* revert last commit

* changed title and description

* reduce paragraphs

* added constant for maximum number of pages
2021-09-15 12:50:41 +02:00
15a29bcb01
roll back search filter refactor for published list 2021-09-15 12:28:35 +02:00
eacd0c56a0
Merge branch 'main' into feature/account_page 2021-09-15 12:22:21 +02:00
Bogdan Fazakas
ddb9656270
remove chainId as a dependecy on sales and liquidity in own assets useEffect (#854) 2021-09-15 12:14:09 +02:00
claudiaHash
969ac96417
Add service filters download and compute to the existing filters (#817)
* filter tags added, filter functionality linked

* filter tag selection fix

* deselect filter fix, logs deleted

* use single filter function

* delete unused functions and logs

* &nbsp replaced
2021-09-14 18:18:15 +03:00
032606e61c
add total user liquidity, new Profile provider (#841)
* label renaming, add total user liquidity

* new useProfile provider

* centralize pool shares fetching

* add some assets fetching to profile provider

* move 3box profile fetching, check passed accountId

* cancel token fixes

* remove publisher on published assets list

* more cancel token fixes

* prevent asset name double fetching in pool shares

* prevent asset name double fetching in downloads

* prevent asset name double fetching in pool transactions

* more cancel token fixes

* refetch crash fix

* another pool shares refetch fix

* pool transactions data flow refactor

* Add total downloads, speed up downloads fetching (#849)

* add total downloads

* replace multiple retrieveDDO with one single request

* getAssetsFromDidList() helper

* fix mixed up timestamps

* data structure based on tokenOrders

* add logging

* add tooltip to downloads, small NumberUnit refactor

* safeguard against passed empty didList

* deal with plural/singular in labels
2021-09-13 16:39:32 +02:00
Norbi
421d5981e6
Fix issues consuming free assets (#834)
* get order history based on ddo chainId

* disabled consume when not connected to wallet, refetch orders on connect

* disable create price button if not assetNetwork

* get previous orders on order action
2021-09-13 16:14:43 +02:00
Norbi
e19c918ed5
Fix title out of bounds in asset teaser component (#850) 2021-09-13 12:40:51 +02:00
Bogdan Fazakas
5a336bd699
Fix Profile sold value (#840)
* update profile sold value logic

* remove commented block
2021-09-07 12:11:13 +02:00
c9f56e9a46
no loading spinner on refetch pool shares 2021-09-06 12:38:14 +02:00
852e71f17a
fix pool shares network switching, always refetch everything 2021-09-06 12:32:16 +02:00
f3c5812ef1
file reorg 2021-09-03 15:06:21 +02:00
4def756c8d
fix pool transactions setup title, kinda 2021-09-03 14:55:53 +02:00
6d7ca84056
published spacing tweaks, search filters renaming 2021-09-03 14:50:09 +02:00
fe065aea58
small PoolShares refactor 2021-09-02 19:35:49 +02:00
30f262de33
Merge branch 'main' into feature/account_page 2021-09-02 18:51:56 +02:00
mihaisc
b5afccbb49
Add symbol for fixed rate exchange (#835)
* add symbol for fre

* add symbol to fre

* update symbol in swap
2021-09-02 08:01:25 -07:00
65944d0861
more token query changes 2021-09-02 16:55:10 +02:00
1644b79cb2
fix pool transactions symbols for swap tx, kinda 2021-09-02 16:33:32 +02:00
7965b74302
Merge branch 'main' into feature/account_page 2021-09-01 16:18:41 +02:00
Norbi
4123dae431
fix ocean symbol on Polygon (#487)
* updated Price component

* fixed on Pool Shares

* fixed on Pool

* fixed on Trade

* removed hardcoded data

* temp fixes

* fixes for subgraph2

* fixed token symbol in price for pools

* remove console.log

* remove comment default symbol

* remove temp values

* add tokens to query

* add token symbol

* remove console.log

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2021-09-01 07:05:59 -07:00
b2bec2abe4
more getComputeJobs refactor
* move to compute utils
* abstract out more loops into separate methods
* fix results display
2021-09-01 16:03:52 +02:00
e3900e8326
more ComputeJobs refactor 2021-09-01 15:15:25 +02:00
e998dc777a
refactor that huge ComputeJobs index component 2021-09-01 15:01:39 +02:00
ed9930dfb3
refactor state, make use of existing Profile model 2021-09-01 14:30:55 +02:00
b30fcf0c4b
move Blockies into separate component 2021-09-01 14:07:28 +02:00
Bogdan Fazakas
f8ffcbac75
Account metadata header (#776)
* get all neded data for the header from 3box, aqua and subgraph

* fix tvl display error

* WIP metadata header styling

* added more styling for the header

* make page title optional so we can remove it on account page

* stroke change for svg images and default values

* more styling added to the header

* fixed linter

* added ocean balance to tvl

* update styling for statistcs

* fixed eror for go to my account from another account page

* updated styling for mobile use

* wip show more on explorer links and description

* properly display read more for explorer links and description

* replaced show more with 3box redirect on description

* change accounts default picture and check links length before display element

* use optional on links

* grid cleanup, new number unit, split up stats

* rename all the things, more profile header styling

* visual hierarchy, improve image loading experience

* layout flow & visual tweaks

* more description

* replaced account route  with profile when accesing a profile by the eth address

* use account id from url if exists when fetching data

* bump @oceanprotocol/art to v3.2.0

* styling, fallbacks, edge case fixes

* clean up Publisher atom, link to profile page

* fixed issue when switching to my profile from another profile

* output accountId, make it copyable, remove stats icons

* render tweaks, markup cleanup

* add 3box reference

* mobile tabs spacing tweaks

* text flow and spacing tweaks

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-09-01 13:56:34 +02:00
3112a10930
Merge branch 'main' into feature/account_page 2021-09-01 11:19:06 +02:00
b717219592
Add support for Gaia-X Testnet (#823)
* limit to gaia-x

* hack in nodeUri

* hack in gaia-x network metadata

* network metadata tweaks

* bump packages

* rollback most hacks

* update values

* bump ocean.js to v0.17.3

Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2021-08-31 16:56:48 +02:00
Norbi
3bf8be12e4
Fix Your Liquidity linked to wallet network (#825)
* get user pool tokens from subgraph

* fix errors

* replace consume price with spot price in liquidity calculations

* fix dependency error
2021-08-31 15:02:19 +02:00
Norbi
1f332c4148
Web3Feedback UI messages fix (#812)
* show isBalanceSufficient warning only on Use tab

* show warning icon when both isAssetNetwork and isGraphSynced are false

* refactor display messages code fix order and icon issues

* moved isBalanceSufficient message handle from Web3Feedback to ButtonBuy

* more refactoring, improve feedback message change

* fix isBalanceSufficient for buying a compute job

* fix lint error
2021-08-31 09:47:55 +02:00
Norbi
c6f4220f37
handle no dids usecase in query (#818) 2021-08-31 09:26:17 +02:00
Norbi
238fd2bbe3
reduce description length inside AssetTeaser (#815) 2021-08-27 11:58:54 +02:00
Norbi
864107b028
Trade tooltip message is wrong (#816)
* fixed tooltip message for more ocean tokens than tokens from balance

* message fix for max datatoken usecase
2021-08-27 11:58:44 +02:00
Bogdan Fazakas
69f02afd59 merge branch main into feature/account-page and fixed merge conflicts 2021-08-25 09:15:31 +03:00
Bogdan Fazakas
18badb7b17 allways display filters on published page 2021-08-24 16:55:32 +03:00
claudiaHash
9b0590384c
message changed for no network selected (#809) 2021-08-24 16:43:56 +03:00
Dimo Dzhurenov
bccb56a181
Update Number to Decimal (#653)
* update number to decimal

* Update FormTrade.tsx

* update Pool/index.tsx

* update Pool/utils.ts

* update FormAdd.tsx

* update bugs from switching to decimal

* fixed errors in Output.tsx

* rebase main

* Update FormTrade.tsx

* update Pool/index.tsx

* update Pool/utils.ts

* update FormAdd.tsx

* update bugs from switching to decimal

* fixed errors in Output.tsx

* remove duplication

* added missed conversion

* fix style error

* fixes

* added function return type

* add correct return type for function

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-08-24 10:11:01 +02:00
Bogdan Fazakas
d015279d94 display loading spinner on every fetch published assets call 2021-08-23 16:17:28 +03:00
a82ad003e2
fix fileinfo fetching without wallet connected (#803) 2021-08-23 12:15:13 +02:00
Bogdan Fazakas
54334bb6fd display filter only when necessary 2021-08-23 12:11:28 +03:00
claudiaHash
6e3a9bc8b6
Remove 'Forever' timeout on edit compute dataset (#795)
* add different options for compute asst timeout

* fix edit timeout options on dataset change
2021-08-20 18:05:06 +03:00
Bogdan Fazakas
3afdaa236f fixed lint error 2021-08-20 16:45:53 +03:00
Bogdan Fazakas
a36e32aa4b added sort for published assets 2021-08-20 16:30:38 +03:00
Jamie Hewitt
a545f723e9
Add custom provider to publish form (#707)
* Creating custom provider box selection

* adding provider to Form publish validation schema

* validating custom provider URL

* WIP validation for custom provider

* validating provider uri

* adding success/ error messages

* conditional rendering of custom provider input

* remove console.log

* fixing textFormData

* Publishing custom provider URI in DDO

* Adding serviceEndpoint to Debug

* removing pre-checked default provider

* Refactoring to reduce code duplication

* removing console.log messages

* update submit text

* update submit text

* Placing custom provider field behind Advanced Settings

* removing provider field

* updating placeholder provider

* style for advanced setting button

* refactoring customProvider

* remocing template literal

* fixing linting errors

* restricting advanced publishing settings through env var

* updating example env

* adding custom provider to formAlgoPublish

* refactoring to reduce duplication

* Reducing duplication

* updating types and initial values

* Removing Custom provider input from main algorithm form

* Removing concole.log

* Chaning customProvider to providerUri

* changing customProvider to providerUri

* advanceSettings to PascalCase

* Removing unused useOcean()

* Using useSiteMetadata() hook

* Adding allowAdvancedPublishSettings to query

* Adding temporary console.log(ocean)

* Removing console.log
2021-08-20 15:49:15 +03:00
claudiaHash
e703f9b03d
Display highest liquidity assets fix (#802)
* correct offset set, empty result for no network selected

* network-only policy used, logs deleted

* cache and network policy used

* Update src/components/pages/Home.tsx

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

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-08-19 17:25:51 +03:00
Norbi
e500772d21
Add price impact indicator to the trade component (#765)
* WIP

* calculate price impact by subtracting tokens fiat values

* get and use spotPrice for price impact calculation, use Decimal

* set impact to 0 if input and output values are undefined

* move price impact to a new component

* turn price impact value color to red if grater than 5

* add tooltip to price impact and slippage

* removed fiat price

* change formula

* remove console.log

* don't block add liquidity button

* typos

* proper text alignment

Co-authored-by: mihaisc <mihai@oceanprotocol.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-08-18 12:46:27 +03:00
claudiaHash
dc17aa0101
Remove 'Forever' timeout for compute data sets from publish form (#743)
* timeout value fix

* change timeout options by access type

* fix timeout field value setting

* string replaced by constant

* timeout value changed for no timeout set

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-08-17 13:25:06 +03:00
Jamie Hewitt
6c6a5e2109
Fixing metadata history (#794)
* Moving UqlProvider to Asset

* Using chainId from DDO

* typos

* new strategy for subgraph query

* code comments

* unused imports cleanup

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-08-17 12:46:51 +03:00
fd06afc9f8
fix checkIsConsumable dependencies (#788) 2021-08-16 13:02:01 +03:00
claudiaHash
f74c40b9cf
fix user's pool transactions history (#786) 2021-08-11 12:44:49 +03:00
Jamie Hewitt
34f7728399
Fixing more info button padding (#783) 2021-08-10 13:09:39 +03:00
Jamie Hewitt
f3e83fab7e
Fixing the link (#780) 2021-08-09 11:01:07 +02:00
Bogdan Fazakas
a456b55a32 fix lint error 2021-08-04 18:42:46 +03:00
Bogdan Fazakas
e998a989b5 fetch history published/shares/transactions/downloads using url account id and dynamic compute tab 2021-08-04 18:30:14 +03:00
Bogdan Fazakas
86a8c3b374 fixed import error for compute jobs 2021-08-04 15:55:27 +03:00
Bogdan Fazakas
cfd5b6558e merged branch main into feature/account_page 2021-08-04 15:35:25 +03:00
Norbi
c5eaaf8d45
Show compute jobs history in asset detail page (#735)
* displayed compute jobs on asset detail page

* filter compute jobs by datatoken address

* lint error fix

* changed query name for selecting compute orders by datatoken

* renamed Transactions component and moved it outside Pool directory

* style compose path fix

* query just one subgraph based on ddo chainId

* fixed displayed columns, added Finished column, table scroll fix

* changed AssetActionsHistoryTable titles

* made tabel cell width smaller
2021-08-04 15:26:03 +03:00
Bogdan Fazakas
261348f883 replace history page and route with account 2021-08-04 15:21:57 +03:00
Jamie Hewitt
46cf119afe
Author metadata update (#763)
* Adding content for update author

* Updating types

* Updating DDO

* Bumping ocean.js

* Making the author optional

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-08-03 17:07:51 +02:00
Jamie Hewitt
58781ff95f
Improve search queries (#755)
* refactoring search fields

* Searching without spaces

* Adapting nospace term to a prefix query

* Fixing algorithm/dataset filter

* filtering using match

* Removing addTypeFilterToQuery()

* Removing console log messages
2021-08-02 16:04:11 +02:00
Jamie Hewitt
60cac45e89
Adding fees to fixed pricing page (#758)
* Adding fess to fixed pricing page

* Adding tooltips to fixed price content

* Styling: Text align left

* create pricing styling updates

* remove console.log

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-08-02 12:18:46 +02:00
Jamie Hewitt
0a3ec01248
hiding error message (#757) 2021-07-30 15:54:32 +02:00
af3bb86073
publish form fixes (#768)
* fix publish form submit button

* directly use generateDatatokenName from ocean.js

* bump ocean.js to v0.17.0

* fix all the publish things

* wrap OceanProvider around publish page
* initiate Ocean from usePublish hook
2021-07-30 15:52:12 +02:00
Norbi
a7c1db215e
Fix broken explorer links for multinetwork (#761)
* external link get oceanConfing when undefined, use chainId for pools

* pass chainId to editHistory explorerLinks

* remove ddo check from Pool explorer link

* removed chainId verfication from datatoken external link path

* add Gaia-X chainId verification to pool datatoken external link

* add chainId check for Moonbeam
2021-07-28 15:51:26 +03:00
3cecfb44a0
pool transactions component splitup 2021-07-26 17:09:32 +02:00
605f77e055
get the providerUri for file validation based on user network
* closes #756
2021-07-26 16:49:45 +02:00
3a130c364b
cleanup 2021-07-26 15:53:21 +02:00
a7998abb99
Multinetwork UI additions (#729)
* add BSC to default chains

* searchbar visual tweaks

* race condition fix

* network name tweaks

* beta → v3

* use publish form titles to inform about network

* form actions refactor

* simplify network name on asset details

* visual indicator for selected chains on button

* lint fix

* more layout flow tinkering, collapsed search by default

* search field layout tweaks

* unknown network/gaia-x name fixes

* put back search cancel button in webkit

* space fixes

* cross browser visual fixes
2021-07-26 15:48:24 +02:00
claudiaHash
92e6ec633f
Adapt history data fetching for multi network (#686)
* multiple graphs queried

* multiple graphs queried


WIP

* fixes

* urql provider added

* urql used in downloads tab

* wip on downloads, pool shares and compute orders

* OperationContext added

* urql client query used

* added method for query multiple subgraphs

* get multiple subgraphs data

* aqua changes integrated

* published and poolTransaction tabs data correctly fetched

* poolTransaction symbol taken from Subgraph

* Downloads loading fixed, logs deleted

* compute history partial fix

* fetch data after deselecting network fix, logs deleted

* changes after Multinetwork branch merge

* ddo usage and config removed

* get out symbol fix, unused imports deleted

* loading data fix

* console log removed

* loading data with no wallet connected fix

* no wallet connected and empty result message updated

* NetworkName added on table

* explorer link fix for pool transactions

* NetworkName added in PoolTransactions table

* transactions and downloads sorted by timestamp

* pool shares and compute jobs sorted by timestamp

* use transaction network id for explorer link

* pool transactions refetch

* pool shares refetch

* stop re-displaying table data if no changes on refetch

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Norbert <katunanorbert@gmail.com>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2021-07-23 15:46:25 +03:00
37ea73d421
Merge branch 'main' into feature/multinetwork 2021-07-22 15:17:18 +02:00
4ec23c882f
WalletConnect updates (#749)
* bump @walletconnect/web3-provider to v1.5.0-rc.7

* bump web3 to v1.4.0

* proper wallet logout

* listen to chainChanged instead of networkChanged

* restores network switching for WalletConnect

* fix wallet switching

* get and set initial chainId

* walletconnect modal visual fixes
2021-07-22 15:16:15 +02:00
c25d1e9224
getQueryContext abstraction 2021-07-22 14:01:30 +02:00
ae988f083b
consolidate asset edit form actions 2021-07-22 13:51:44 +02:00
Norbi
7368c9cc68
Statistics footer (#746)
* display multiple chains statistics

* fetching stats data from multiple subgraphs

* design changes

* display one combined stat for all main networks

* tooltip updates

* added Loader component

* refactoring

* refactor for better fallback, remove loader

* tooltip styling and refactor

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-07-22 13:07:52 +02:00
Bogdan Fazakas
15b947bb3f
Check maximum datatoken to receive for pool priced assets in compute and consume (#627)
* check the maximum available datatoken to receive before buy compute or consume

* added previous order check in disable buy button logic when max dt in pool is bellow 1 datatoken

* fixed lint errors

* hide seccond message if one of the assets in compute has low liquidity
2021-07-22 13:04:55 +02:00
Bogdan Fazakas
fddd5ff144
Adapt subgraph url queries in pool tab for multinetwork (#740)
* updated pool history and pool liquidity graph queries

* fixed lint errors

* fixed graph issues

* refatch graph every 10s

* refetch liquidity info and fixed typo's

* cleared refetch intervals when unmounting pool and graph compoments on  assets detail page
2021-07-22 13:02:32 +02:00
mihaisc
22da62b231
Check graph sync status (#745)
* fix balance check after network switch

* error location

* remove console

* fix messages

* fixed sync status

* remove comment
2021-07-22 02:40:44 -07:00
Bogdan Fazakas
38a8358762
Restrict AssetSelection list to only show same network assets (#708)
* wip added check chainId check for asset selection list

* updated condition and update oceanJs lib

* update lock file

* removed config metadatacacheUri since it was not used anymore

* refactor get only chain algos from aqua

* manually added lock file from multinetwork branch
2021-07-20 08:58:45 +02:00
claudiaHash
117c3af5f1
Download ordered asset with forever timeout multiple times (#739)
* redownload ordered asset with forever timeout

* update check
2021-07-16 17:46:59 +03:00
645041a50a
Merge branch 'main' into feature/multinetwork 2021-07-15 17:27:11 +02:00
Bogdan Fazakas
5a6d267199
Highest liquidity correct assets order (#736)
* ordered subgraph did array before return

* updated aqua querry offset to fit multi network

* fixed typo and removed logs

* sort assets by oceanReserve

* added TVL label and rename Pool Creator Liquidity to Pool Creator Statistics

* remove obsolete comments

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-07-15 17:25:53 +02:00
Norbi
565c0324f9
Create wallet network switcher (#676)
* created component for wallet network switching

* component styling

* display network names

* created networks config

* fix get network config function

* wip

* moved switcher component inside consume

* use isAssetNetwork to show Switcher component, added to publish

* get network properties using networkList and oceanConfig

* error fix

* hide wallet network switcher if no provider

* use chainId from useAsset ddo

* added switcher component to Compute

* added component to edit metadata and compute settings

* added component to advance settings form

* fixed lint errors

* included component inside Web3Feedback

* updated text and icon design

* button design update, and Web3Feedback position on edit asset

* fixed lint error

* message update

* tag error fixes

* disabled pool and trade buttons if not asset network

* mainnet aquarius fallback url

* filename typo fix

* replace NetworkName component with getNetworkDisplayName function

* added method to switch to EthereumChain networks, removed logs

* fixed lint error

* style tweaks

* markup and styles simplification

* restrict add datatoken

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-07-15 17:03:03 +02:00
Norbi
de519f4969
Fix datasets algorithm is allowed to run on returning nothing (#738) 2021-07-15 16:46:14 +02:00
483ce88d42
another merge fix 2021-07-14 11:44:40 +02:00
fa278899ef
merge fix 2021-07-14 11:33:11 +02:00
08ee32f105
Merge branch 'main' into feature/multinetwork 2021-07-14 11:28:50 +02:00
claudiaHash
bb40ef3764
fix visual algo download error (#732) 2021-07-13 16:32:04 +03:00
7d4cb0e87c
fixes for unknown networks (#725)
* fixes for unknown networks

* hack in native token symbol
2021-07-13 16:22:19 +03:00
mihaisc
b9bd6a3a25
add fileinfo fetching (#697)
Signed-off-by: mihaisc <mihai@work.localdomain>

Co-authored-by: mihaisc <mihai@work.localdomain>
2021-07-12 15:56:23 +02:00
Bogdan Fazakas
3bca0e0b1c fixed highest liquidity number of assets 2021-07-12 11:45:23 +03:00
Bogdan Fazakas
1da3214599 fixed bookmark prices 2021-07-12 11:35:12 +03:00
Bogdan Fazakas
11b7146812 added back apollo typings until we can get all of them using graphql codegen 2021-07-09 11:36:43 +03:00
Bogdan Fazakas
d250da3eab update oceanJS to 0.16.4 replaced ddo type from any to DDO 2021-07-08 10:57:40 +03:00
Bogdan Fazakas
34ab37f592 fixed highest liquidity price, and prices for assets with pool and free asset 2021-07-08 01:07:12 +03:00
Bogdan Fazakas
4fbac1e2e0 merged multinetwork into poc-urql 2021-07-07 11:08:39 +03:00
Norbert
fa4c3a10ee Merge branch 'main' into feature/multinetwork 2021-07-07 10:09:28 +03:00
Norbi
4e0bc09f8c
Adapt Aquarius queries to chainId (#667)
* wip

* get latest assets from multiple networks

* updated queryMetadata function in components

* added new multinetwork aquarius api

* Use ddo chainId for AssetType inside teaser

* added chainId filter to queries from home page

* put chainId query string in parenthesis

* search filter by chainIds

* updated getDoo and getAssetName functions

* removed logs and fixed lint errors

* updated get published assets query

* adapted bookmarks aquarius call to multinetwork

* removed temporary ddo

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-07-07 09:45:20 +03:00
mihaisc
3798d80a4d
Global search bar (#690)
* move search bar

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

* update search bar

Signed-off-by: mihaisc <mihai@oceanprotocol.com>

* add enter event

Signed-off-by: mihaisc <mihai@oceanprotocol.com>

* fix lint

* small button fixes

* add padding, change media width to rem

* remove comments
2021-07-06 04:55:10 -07:00
Kris Liew
675da0836f
bump ocean.js v0.16.2, ocean.assets.isConsumable implementation to disable buy button and display relevant message (#463)
* Implement ocean.assets.isConsumable

* Fix accountId from useWeb3() returning lower case on switching metamask account (allow/deny list)

* Update Ocean.js version v0.16.2 and package-lock.json

* Fix datePublished error on validate-remote

Co-authored-by: KIANLAU <kian_yee.lau@daimler.com>
Co-authored-by: Kris (SJ) <39853992+soonjing@users.noreply.github.com>
2021-07-06 14:51:37 +08:00
Bogdan Fazakas
8d50eb92c0 merged multinetwork into poc-urql 2021-07-05 14:27:43 +03:00
Norbert
60addda1cc Merge branch 'main' into feature/multinetwork 2021-07-02 13:48:26 +03:00
Bogdan Fazakas
c6c502188a
Merge pull request #517 from oceanprotocol/issue510-match-providers-algo-dataset
Match dataset providers with private algorithms providers
2021-07-02 13:22:29 +03:00
Bogdan Fazakas
5de2a6e330 remove apollo typings and generate schema using urql 2021-07-02 09:44:24 +03:00
Norbi
14f2f2a747 Merge branch 'main' into feature/multinetwork 2021-07-01 14:44:21 +03:00
Kris Liew
1c4ba145bb
Edit Advance Settings (updateMetadata() v3 workaround solution for free pricing) (#692)
* v3 update metadata workaround
2021-07-01 14:52:10 +08:00
da23e9f3a0
bump ocean.js, support more networks (#701)
* bump ocean.js

* fix frontpage empty views

* package-lock fix

* hook dependencies are fun

* bump ocean.js

* network tweaks

* add more chains to user preferences
2021-06-30 10:32:09 +03:00
Bogdan Fazakas
1ceb0f6158 fixed lint errors 2021-06-29 09:37:12 +03:00
Bogdan Fazakas
127d31d729 fixed issues after merge of main branch 2021-06-29 09:20:35 +03:00
Bogdan Fazakas
b0356f559c Merge branch 'main' into issue510-match-providers-algo-dataset 2021-06-29 00:08:45 +03:00
Norbi
c81a986261
Fix refetch data token orders (#700)
* refetch token orders inside getJobs

* removed logs

* don't use Time component for Finished column if date is undefined

* removed logs

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-28 12:47:56 +03:00
6f1abcbb1e
output MarketStats again 2021-06-25 10:48:48 +02:00
Norbi
31ee1aab98
Pool statistics graph shows two sets of data when switching tabs (#696)
* removed compose previous data with new data

* removed unused states

* fix refetch multiple times for same block number

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-25 10:34:39 +02:00
Bogdan Fazakas
5e45fff361 wip replace apollo with urql 2021-06-22 08:52:49 +03:00
mihaisc
04d505da42
remove fileInfo check, cleanup (#689)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-16 18:49:40 +02:00
Kris Liew
e02babf2c2
[EPIC] Free Pricing (#681)
* Free Pricing Option at create Pricing (#621)

* Free Pricing Option + env var toggle

* Create Pricing step msg

* Default 'allowFreePricing' to true temp for review

* Fix price 0 on free tab

* Attempt fix useSiteMetadata

* Fix linting

* Feature/free price support consume compute (#654)

* Update fetch free price

* Feedback change UI remove 0's

* update button msg && fix

* compute algorithm list show 'Free' instead of '0'

* updateMetadata() v3 workaround solution for free pricing (#677)

* compute algorithm list show 'Free' instead of '0'

* workaround editMetaData free price

* utils function for compute & download

* `allowFreePricing` default to false
2021-06-16 09:32:11 +08:00
claudiaHash
eb8c6afb62
Search issues fix (#641)
* search by addresses

* search by asset id

* logs deleted

* search query updated

* search query updated

* search terms differentiated

* asset id hack

* id search hack removed

* restore lock file

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

* remove SearchQuery return type

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

* refine query, add relevance sort

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

* remove old comments

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

* remove white spaces from search term endings

* fix filter by type

* wip on filter with empty search text

* sort by relevance fix

* linting errors fix

* lint fixes

* comment sort by relevance

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

* lint

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

* search by owner and tags fix

* lint  err fix

* fix search

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

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-15 16:46:49 +03:00
Norbi
6ed92c0bfd
covert timeout before display (#682)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-15 14:30:01 +03:00
a017ad219d
move network metadata into a hook 2021-06-14 20:04:44 +02:00
63bfe43c5b
merge fix 2021-06-14 15:34:21 +02:00
30174e1a84
Merge branch 'main' into feature/multinetwork 2021-06-14 15:17:33 +02:00
Norbi
88c94f6ce9
Fix buy asset button (#537)
* fixed button turning to Download on unsuccessful buy

* removed console.log

* fixed multiple error message displayed bug

* return if error on buying datatoken

* verify orderId value

* added try catch block for asset.order in consume hook

* added checkPreviousOrders also when compute ends with error

* bumped oceanjs lib to 0.15.0

* fixed lint errors

* show loading while consume

* fixed wrong timeout validation

* updated package-lock from main

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
2021-06-14 15:13:10 +02:00
2f4f53ae2a
Menu refactor (#672)
* layout flow and space saving tinkering

* different tactic

* different minimal network name

* next layout flow iteration

* move chains preference into its own action

* mobile view tweaks

* more network icons

* fix and clean up ocean token metadata

* refactor and clean up Chains component

* naming cleanup
2021-06-14 15:05:16 +02:00
Norbi
3a4851132d
Show the list of data sets an algorithm is allowed to run on (#579)
* WIP

* UI changes

* get and display datasets on both compute and consume

* new component for datasets that algorithm can run compute job on

* AssetSelection className refactor

* added internal link to AssetSelection

* show loading page when changing asset

* Component and asset title UI update

* created new component for dataset list

* removed unnecessary changes

* updated link margin

* prettier fix

* merge fix

* another fix

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-06-14 14:37:03 +02:00
Bogdan Fazakas
e8033687fb
Put back in place removed docker hub image check (#642)
* Put back removed docker hub image check using proxy

* fixed lint errors

* update scroll so  in case of docker image validation error the input fields are in viewport
2021-06-14 14:10:12 +02:00
Kris Liew
4fc5862654
Edit Advance Settings form for Edit Credentials & edit isOrderDisabled Flag (#655)
* #638 Initial design

* #638 fix import and get value from env file

* #638 Fix UI

* #638 Improved UI

* #638 Add deny credential and isOrderDisabled

* UI update

* Fix lint

* Attempt fix issue

* Revert "Attempt fix issue"

This reverts commit e3d916fe61.

* Extract default credential type

* Fix complexity issue

* Fix complexity issue

* Fix typo error

* Enhance UI

* Enhance Credentials Component UI

* Reduce duplication

* Revert "Reduce duplication"

This reverts commit e3bf6b4a2a.

Co-authored-by: KY Lau <kian_yee.lau@daimler.com>
2021-06-14 15:47:31 +08:00
Norbi
064bb2fd69
Change bookmarks and migration (#675)
* changed bookmark structure to list of dids

* fixed add, remove bookmark

* wip

* fixed type error and migration

* remove logs

* fix lint error

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-11 16:01:44 +03:00
f9f3768f5f
fix most remaining typing errors 2021-06-11 11:23:24 +02:00
b8930cc738
Merge branch 'main' into feature/multinetwork 2021-06-11 11:14:43 +02:00
Jamie Hewitt
e26ed0e81a
Issue 582 market rbac integration (#597)
* adding env for RBAC server url to app.config.js

* creating util function for requesting auth from the rbac server

* fixing typing error

* testing rbac request on homepage

* removing console logs

* importing RBAC url from config file

* creating develpment .env file

* return true if no rbac url env is set

* creating permissions parent component

* wrapping homepage content in permission element

* wrapping publish in permissions wrapper

* wrapping search results in permissions wrapper

* wrapping asset actions in permissions element

* creating an error alert for permission denied

* updating react hook dependency

* passing address to rbac component

* sedning address to RBAC server

* wrapping asset in permission component

* removing unused import of Permission component

* sending request based on address

* chaning default permission case to restrict access

* updating eventType as consume

* Adding loader icon while waiting form permission response

* only sending request to RBAC if address is defined

* adding wallet connection info message

* changing the env name and checking for undefined

* updating .env.development

* Check for undefined RBAC_URL in permissions component

* removing .env.development and updating .env.example

* updating .env.example comment

* switching alert messages and reducing return statements

* removing console.log message

* fixing linting issue

* Revert "fixing linting issue"

This reverts commit 8bcb80be3d.

* Fixing linting errors

* pull from origin main

* Revert "pull from origin main"

This reverts commit 9535e41a5f.
2021-06-10 12:06:26 +03:00
claudiaHash
b1d8a77895
Update file metadata from provider (#631)
* get file metadata from provider

* get file metadata without a wallet connected

* unused import deleted

* get file metadata from provider


get file metadata without a wallet connected


unused import deleted

* loader added

* lint fix

* loaded added on file icon

* fileMetadata empty object init

* lint error fixed, deleted unused imports

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-06-10 11:39:24 +03:00
4df84b8b14
split up network list into main & test networks 2021-06-09 19:41:12 +02:00
9943dae93c
full width menu bar 2021-06-09 19:40:43 +02:00
270f567879
move Graph sync status to asset details only 2021-06-09 13:16:55 +02:00
2d16841967
move main app warning 2021-06-09 12:49:00 +02:00
ef218a9d9e
chainId switching mechanism 2021-06-09 11:45:36 +02:00
claudiaHash
f5e01d7c0c
Display compute jobs history tab for a successful job (#652)
* selected tab added

* preselect and display compute jobs history

* defaultIndex prop used

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-06-08 14:35:06 +03:00
f0b040c5cb
Merge branch 'main' into feature/multinetwork 2021-06-08 10:48:10 +02:00
Norbi
f759757a1d
Fix assets in purgatory not displayed (#646)
* don't show loading component if pageTitle is an empty string

* fix lint errors

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-07 12:36:44 +03:00
796fc6be81
get all screens to render again 2021-06-04 15:53:34 +02:00
fa5c2ed684
refactor new frontpage queries 2021-06-04 15:28:27 +02:00
21792e9d4f
move OceanProvider to asset route 2021-06-04 15:13:47 +02:00
3332249928
refactor and tinkering 2021-06-04 15:06:24 +02:00
6bc37b9b7b
remove NetworkBanner 2021-06-04 15:01:25 +02:00
9d7486d626
prototype network feedback based on asset network checks 2021-06-04 15:01:22 +02:00
fa682dad1e
show network at all times in wallet component 2021-06-04 15:00:33 +02:00
10b29c6e37
unify network names, more icons 2021-06-04 15:00:33 +02:00
476147f65a
add network icon components 2021-06-04 15:00:32 +02:00
fc6f611ac0
Merge pull request #617 from oceanprotocol/feature/package-updates
Bump all non-gatsby dependencies / npm v7
2021-06-04 14:34:09 +02:00
claudiaHash
f73191ef1a
Remove price.isConsumable from elastic query (#639)
* price.isConsumable removed from query
* subgraph query updated

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-06-04 13:23:18 +02:00
ece07927f6
more package updates 2021-06-04 11:51:13 +02:00
53639e6839
disable storybook test runs for now 2021-06-04 11:43:51 +02:00
b516e95879
prettier formatting updates 2021-06-04 11:43:47 +02:00
feed5dd2d1
react-markdown code updates 2021-06-04 11:42:33 +02:00
claudiaHash
88663d812a
Highest liquidity list based on subgraph (#512)
* fetch pools from graph, fetch ddos for pools

* WIP on displaying highest liquidity assets

* loader added

* check ddo state for each asset

* data ordered  by valueLocked, logger added

* filter ddos for purgatory

* verify  ddo isConsumable price attribute

* moved query into subgraph.ts

* send did list, fix assets display

* fixes on assets display

* assets sorted by dids

* get assets on correct order

* get assets in correct order

* loading assets fixes

* correct order and loading, network overloaded

* fixes on loading

* fixed on network change, added loading

* fixed on network change when no wallet connected, improved loading

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-02 12:14:54 +03:00
94139f42b4
fix marketFeeAddress (#633)
* fix marketFeeAddress

* UseSiteMetadata typing fixes
2021-05-31 12:53:37 +02:00
Dimo Dzhurenov
29b644f402
updated parameter (#635) 2021-05-31 12:52:14 +02:00
Norbi
cd8e388806
fixed app crash (#629)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-27 16:39:02 +02:00
Norbi
18f3daed75
List of algorithms to select seems capped (#618)
* removed paginations from the algorithms query and set offset

* changed offset to 500 for compute algorithms query

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-26 16:16:46 +02:00
claudiaHash
5428a8e5b4
searching by full token symbol (#564)
* searching by full token symbol


regular expression used

* search by full names


match partial data


useless comments deleted


log deleted

* make search text uppercase

* data author and description added in query fields

* working search combined with sorting and filtering

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-25 11:23:48 +03:00
claudiaHash
f7cf804ba5
Filter buttons bugs fix (#614)
* buttons selection and deselection fix

* style fixes

* hide button fix

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-20 11:50:52 +03:00
Norbi
56169b9887
show page details after receiving the title (#612)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-20 11:00:50 +03:00
Norbi
9ce9fc84c7
Display fiat value inside pool statistics (#610)
* fixed

* replaced ddo.price with price from useAsset

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-19 14:14:06 +02:00
Norbi
cb8243f4cc
fix assets from mainnet displayed on rinkeby inside the home page (#607)
* get assets after web3Loading is over

* set web3Loading as false when not connected to wallet

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-19 11:31:23 +03:00
Dimo Dzhurenov
4a28907fe3
Fix edge case calculation errors in remove liquidity screen (#586)
* switched to toFixed instead of toPrecision

* add round down parameter toFixed

* removed console log

* added toExpPos

* set decimal precision

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

* slice price

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

* slice price

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

* slice ocean and dt amount

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

* add logs

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

* switch to decimal

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-05-18 10:32:19 +02:00
Bogdan Fazakas
7cc6b9b95b Merge branch 'main' into fix/issue583-start-second-job 2021-05-17 17:24:07 +03:00
Bogdan Fazakas
e620ee2a47 Merge branch 'main' into fix/issue583-start-second-job 2021-05-17 17:13:13 +03:00
Jamie Hewitt
d887675f82
Add datatoken to wallet for metamask users (#574)
* upgrading to ocean.js 0.14.6

* saving initial changes

* creating seperate component for adding tokens

* showing datatoken name

* adding button for metamask users

* using substring as datatoken symbol

* removing duplicated code

* removing empty div element

* removing unneccessary div element

* no longer sending the whole DDO

* refactoring add token functions

* updating function name

* no longer sending the whole ddo to the addDataToken component

* removing DDO import

* small refactor, get web3 provider info in useWeb3

* general AddToken component

* cleanup

* cleanup, remove symbol shortening

* copy, layout tweaks

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-17 16:12:22 +02:00
Norbi
65194696d3
Handle asset price in teaser (#596)
* used price from subgraph for asset teasers

* moved loading component inside AssetList

* replaced any with proper types inside subgraph utils

* fixed loading component displayed when empty assets or prices list

* show loading component when refetching data on sort and filter

* get each asset price before displaying the component, loading changes

* refactoring functions for getting asset prices

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-17 17:08:15 +03:00
Norbi
c2d03f94ac
Refetch compute status (#558)
* WIP

* use interval to refetch every minute

* fixes

* get jobs after verifications

* refetch jobs on button click

* fix loading when no jobs, hide refresh button then no jobs

* button UI changes

* styling updates

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-17 16:04:17 +02:00
Norbi
f0ed9f68cb
Add new custom form field for single value selection (#504)
* created BoxSelection component

* wip

* design changes

* integrate with form

* refactoring

* used inside appearance component

* WIP, added space between options

* adde new fields to BoxSelection used for chain selection

* fixed errors

* removed access type option from publish.json

* updated component for chain selection

* updated for compute type on publish dataset

* added component to dockerImageOpions

* removed Dotdotdot component from options

* remove space

* styling updates, fix React warning for terms checkbox

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-17 15:32:01 +02:00
claudiaHash
82acbba5ce
Remove price from queries (#600)
* subgraph query added

* return ddo list

* price queries removed from sorting and filtering

* subgraph query added


return ddo list


price queries removed from sorting and filtering

* subgraph query removed

* removed unused subgraph query

* undo subgraph fetchData change

* linting errors fixed

* files renamed, priceType removed

* removed unused imports and vars

* removed all price filter variables

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-17 16:14:40 +03:00
Bogdan Fazakas
065419f739 Merge branch 'main' into fix/issue497-fetch-price-subgraph 2021-05-13 13:47:04 +03:00
Bogdan Fazakas
3670993fd7 Merge branch 'main' into fix/issue497-fetch-price-subgraph 2021-05-11 11:41:19 +03:00
Norbi
574e4a02f1
used price from useAsset instead of ddo (#590)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-11 11:33:05 +03:00
Bogdan Fazakas
ff1d987b5d Merge branch 'main' into fix/issue497-fetch-price-subgraph, fixed merge conflicts 2021-05-10 16:27:32 +03:00
Bogdan Fazakas
a103240592 Merge branch 'main' into fix/issue583-start-second-job 2021-05-10 15:39:01 +03:00
Bogdan Fazakas
fadffb5d87 added no cache fetch policy on appolo request and removed debug logs 2021-05-10 15:35:49 +03:00
Jamie Hewitt
f5da6e4b0b
Issue 560 empty search (#561)
* upgrading to ocean.js 0.14.6

* Empty search gives all results

* Using ocean.js 13.0

* onBlur empty search when deleting text

* making empty search automatic on change

* removing console log messages

* including the search bar on results page

* keeping searchbox visible after an empty search

* refactoring If statement
2021-05-10 12:38:24 +03:00
Bogdan Fazakas
e73d140012 trigger check previous order after starting a compute job 2021-05-07 16:00:40 +03:00
claudiaHash
96a32242fd
hide Web3Feedback for private algorithms (#587)
* hide Web3Feedback for private algorithms

* correct private algo check

* remove redundant check

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-07 10:53:26 +03:00
Dimo Dzhurenov
49cd032274
using BigNumber instead of Number (#570)
* using BigNumber instead of Number

* remove wrong calculation of ocean ammount

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

* remove calculateAmountOfOceansRemoved

* using decimal.js for remove

* bump to ocean.js v0.14.8

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-04 14:56:47 +02:00
Jamie Hewitt
0a739cbe93
Support for Moonbase Alpha (#552)
* upgrading to ocean.js 0.14.6

* proper ocean.js update

* make all explorer links work

* handle new moonbeamalpha config

* add moonbase alpha to chain user preferences

* more ocean.js v0.14 updates

* switch to grid

* upgrading ocean.js to 0.14.7

* lock to @oceanprotocol/contracts v0.5.16

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-29 14:48:57 +02:00
5228010575
temporarily disable custom Docker image check
* closes #565
2021-04-28 20:16:03 +02:00
3319cf844d
mention compute restrictions throughout UI (#568)
* mention compute restrictions in publish forms

* copy

* results storage info
2021-04-28 19:59:56 +02:00
04ef9daf9f
fix compute settings showing up on algos 2021-04-28 19:42:35 +02:00
2587c4d4b9
set ComputeOutput 2021-04-28 17:07:14 +02:00
Bogdan Fazakas
6c3cf1f121
Fix/AssetSelection: Algo symbol & DID & Total price issues when no wallet connected (#559)
* fixed total price calculation issues

* fixed algoSymbol and Did dissappear in Safari
2021-04-28 14:23:44 +02:00
0ea01ac932
switch button copy for publish success 2021-04-28 12:47:12 +02:00
8453a07e36
another MetaMain visual tweak 2021-04-26 16:40:51 +02:00
claudiaHash
c0157dff21
Add datatoken to algo publish form (#531)
* datatoken added to algo publish form

* init datatoken option with non empty values

* remove hacks

* use nonempty data token initial values

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-26 13:43:58 +02:00
b89fcc99da
Merge branch 'main' into feature/compute 2021-04-23 15:46:50 +02:00
Bogdan Fazakas
369b075aa9
fixed compute algorithm pool price value (#553) 2021-04-23 15:44:31 +02:00
c89b5995d4
more reliable isOwner check (#547) 2021-04-22 16:29:40 +02:00
1f9f22cbc1
merge fix 2021-04-22 13:18:23 +02:00
df643e1fd8
merge fixes 2021-04-22 13:11:34 +02:00
14e4cc3f68
Merge branch 'main' into feature/compute 2021-04-22 13:03:08 +02:00
Norbi
cf44ab7f51
Feature/allow changing of fixed rate price (#399)
* added price field to edit metadata form

* use method for updating price

* get exchangeId for setRate function

* setRate method update

* misc fixes

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

* revert price

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

* get correct exchange id

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

* add price to MetadataEditForm interface

* fixed lint error

* disable update price on assets with dynamic price

* display price input only on fixed price

* price input changes

* fixed price input displayed when no price is set

* review fixes

* fixes

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-04-22 12:55:11 +02:00
Bogdan Fazakas
fa6554a23f
fix for terms state (#545) 2021-04-22 12:37:43 +02:00
mihaisc
e4803fda9e
fix price value (#544)
* fix price value

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

* proper price

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-21 18:03:13 +03:00
Dimo Dzhurenov
e21780530a Merge branch 'fix/490' into main 2021-04-21 17:31:07 +03:00
Jamie Hewitt
a20d6d82f0 Fixing issue with Toast message appearing twice 2021-04-21 16:23:50 +03:00
Bogdan Fazakas
d73b921a48 merged compute into issue497-fetch-price-subgraph 2021-04-21 13:09:03 +03:00
Bogdan Fazakas
4aae5fe6c1 removed price querry from compute 2021-04-21 13:00:30 +03:00
mihaisc
06fa195bd8
dont search for prev orders on order
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-20 19:30:16 +03:00
621aea64b5
metadata display tweaks
* new lock icon for private algos
* visual updates for asset details
2021-04-20 14:07:23 +02:00
mihaisc
1639a3e6ce
ignore old providers (#535)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-16 15:57:31 +03:00
Norbi
1da7eae35a
fix (#534)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-04-16 14:26:24 +02:00
Bogdan Fazakas
749b5d1f8d
check also DT for total pice calculation and amount to spend display (#533) 2021-04-16 14:25:35 +02:00
mihaisc
545be24429
fix compute history duplication (#530)
* check provider compute address

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

* remove console

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

* lock file

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

* lib update, lock file fix

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-16 15:23:09 +03:00
93ca8e3879
Job details (#528)
* refactor

* refactor job details

* styling, cleanup, get algo name

* output dataset & algo dt symbol

* more styling and job metadata output

* history background tweak

* human numbers, edge case fixes
2021-04-16 11:12:53 +03:00
Dimo Dzhurenov
ab6578e982 change function position 2021-04-15 18:26:31 +03:00
Dimo Dzhurenov
16254fd59b update the file info UI after URL re-add 2021-04-15 18:26:31 +03:00
55b09220b4
Merge branch 'main' into feature/compute 2021-04-15 14:55:11 +02:00
claudiaHash
49caca234d
filter ordered assets by service type (#515)
* filter ordered assets by service type

* filter dids fetched

* loader added

* show loader fix

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-04-15 14:54:41 +02:00
4a83732255
Merge branch 'main' into feature/compute 2021-04-15 13:50:07 +02:00
a8aebf2fac
set isConsumable to true by default (#523)
* set isConsumable to true by default

* kick out dtUtils, cleanup

* cleanup

* tweak AssetTeaser price check
2021-04-15 13:47:32 +02:00
a78988be67
Merge branch 'main' into feature/compute 2021-04-15 11:21:46 +02:00
Bogdan Fazakas
8586f0c77b
do not check prev orders when order compute algo in ocean lib (#516) 2021-04-15 12:00:22 +03:00
Jamie Hewitt
2826df8287
Allowing urls without proceeding http or https (#493)
* allowing urls without proceeding http or https

* Installing package: valid-url-utf8

* removing pre-submit URL validation

* removing new package

* updating package-lock.json
2021-04-15 11:18:48 +03:00
Bogdan Fazakas
0d1534db70 check ddo provider for assets in edit compute 2021-04-15 10:55:58 +03:00
Bogdan Fazakas
1beb33d3e1 check ddo provider for algo list in start compute 2021-04-14 20:11:29 +03:00
fff5699c67
Merge branch 'main' into feature/compute 2021-04-14 15:31:36 +02:00
Jamie Hewitt
0383186660
chaning pink buttons back to grey (#507)
* chaning pink buttons back to grey

* pull from origin main

* using grey-light for button styling

* adding primary style to 'Add File' button
2021-04-14 14:10:03 +02:00
Jamie Hewitt
7c09ceca06
Issue 366/dataset publish ux (#461)
* changing the info text for dataset input

* Updating error message for invalid dataset input

* chaning button styling to make it look more like a button

* fixing package-lock.json issue

* removing changes from package-lock.json

* adding onBlur event to validate the data input

* Removing autoclose on error message

* adding success message when the dataset is valid
2021-04-14 13:24:07 +03:00
Bogdan Fazakas
d52d644850 merged compute into subgraph-util-methods 2021-04-14 12:08:30 +03:00
claudiaHash
fc6b029118
Compute job history (#462)
* get compute orders query

* wip on getting compute jobs

* wip refcatoring

* get compute history refactored

* small refactor

* loop fixes

* display jobs refactor changes

* display jobs fix

* early output of assets

* query tweak

* quick fix

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

* live update for testing

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

* fix load time

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

* temp refactor

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

* cleanup

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

* lib bump

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

* fix status args

* remove metadata json

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

* fix item duplication

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

* check if wallet connected

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

* debug logs

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

* lib bump

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

* fix service grouping

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

* added sorting

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

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-14 12:01:37 +03:00
Bogdan Fazakas
b87d50aa09
Refactor compute methods calls (#502)
* prepare compute for oceanJs method refactor

* bump oceanjs to 0.14.0
2021-04-14 10:21:59 +03:00
Bogdan Fazakas
56554028b8 merged compute into subgraph-util-methods 2021-04-13 19:21:05 +03:00
fa53b024fa
wallet reconnect button fix 2021-04-13 17:02:40 +02:00
faa6a8329a
Merge branch 'main' into feature/compute 2021-04-13 15:14:59 +02:00
Jamie Hewitt
7672d78aee
Refactoring Market for new Ocean.js build (#481)
* removing imports from utils folder

* lib bump

* update status args

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-13 15:13:55 +02:00
Dimo Dzhurenov
b2f6e541a3
remove tooltip animation (#494) 2021-04-13 13:58:32 +02:00
Norbi
b8247c7ef4
The Graph sync status (#466)
* WIP

* query update

* quick fix

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

* get blocks number when no provider, added threshold

* format code

* naming fix

* show graph out of sync message inside announcement banner

* added loader

* moved sync component

* refactor all the things

* new atoms/AnnouncementBanner : banner component reduced to presentation only, where its content is always passed as props

* revised molecules/NetworkBanner: the former AnnouncementBanner now holds all the specific network detection logic, in the end also returns the atoms/AnnouncementBanner

* new hook hooks/useGraphSyncStatus: move all the graph fetching logic in there so we can use its status in multiple places in the app without all this props passing. This also decouples the SyncStatus component in footer from its logic

* in App.tsx, add the graph sync warning banner in another atoms/AnnouncementBanner, getting its values from the hook

* data flow refactor

* .env.example tweak

* race condition fighting

* subgraph loading

* polygon fallback fix

* no interval fetching

* turn around logic for adding infura ID

* removed graphNotSynched

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-13 10:57:59 +02:00
Bogdan Fazakas
a27bc6718a update get prev order method & small typo 2021-04-12 17:09:41 +03:00
Bogdan Fazakas
a92a7b88d9 merged compute into subgraph-util-methods 2021-04-11 02:15:24 +03:00
Bogdan Fazakas
c533d1ee0c get compute previous orders from subgraph util 2021-04-11 02:13:43 +03:00
Bogdan Fazakas
ab71ba187f
remove status and text status check on start job (#489) 2021-04-10 11:34:08 +02:00
118bfb93a9
Merge branch 'main' into feature/compute 2021-04-09 10:19:56 +02:00
8511a3b165
showPricing check change (#485) 2021-04-09 11:10:39 +03:00
claudiaHash
ab01615ab3
show assets ordered by creation time (#486) 2021-04-08 21:09:17 +02:00
claudiaHash
ccfb381d9d
Feature/issue474 algorithms timeout (#483)
* timeout added for algorithm publish

* publish algorithm fixes

* set termsAndConditions fix

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-04-08 19:01:00 +02:00
Bogdan Fazakas
1d13000772
Help messages & price display for starting compute job (#478)
* add dataset, algo and total price to form footer

* styled price component on start compute

* fix lint issues

* added help messages for compute jobs in BuyButton

* consume button text alignment fix

* help text copy changes

* styles cleanup

* use graph price on dataset display, remove buy compute timeout text

* minimal total price output

* spacing, copy

* more spacing & copy

* calculation output, timeout output

* price output refactor

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-08 17:10:51 +02:00
ffca6f1bd6
AssetSelection: add search by datatoken symbol (#482)
* add search by datatoken symbol

* case insensitive search for everything
2021-04-08 10:16:45 +02:00
Bogdan Fazakas
07bad6ead9
fix get algo asset querry (#476) 2021-04-06 09:49:50 +02:00
claudiaHash
36084fbc1f
output datatoken symbol for each asset in asset selection (#477)
Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-04-06 09:49:16 +02:00
mihaisc
c09bc3342a
fix warning (#475)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-01 19:27:02 +03:00