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

92 Commits

Author SHA1 Message Date
mihaisc
cef0969065
Refactor aquarius calls (#917)
* aquarius refactor

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

* fix highest liquidity

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

* fix

* update search

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

* remove test code

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

* remove logs&unused dep

* remove old types

* fix bookmarks

* fix downloaded assets

* fix published list

* fix profile

* fix compute history

* fix compute

* fix edit compute

* remove old commented code
2021-10-21 10:24:00 +03:00
claudiaHash
e993114f51
Replace profile sold statistic value number with subgraph value (#926)
* replace sold number with subgraph value

* remove unused function
2021-10-18 15:43:32 +01:00
Moritz Kirstein
46a16a3043
GDPR Compliance (#796)
* add cookie utils

* add gdpr metadata for ppc

* add graphql typeDefs for GDPR metadata

* add ppc variable to app config

* add ppc user preference

* add switch component

* add ppc components

* add cookie consent provider

* add consent provider to wrapRootElement

* add ppc to app component

* add cookie button to footer component

* add ppc to site metadata query

* add styles for buttons in footer

* add switch component unit tests

* renewed siteMetadata json for testing

* add gdpr metadata for testing

* add cookie module unit test

* add cookie module tests

* add customizable format to time component

* add english privacy policy

* add privacy policy slugs to user preferences and appConfig

* add privacy policy components

* add autolink for policy md navigation

* only show language select for multiple policies

* add gatsby policy page creation

* use new privacy slug user preference

* add to top button styling for markdown pages

* add policies for de, es & fr

* add pointer events to toTop buttons css

* add privacy policy basic unit test

* outsource scroll button component

* import cleanup

* add customizable delay for debounce

* add scroll button unit tests

* add disclaimer component

* add disclaimer fields as optional fields in PublishJsonData

* add acces type disclaimer

* adjusted help for desc and author fields

* add disclaimer unit tests

* minor adjustment to test

* add print button to history page

* naming changes for better readability

* add cookies hash to policies

* ppc disabled per default

* fix react unknown prop for disclaimer

* minor adjustments to cookie utils

* add gdpr example file

* change exposed gdpr metadata scope by useConsent

* update README

* readme fixes

* emoji fix

* added imprint

* adjustments to gdpr.json structure and related graphql type

* add default values for ppc

* Update app.config.js

Fixed typo.

* change variable name for consistency, remove console logs

* readability

* adjust css selector order to be consistent

* Update fr.md

updated policy

* Update es.md

updated policy

* Update en.md

updated policy

* Update de.md

* fix type issue

* replace language select input with links

* remove scroll button from codebase

* change privacy policy route to /privacy

* remove Do Not Track detection

* add size to checkbox / radio inputs

* replace switch component with checkbox inputs

* fix plain text links

* remove console log

* refactor privacy policy pages to use PageMarkdown template

* setup useUserPreferences mock for unit tests

* unit tests forprivacy policy components

* setup discalimer to use alert component

* Apply .env suggestions from code review

Co-authored-by: Jamie Hewitt <jamie.hewitt15@gmail.com>

* move gdpr example to gdpr.json

* adjustments to address .env approach for appConfig.privacyPreferenceCenter

* update readme

* add small styling option to ppc

* update README

* add ppc unit tests

* update comments

* Update README.md

Co-authored-by: Jamie Hewitt <jamie.hewitt15@gmail.com>

* Merge print into profile history

* add inifiniteApproval to UserPreference fixture

* changed default styling of PPC to small

Co-authored-by: Frederic Schwill <41265505+fr-3deric@users.noreply.github.com>
Co-authored-by: MeikeMolitor <88214332+MeikeMolitor@users.noreply.github.com>
Co-authored-by: Jamie Hewitt <jamie.hewitt15@gmail.com>
2021-10-12 09:00:57 +01:00
Alex Coseru
6598071f81
add moonriver support (#900)
* add moonriver

* bump ocean.js to v0.19.2

* fix network display

* maybe fix that damn git+ssh problem

* specific detection for moonriver in Web3Provider too

* fix code comment link

* fix network switch button for Moonriver

* compute success message tweak

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-10-06 11:30:17 +02:00
Norbi
4b34e2f347
Token approval split-up (#640)
* Token approval component

* check if datatoken approved

* display token amount on button, add approve function

* approve token based on token type

* approve token for trade, remove for pool lequidity remove action

* verify approval on amount change

* show action button only if amount is approved

* catch approve error and stop loadin

* display token amount with 2 decimals on trade token approval

* infinite approval and UI fixes

* fixed alert warning not showing, account id for approve

* wip

* fixed displayed token amount to approve for swap

* token amount text fix

* lint error fix

* package version update

* version fix

* downgrade version

* fixed error for no wallet connected

* update package-lock

* display token name, and changed amount precision

* removed empty file, fixed token switch error

* refactor for better user experience

* move content

* ExplorerLink console error fixes

* UI tweaks

* slightly changed button logic

* fix Trade form approvals

* cleanup

* don't block add liquidity button

* merge fixes

* hook dependency cleanup

* dtItem fix, error fixes based on asset network match

* disable action button if field is not valid, undefined trade tokens

* fix infiniteApproval user preference saving

* remove unneccessary string conversion

* used Decimal for dtAmount and oceanAmount

* changed token spender address

* bump ocean.js to vo.17.5

* fix lint

* replace Number with Decimal

* fix getting to add liquidity screen without wallet connected

* fix crash when switching coins after value input

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2021-09-30 12:54:44 +02:00
mihaisc
fdac6d8039
Small refactors & optimizations (#863)
* proper cancelation

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

* fix more leaks

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

* remove redundant check

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

* fix consume

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

* fix assetactions

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

* fix consume

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

* remove unnecessary usage of ocean

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

* small fixed in profile

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

* fix
2021-09-24 13:56:42 +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
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
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
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
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
3a130c364b
cleanup 2021-07-26 15:53:21 +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
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
08ee32f105
Merge branch 'main' into feature/multinetwork 2021-07-14 11:28:50 +02:00
7d4cb0e87c
fixes for unknown networks (#725)
* fixes for unknown networks

* hack in native token symbol
2021-07-13 16:22:19 +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
4fbac1e2e0 merged multinetwork into poc-urql 2021-07-07 11:08:39 +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
Bogdan Fazakas
3fe133e55f remove not used scripts 2021-07-06 01:21:35 +03:00
Bogdan Fazakas
5de2a6e330 remove apollo typings and generate schema using urql 2021-07-02 09:44:24 +03:00
Bogdan Fazakas
5e45fff361 wip replace apollo with urql 2021-06-22 08:52:49 +03:00
a017ad219d
move network metadata into a hook 2021-06-14 20:04:44 +02:00
88bead1474
activate isAssetNetwork check 2021-06-14 15:37:59 +02:00
30174e1a84
Merge branch 'main' into feature/multinetwork 2021-06-14 15:17:33 +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
ea15f20cac
mock ddo.chainId response 2021-06-11 15:43:59 +02:00
8ac4f59dee
temporary ddo.chainId typing 2021-06-11 15:35:28 +02: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
9ea1b644fc
fix app crash on unsupported network 2021-06-11 09:39:17 +02:00
4df84b8b14
split up network list into main & test networks 2021-06-09 19:41:12 +02:00
270f567879
move Graph sync status to asset details only 2021-06-09 13:16:55 +02:00
ef218a9d9e
chainId switching mechanism 2021-06-09 11:45:36 +02:00
15b036f462
capture chainIds in user preferences provider 2021-06-08 10:46:53 +02:00
796fc6be81
get all screens to render again 2021-06-04 15:53:34 +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
9d7486d626
prototype network feedback based on asset network checks 2021-06-04 15:01:22 +02:00
b516e95879
prettier formatting updates 2021-06-04 11:43:47 +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
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
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
Bogdan Fazakas
0cef2cccd5 update price value for pool assets using consumePrice and added isConsumable logic 2021-04-22 14:03:58 +03:00
Bogdan Fazakas
7b653c46ba fetch asset price withoud relying on ddo.price 2021-04-20 09:44:18 +03: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
Norbi
85a956a8f2
fix Graph sync status randomly failing (#522)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-04-15 12:43:12 +02:00
Bogdan Fazakas
56554028b8 merged compute into subgraph-util-methods 2021-04-13 19:21:05 +03:00