LaconicNetwork/vega-frontend-monorepo
3
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop

Browse Source
This commit is contained in:
Madalina Raicu 2022-09-21 21:29:37 +01:00
commit 7c800ba09d
No known key found for this signature in database
GPG Key ID: 688B7B31149C1DCD
9 changed files with 70 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/static/src/assets/mainnet-tranches.json
View File

@ -232,7 +232,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "129999.45",
"total_removed": "0",
"locked_amount": "104259.64017162155506947",
"locked_amount": "104200.380529460029469865",
"deposits": [
{
"amount": "129999.45",
@ -298,7 +298,7 @@
"tranche_end": "2023-09-03T00:00:00.000Z",
"total_added": "52600",
"total_removed": "0",
"locked_amount": "49933.44553526128788",
"locked_amount": "49897.44649289700532",
"deposits": [
{
"amount": "2600",
@ -471,7 +471,7 @@
"tranche_end": "2023-09-17T00:00:00.000Z",
"total_added": "5000",
"total_removed": "0",
"locked_amount": "4938.306062912227",
"locked_amount": "4934.8841007102995",
"deposits": [
{
"amount": "5000",
@ -682,7 +682,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "97499.58",
"total_removed": "0",
"locked_amount": "45491.196406477060881534",
"locked_amount": "45433.068217801978115973",
"deposits": [
{
"amount": "97499.58",
@ -715,7 +715,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "135173.4239508",
"total_removed": "0",
"locked_amount": "62178.61176023377847310961206",
"locked_amount": "62099.1605617280541991096233",
"deposits": [
{
"amount": "135173.4239508",
@ -748,7 +748,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "32499.86",
"total_removed": "0",
"locked_amount": "19137.360737262941337458",
"locked_amount": "19112.907212107455312482",
"deposits": [
{
"amount": "32499.86",
@ -781,7 +781,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "10833.29",
"total_removed": "0",
"locked_amount": "6229.025215426197409771",
"locked_amount": "6221.065830279480680643",
"deposits": [
{
"amount": "10833.29",
@ -889,7 +889,7 @@
"tranche_end": "2022-11-01T00:00:00.000Z",
"total_added": "30000",
"total_removed": "0",
"locked_amount": "6602.664553140096",
"locked_amount": "6561.9357638888898",
"deposits": [
{
"amount": "7500",
@ -1006,7 +1006,7 @@
"tranche_end": "2023-06-02T00:00:00.000Z",
"total_added": "1939928.38",
"total_removed": "479504.6187210477481",
"locked_amount": "1347300.682798830717770306",
"locked_amount": "1345973.01048066904019414",
"deposits": [
{
"amount": "1852091.69",
@ -1292,7 +1292,7 @@
"tranche_end": "2023-02-01T00:00:00.000Z",
"total_added": "42500",
"total_removed": "0",
"locked_amount": "30603.774783615136",
"locked_amount": "30546.07566550925375",
"deposits": [
{
"amount": "12500",
@ -2171,7 +2171,7 @@
"tranche_end": "2022-09-30T00:00:00.000Z",
"total_added": "60916.66666633337",
"total_removed": "20696.25757434884556896",
"locked_amount": "1327.0996656305957708590535158828",
"locked_amount": "1288.08125345528434974998020405568",
"deposits": [
{
"amount": "2833.333333",
@ -23137,7 +23137,7 @@
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "3732368.4671",
"total_removed": "208294.2003105575307",
"locked_amount": "2094833.3939148167530639479",
"locked_amount": "2092793.22380820808187500611",
"deposits": [
{
"amount": "1998.95815",
@ -24027,7 +24027,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "15870102.715470999700000001",
"total_removed": "210560.8308770535002144",
"locked_amount": "12727832.2993034244860532845779112451689646",
"locked_amount": "12720597.9870968307876913799745010698391457",
"deposits": [
{
"amount": "16249.93",
@ -27331,7 +27331,7 @@
"tranche_end": "2023-05-05T00:00:00.000Z",
"total_added": "14597706.0446472999",
"total_removed": "2770640.676713786681612147",
"locked_amount": "6028808.284450086318740939680991223",
"locked_amount": "6022129.61361248030842902304029339",
"deposits": [
{
"amount": "129284.449",
@ -32645,7 +32645,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "5778205.3912159303",
"total_removed": "1777676.283548441971192354",
"locked_amount": "2065115.21157498153794793057055378",
"locked_amount": "2062476.428334778251722930999758609",
"deposits": [
{
"amount": "552496.6455",
@ -34109,7 +34109,7 @@
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "472355.6199999996",
"total_removed": "3574.03809193526",
"locked_amount": "331938.32584399003630540370674788",
"locked_amount": "331615.03425018997045662336681888",
"deposits": [
{
"amount": "3000",

2
apps/static/src/assets/testnet-tranches.json
View File

@ -89,7 +89,7 @@
"tranche_end": "2022-10-12T00:53:20.000Z",
"total_added": "1010.000000000000000001",
"total_removed": "668.4622323651",
"locked_amount": "56.81855308219181970005625599315068497",
"locked_amount": "56.12731671740231320005557160071029932",
"deposits": [
{
"amount": "1000",

7
apps/trading-e2e/src/integration/market-info.cy.ts
View File

@ -86,6 +86,13 @@ describe('market info is displayed', () => {
validateMarketDataRow(4, 'Sector', 'crypto');
});
it('risk factors displayed', () => {
cy.getByTestId(marketTitle).contains('Risk factors').click();
validateMarketDataRow(0, 'Short', '0.008571790367285281');
validateMarketDataRow(1, 'Long', '0.008508132993273576');
});
it('risk model displayed', () => {
cy.getByTestId(marketTitle).contains('Risk model').click();

7
apps/trading-e2e/src/support/mocks/generate-market-info-query.ts
View File

@ -71,6 +71,13 @@ export const generateMarketInfoQuery = (
],
},
},
riskFactors: {
__typename: 'RiskFactor',
market:
'54b78c1b877e106842ae156332ccec740ad98d6bad43143ac6a029501dd7c6e0',
short: '0.008571790367285281',
long: '0.008508132993273576',
},
data: {
__typename: 'MarketData',
market: {

4
libs/liquidity/src/lib/MarketLiquidity.graphql
View File

@ -1,9 +1,9 @@
query MarketLiquidity($marketId: ID!, $partyId: ID!) {
query MarketLiquidity($marketId: ID!) {
market(id: $marketId) {
id
decimalPlaces
positionDecimalPlaces
liquidityProvisionsConnection(partyId: $partyId) {
liquidityProvisionsConnection {
edges {
node {
id

4
libs/liquidity/src/lib/liquidity-data-provider.ts
View File

@ -11,12 +11,12 @@ import type {
const SISKA_NETWORK_PARAMETER = 'market.liquidity.stakeToCcySiskas';
const MARKET_LIQUIDITY_QUERY = gql`
query MarketLiquidity($marketId: ID!, $partyId: ID!) {
query MarketLiquidity($marketId: ID!) {
market(id: $marketId) {
id
decimalPlaces
positionDecimalPlaces
liquidityProvisionsConnection(partyId: $partyId) {
liquidityProvisionsConnection {
edges {
node {
id

20
libs/market-info/src/components/market-info/__generated__/MarketInfoQuery.ts generated
View File

@ -119,6 +119,22 @@ export interface MarketInfoQuery_market_priceMonitoringSettings {
parameters: MarketInfoQuery_market_priceMonitoringSettings_parameters | null;
}
export interface MarketInfoQuery_market_riskFactors {
__typename: "RiskFactor";
/**
* Market the risk factor was emitted for
*/
market: string;
/**
* Short factor
*/
short: string;
/**
* Long factor
*/
long: string;
}
export interface MarketInfoQuery_market_data_market {
__typename: "Market";
/**
@ -504,6 +520,10 @@ export interface MarketInfoQuery_market {
* Price monitoring settings for the market
*/
priceMonitoringSettings: MarketInfoQuery_market_priceMonitoringSettings;
/**
* Risk factors for the market
*/
riskFactors: MarketInfoQuery_market_riskFactors | null;
/**
* marketData for the given market
*/

5
libs/market-info/src/components/market-info/info-market-query.ts
View File

@ -39,6 +39,11 @@ export const MARKET_INFO_QUERY = gql`
}
}
}
riskFactors {
market
short
long
}
data {
market {
id

10
libs/market-info/src/components/market-info/info-market.tsx
View File

@ -232,6 +232,16 @@ export const Info = ({ market, onSelect }: InfoProps) => {
/>
),
},
{
title: t('Risk factors'),
content: (
<MarketInfoTable
data={market.riskFactors}
unformatted={true}
omits={['market']}
/>
),
},
{
title: t('Risk model'),
content: (