1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-11-16 02:04:54 +01:00
Commit Graph

1114 Commits

Author SHA1 Message Date
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
992c8ac33c
change IPFS gateway for loading image 2021-09-02 13:35:06 +02:00
6e0902f5d3
typings & typos 2021-09-01 17:52:17 +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
Moritz Kirstein
9b94ed9f6d
change initial price type based on config (#821) 2021-08-31 01:22:42 -07: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
e2bb8fc042
Display the same string for timeout set to '1 month' (#798)
* same string displayed for 1 month

* existing function updated and used
2021-08-16 11:44:09 +03:00
Kris Liew
d0b1534d10
Remove OR operator in case statement (#785) 2021-08-11 12:45:05 +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
209dd379dc
switch over to app config metadataCacheUri 2021-07-26 16:59:17 +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
e06b6af56f
add Polygon Mumbai as supported chainId 2021-07-12 14:42:46 +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
339b4238e6 merged multinetwork into poc-urql 2021-07-08 10:42:03 +03:00
Norbert
89e683d840 Merge branch 'main' into feature/multinetwork 2021-07-08 10:21:04 +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
mihaisc
ae26afccfb
fetch by chainId instead of networkId (#717) 2021-07-07 06:52:56 -07:00
mihaisc
bea4f46c9a
posible fix (#715) 2021-07-07 06:01:08 -07: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
3fe133e55f remove not used scripts 2021-07-06 01:21:35 +03:00
Bogdan Fazakas
04b89ddd35 replaced introspection generation with graphql codegen 2021-07-06 01:09:51 +03: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