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

896 Commits

Author SHA1 Message Date
Norbi
96296008c9
Add custom network (#450)
* add custom network

* created announcement banner

* add custom network from banner

* show ADD CUSTOM NETWORK on MetaMask provider

* show add ocean to wallet action

* removed warningPolygon from alert

* removed customNetwork component

* remove Add custom network on asset details page

* Details use function from web3 to add token

* changed available on Polygon link, refactoring

* show Switch to Polygon when no wallet connected

* banner content for no provider and Polygon network

* change message when not provider and eth network

* changed warning and added announcement in site.json

* moved network logic inside Announcement, moved Announcement component

* added switch to ETH button, refactoring

* removed add mOcean action button

* moved location verification to App.tsx

* styling & copy updates

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-03-30 15:37:30 +02:00
mihaisc
6190737f08
fix buy fre (#458)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-26 10:48:27 +02:00
claudiaHash
59b571e984
WIP on expected price impact (#440)
* wip on expected price impact - simple case

* advance flow implemented

* slippage change fixed

* compute using pool shares

* spendings, receivings, helper message corrected

* output values display fixed

* output messages fixed, slippage input replaced

* used remove ocean liquidity with minimum oceans received function

* maxShares removed, ocean.js version updated

* package-lock.json updated

* output messages resized

* spacing fixed in trading form

* removed redundant css

* removed unnecessary verification

* file removed

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-03-25 13:47:31 +02:00
a5706d22eb
bump to ocean.js v0.12.1 (#455) 2021-03-25 08:48:13 +01:00
Kris Liew
30b4c77093
feature/add toggle option for fixed & dynamic pricing (#453)
* add toggle for create pricing option variable

* code refactor

* Minor fix from feedback
2021-03-24 20:27:32 +08:00
Norbi
ed9eb61c1c
Add custom token from the wallet (#437)
* WIP

* added button that allows to push custom token to metamask

* added image url

* use provider from ocean, add mOCEAN symbol to Matic

* use token symbol based on networkId

* removed customToken.json, used Logger to display message

* log error

* fixed log

* review fixes

* used oceanTokenSymbol from config

* getOceanConfig fix
2021-03-22 12:48:28 +01:00
mihaisc
1599d74cfe
Update search and publish (#444)
* fix querys

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

* lib bump, publish update

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

* package-lock

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

* fix searchquery

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-18 13:27:58 +02:00
bdccb0966f
Web3/Ocean splitup + full Polygon/Matic support (#433) 2021-03-17 11:44:26 +01:00
Dimo Dzhurenov
c9a8345222
Removing showing updates on never updated assets (#438)
* removes showing updates on never updated assets

* package-lock fix
2021-03-16 19:23:11 +01:00
Norbi
aa6cceaf0e
Reorganize history page (#434)
* displayed content using tabs

* fixed transparent background on table and tabs

* tabs design update

* overflow tabs

* pagination and no results message spacing
2021-03-11 18:05:49 +01:00
mihaisc
a3e2c8ef3b
fix edit history (#435)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-11 14:51:43 +02:00
Bogdan Fazakas
a4f4de84fd
add sample file to edit metadata form (#419)
* add sample file to edit metada form

* bump oceanjs to 0.11.2

* retrigger checks

* added updated package-lock.json

* bump react hooks to 0.5.4

* bump ocean.js to 0.11.4 and react hooks to 0.5.5
2021-03-09 17:52:40 +01:00
Bogdan Fazakas
a137177be6
fixed PoolTransactions history refresh from history and asset detail transactions (#427) 2021-03-09 17:46:43 +01:00
7356981350
hotfix for asset details (#425)
* was broken in non-web3 browsers
* missed in https://github.com/oceanprotocol/market/pull/421
2021-03-05 00:40:13 +01:00
claudiaHash
be82d9ef2e
Feature/edit history subgraph (#423)
* fetching Subgraph data

* updates ordered by timestamp

* comment removed

* comment removed

* apollo generated  typing used

* date converted to string

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-03-04 19:31:10 +02:00
8737264816
refactor network name output (#421)
* refactor network output

* fetch chain & network metadata from @ethereum-lists/chains

* typed responses

* switch warning icon for testnet badge

* add supportedNetworks list, output warning based on it

* markup & spacing tweaks

* check networkId against ocean.js ConfigHelper

* remove supportedNetworks app config

* fetch EVM networks metadata on build time

* fixes
2021-03-04 18:16:20 +01:00
8158681b91
Merge pull request #422 from oceanprotocol/fix/420
Check previous order from the graph
2021-03-04 17:23:33 +01:00
mihaisc
a261c35ec7
check order from the graph
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-04 15:53:34 +02:00
5c4c13452f
Merge pull request #409 from oceanprotocol/feature/optimize-did-fetching-in-tables
optimize did fetching in tables
2021-03-01 17:03:25 +01:00
68f0d3740b
Merge pull request #416 from oceanprotocol/fix/price-display
more fine grained price issues display
2021-03-01 17:02:44 +01:00
3607084efc
copy 2021-03-01 16:24:55 +01:00
0303c52f3e
copy 2021-03-01 16:17:44 +01:00
f6f6c68428
more fine grained price issues display 2021-03-01 16:08:50 +01:00
Norbi
29a37b531c Merge branch 'main' into feature/optimize-did-fetching-in-tables 2021-03-01 16:55:00 +02:00
Norbi
4b4cda4906 resolve promise using async/await 2021-03-01 16:54:43 +02:00
Bogdan Fazakas
f2e906e790
Fix/ Search query with price filter and no text (#408)
* fixed querry with price filter and no text entered

* retrigger checks
2021-03-01 15:35:29 +02:00
KatunaNorbert
939c577483 Retrigger checks 2021-03-01 15:34:31 +02:00
Norbi
0b942de217 added function to get only the name of the asset 2021-03-01 11:51:24 +02:00
433af0147a
switch IPFS gateway (#404)
* switch to dweb.link for loading 3Box profile images
* ipfs.oceanprotocol.com has been deprecated
2021-02-25 16:00:42 +02:00
Norbi
fe67af2dda
added pagination to Published list, used aquarius to get assets (#377)
* added pagination to Published list, used aquarius to get assets

* loading only when component mounts

* pagination style unification

* Auto stash before merge of "feature/add-pagination-to-published-section" and "origin/feature/add-pagination-to-published-section"

* removed unnecessary code

* fixed lint errors

* code climate fixes

* removed unused component

* added hook for network switch

* display bottom border for last table row

* trigger pagination calculation on network change

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-02-18 09:33:38 +01:00
Norbi
44dbd51592
Added link to highest liquidity pool search (#375)
* Added link to highest liquidity pool search

* changed link name

* changed sections link and title texts
2021-02-16 15:50:39 +01:00
73826dc651
mention Barge + The Graph setup (#378) 2021-02-11 16:02:58 +01:00
claudiaHash
9991b6dfeb
Display TVL (#353)
* get  pools data from graph

* TVL displayed

* ESlint fixes

* Code style fixed on App.tsx

* footer stats display changes

* ApolloProvider wrapping

* config subgraphUri verified

* pool number taken from graph

* Apollo provider fix

* Pools number set fixed

* deleted unused imports

* fix fetch, gatsby build

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

* remove apollo client redundant init

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

* fix prop

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

* update pool count

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

* tooltip added

* small development config refactor

* make sure initial config is actually overwritten with local addresses

* log error on missing subgraphUri

* copy change

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-02-11 14:30:29 +02:00
Norby
b043eab047
Get pool shares using The Graph (#360)
* added graph query

* fixed negative liquidity value for input error

* used graph to get poolShares

* replaced total pool liquidity with user liquidity, get ddo on row

* get symbol from graph, calculate userLiquidity

* fixed userLiquidity price and sorted table by userLiquidity

* removed ordering by balance

* displayed pool and client liquidity, disabled table header hover

* order Your Liquidity before Pool Liquidity

* removed line height on asset title in pool shares table

* limit table to 5 rows, refactor liquidity comp, changed balance color

* code climate similar blocks fix

* changed lockedValue to valueLocked in pool shares query

* removed husky file
2021-02-10 17:16:24 +02:00
Bogdan Fazakas
3e2ad9674c
set default value for contentLenght if not received from provider (#372) 2021-02-10 14:24:16 +01:00
53d984a3b6
Fix development with Barge (#369)
* add contracts copying script

* AssetList failsafe against unexpected Aquarius responses

* grab dev contract addresses from address.json

* script fix

* fix auto-connection in NetworkMonitor

* update dev instructions

* remove the last_block Aquarius workaround

* fix providerUri switch in file input
2021-02-10 12:08:59 +01:00
claudiaHash
8946f6fa6b
Fix/url encoding categories tags (#368)
* tag encoding issue resolved

* search value encoded

* log deleted

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-02-08 14:25:22 +02:00
Norby
1f72fd3951
Feature/asset list isolated pagination (#356)
* isolated pagination using query

* made pagination hrefBuilder prop optional

* mad query prop optional, fixed TransactionHistoryPool import error

* removed pagination and url logic outsite AssetQueryList

* renamed AssetQueryList to AssetList, changed props

* used navigate from gatsby
2021-02-05 14:00:30 +01:00
Bogdan Fazakas
c72dfb6ced
Fileinfo replacement (#352)
* replaces market fileinfo with provider file info

* removed test for replaced getFileInfo method

* updated toast messages
- if uploaded file when no web3 wallet is connected
- if file is not valid

* used provider api to check file'

* moved get fileinfo logic to provider.ts

* cancel fileinfo req on unmount

* reduced fileinfo method complexity

* canceltoken passed to fileinfo issue
2021-02-04 15:45:21 +01:00
claudiaHash
6bdf5b44e1
Feature/consume history (#363)
* populate table

* added OrdersData interfaces

* set consumer

* populate table


added OrdersData interfaces


set consumer

* query updated, logs removed

* removed "Title", added "Datatoken" column

* main branch merged

* table renamed and replaced

* unused css file removed

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-02-04 13:57:14 +02:00
a951f9bf3b
replace Travis with GitHub Actions workflow (#358)
* replace Travis with GitHub Actions workflow

* fix prettier on Windows

* remove PascalCasing bash one-liner for one use case

* use mkdirp to workaround Windows

* cache tweaks

* move s3 deploy to own workflow

* upload artifacts for debug

* path tweak

* debug

* apollo:codegen without folder pre-creation

* debug: activate s3 deploy for all branches

* pass env vars to deployment build

* more env var passing

* deploy main branch pushes only
2021-02-02 15:07:02 +02:00
mihaisc
ab609b93c0
refetch balance (#357) 2021-01-29 16:21:34 +02:00
a760935564
Add Portis wallet connection (#291)
* add portis

* library loading tinkering

* bump packages

* typings fix

* pip as addon

* remove setuptools

* revert typings fix

* modal styling

* show portis button

* provider name workaround

* for faulty getInjectedProviderName()
* fixes https://github.com/oceanprotocol/market/issues/332

* more usage of provider info object

* output respective wallet logos

* add network switcher for Portis

* add functionality

* prototype for portis network switching

* improve user experience when reconnecting to cached provider

* support mainnet only, leave networking switching code commented out
2021-01-29 13:40:54 +01:00
ad864cc249
Dev experience tweaks (#354)
* add VS Code workspace settings

* add everything required for auto-formatting on filesave
* add list of suggested extensions

* add pre-commit hook for `npm run format`

* update code style docs

* make pre-commit work

* update docs

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-01-28 17:28:32 +01:00
mihaisc
05035d3cdc
remove ga (#345)
* remove ga

* remove from package
2021-01-28 14:11:08 +02:00
mihaisc
6122ad2121
fix search navigation on localhost (#346)
* fix search navigation on localhost

* fix navigate in asset query
2021-01-28 13:05:50 +02:00
mihaisc
095cf064c8
downgrade gatsby (#339)
* down gatsby

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

* fix travis

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-01-26 23:00:54 +02:00
mihaisc
79715df435
Pool tx history (#307)
* graphql

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

* ignore generated

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

* delete generated

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

* fix travis

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

* fix travis

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

* fix fetch

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

* fix travis

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

* fix fetch

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

* update readme

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

* pool creator liquidit& statistics

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

* graph with the graph

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

* cleanup

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

* fix query

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

* update poll interval

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

* update graph url

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

* ocean bump

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

* run apollo codegen before starting gatsby

* put back graph loading state

* typing fix

* graph tweak, add error state

* readme update

* remove unused functions, move graph provider

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

* fix package-lock

* fix graph when switching tabs

* generate apollo files into one folder

* fix loading

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

* graph query

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

* tx query

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

* fix titles

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

* fix text issues

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

* fix query

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

* local pagination

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

* return refreshInterval to 10 sec

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

* add

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

* fix data set column

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

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-01-22 18:05:02 +01:00
Norby
a2fe2fdee0
Set, edit, and display timeout (#324)
* added timeout to publish asset

* add timeout to edit asses(wip)

* added timout to edit metadata form

* fixed wrong constant name

* fix options autosorting

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

* Fixed autosorting in edit form

* Added "1 day" to timeout options

* Changed ternary operators to switch

* Feature/asset timeout (#325)

* Compute asset timeout

* Code styled

* Deleted unused import

* Display timeout for buy/download

* Switch case for timeout values

* Moved mapping function to /utils/metadata

* display timeout option not matching defined ones, map seconds to string

* handle update with no predefined timeout value, add weeks to map method

* Display timeout on button

* consume button text logic change

* whoops, revert wrong change

* small millisecondsToStr refactor

* copy tweaks

* template literal logic restore

* keep tweaking help text logic

* abstract into method
* change whole condition logic
* tweak hasDatatoken/hasPreviousOrder combination condition

* Unified seconds to string conversion methods

* getHelpText tweaks, small refactor

* copy editing, limit hardcoded timeout list

* fix mixup of map & filter

* use Timeout as label and be done with it

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: claudiaHash <49017601+claudiaHash@users.noreply.github.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Claudia Holhos <clawww1996@gmail.com>
2021-01-22 17:12:48 +01:00
7b854e09dd
bump ocean libraries, vulnerability bumps (#329) 2021-01-21 17:04:49 +01:00