1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-09-28 03:58:59 +02:00
Commit Graph

203 Commits

Author SHA1 Message Date
Kris Liew
d1206c291b
[Free Pricing] Check minterApproved before cancelMinter() (#836)
* Check `minterApproved` before cancelMinter

* Feedback change

* Update freePrice.ts

Co-authored-by: KRIS LIEW <iforte.intellege.liew@daimler.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-10-14 17:20:36 +08: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
Norbi
ef70d97ad3
Improve Pool Transactions page data fetching (#902)
* use elastic search to get all ddo's at once

* fix get ddo's list function and get names in one query

* reorder ddo list based on did list order

* remove inPurgatory filter

* fix broken aquarius query

* remove getAssetsFromDidList function and use retrieveDDOListByDIDs

* fetch list of ddos

* use RegExp

* fix broken query on empty did or chainId list
2021-10-11 12:55:23 +01:00
Norbi
4d232e4b8c
Refine Pool Shares DDO fetching (#868)
* use elastic search to get all ddo's at once

* fix get ddo's list function and get names in one query

* reorder ddo list based on did list order

* remove inPurgatory filter

* fix broken aquarius query

* remove getAssetsFromDidList function and use retrieveDDOListByDIDs

* use RegExp
2021-10-08 13:15:02 +02: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
mihaisc
de5dbcaa05
Fix published assets (#878)
* fix page

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

* fix page search

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

* use component state for page on pagination instead of the returned page

* fix returned page

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

* put back queryResult.page

* Update src/utils/aquarius.ts

Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>

* lint

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

Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
2021-09-27 15:43:12 +03:00
Bogdan Fazakas
579b213160
Fix/ Put back filters published page (#867)
* put back filters on published page

* fix filter + pagination issue on published asset tab

* renamed isSearch prop and made it optional
2021-09-27 10:16:14 +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
mihaisc
aee246cf7a
fixed search syntax (#874)
* fixed search syntax

* fixed query structure

* fix search structure

* fix fetch algos

* fix published query

* fix published

* fix
2021-09-24 13:32:14 +02:00
mihaisc
bf03a62f49
Bump aquarius version (#837)
* sort, update models/queries

* fix cancelation token

* remove console.log

* remove searchquery type

* fix canceltoken

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

* remove aquarius2

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

* bump lib

* fix type

* remove QueryString
2021-09-24 02:38:32 -07:00
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
eacd0c56a0
Merge branch 'main' into feature/account_page 2021-09-15 12:22:21 +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
c0d064fe10
fix set oceanSymbol in bestPrice (#848) 2021-09-10 21:30:01 +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
1a54dda59c
more cleanup and typos 2021-09-02 19:49:21 +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
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
ed9930dfb3
refactor state, make use of existing Profile model 2021-09-01 14:30:55 +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
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
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
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
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
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
209dd379dc
switch over to app config metadataCacheUri 2021-07-26 16:59:17 +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
c25d1e9224
getQueryContext abstraction 2021-07-22 14:01:30 +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
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
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
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
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
e06b6af56f
add Polygon Mumbai as supported chainId 2021-07-12 14:42:46 +02: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
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