Compare commits

...
Author SHA1 Message Date
Matthew Russell a6430c3930 chore: add custom styles for validators table 2023-05-03 07:04:38 -07:00
daro-maj f37a8720a2 test(trading): handle unspecified side in fills table - e2e tests (#3594) 2023-05-03 13:16:55 +01:00
dexturr f5fe3cc18d chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-03 12:10:31 +00:00
4 changed files with 64 additions and 36 deletions
+7 -12
View File
@@ -40,18 +40,6 @@
line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
}
/* Light variables */
.ag-theme-balham {
--ag-background-color: theme(colors.white);
--ag-border-color: theme(colors.neutral[300]);
--ag-header-background-color: theme(colors.white);
--ag-odd-row-background-color: theme(colors.white);
--ag-header-column-separator-color: theme(colors.neutral[300]);
--ag-row-border-color: theme(colors.white);
--ag-row-hover-color: theme(colors.neutral[100]);
--ag-font-size: 12px;
}
/* Dark variables */
.ag-theme-balham-dark {
--ag-background-color: theme(colors.black);
@@ -63,3 +51,10 @@
--ag-row-hover-color: theme(colors.neutral[800]);
--ag-font-size: 12px;
}
.validators-table .ag-theme-balham-dark .ag-body-horizontal-scroll {
opacity: 0.75;
}
.validators-table .ag-theme-balham-dark *:hover {
cursor: pointer;
}
+46 -23
View File
@@ -38,7 +38,7 @@
"tranche_end": "2023-05-20T00:00:00.000Z",
"total_added": "19242.125",
"total_removed": "959.3245960538025",
"locked_amount": "10740.2904998553229338",
"locked_amount": "10578.4844209587189695125",
"deposits": [
{
"amount": "188",
@@ -845,7 +845,7 @@
"tranche_end": "2023-05-06T00:00:00.000Z",
"total_added": "14520",
"total_removed": "5079.76864115505",
"locked_amount": "1328.5631944444439712",
"locked_amount": "1206.465231481482324",
"deposits": [
{
"amount": "111",
@@ -1680,7 +1680,7 @@
"tranche_start": "2023-03-06T00:00:00.000Z",
"tranche_end": "2023-04-06T00:00:00.000Z",
"total_added": "14099",
"total_removed": "3142.49002352036",
"total_removed": "3722.49002352036",
"locked_amount": "0",
"deposits": [
{
@@ -2450,6 +2450,11 @@
"user": "0xBe9F912Ad481C61B653463E8F1D2b2b310D49861",
"tx": "0x191a1901917ada560c9c30efd3d24c0ec116b9dc131a6966cc67ad7e3701df3b"
},
{
"amount": "580",
"user": "0xAA4110D07E062bAA025BECb15B795447F58B8d2E",
"tx": "0x795e8308c0001ad97f322ea94c382cc1799cfd8231a0c492fa8d54f16d2eef56"
},
{
"amount": "30",
"user": "0x8499411Bff99ddE9A02903008F917EEa0E27B42A",
@@ -3599,10 +3604,17 @@
"tx": "0x46d80a145d2f49ef3152cbfaa6d2bb054deabe21396ab43553a3f076e2db62e1"
}
],
"withdrawals": [],
"withdrawals": [
{
"amount": "580",
"user": "0xAA4110D07E062bAA025BECb15B795447F58B8d2E",
"tranche_id": 53,
"tx": "0x795e8308c0001ad97f322ea94c382cc1799cfd8231a0c492fa8d54f16d2eef56"
}
],
"total_tokens": "580",
"withdrawn_tokens": "0",
"remaining_tokens": "580"
"withdrawn_tokens": "580",
"remaining_tokens": "0"
},
{
"address": "0x674038f225586317f3959C00D696Cb53cd52c16C",
@@ -4703,7 +4715,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "86666.297",
"total_removed": "0",
"locked_amount": "51226.896539776924515462",
"locked_amount": "51166.9974210106919556663",
"deposits": [
{
"amount": "86666.297",
@@ -4769,7 +4781,7 @@
"tranche_end": "2023-06-01T00:00:00.000Z",
"total_added": "2500",
"total_removed": "0",
"locked_amount": "394.848424145299",
"locked_amount": "391.38319724257215",
"deposits": [
{
"amount": "2500",
@@ -4802,7 +4814,7 @@
"tranche_end": "2023-11-01T00:00:00.000Z",
"total_added": "15000.000000000000015",
"total_removed": "0",
"locked_amount": "14816.165647644927014816165647644927",
"locked_amount": "14795.60027928744001479560027928744",
"deposits": [
{
"amount": "1.5e-14",
@@ -4890,7 +4902,7 @@
"tranche_end": "2023-09-01T00:00:00.000Z",
"total_added": "17500",
"total_removed": "0",
"locked_amount": "11483.8961541364725",
"locked_amount": "11459.903224386071",
"deposits": [
{
"amount": "12500",
@@ -5157,7 +5169,7 @@
"tranche_end": "2023-08-01T00:00:00.000Z",
"total_added": "37500",
"total_removed": "17836.1796921",
"locked_amount": "18593.57015423572875",
"locked_amount": "18541.30457719459875",
"deposits": [
{
"amount": "7500",
@@ -5565,7 +5577,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "129999.45",
"total_removed": "0",
"locked_amount": "51180.15844229965399674",
"locked_amount": "51120.313973942497539045",
"deposits": [
{
"amount": "129999.45",
@@ -5598,7 +5610,7 @@
"tranche_end": "2024-04-01T00:00:00.000Z",
"total_added": "54144.7663",
"total_removed": "0",
"locked_amount": "49373.06871247784644592557",
"locked_amount": "49335.74898575644407623565",
"deposits": [
{
"amount": "54144.7663",
@@ -5631,7 +5643,7 @@
"tranche_end": "2023-09-03T00:00:00.000Z",
"total_added": "62600",
"total_removed": "0",
"locked_amount": "21051.60226407915008",
"locked_amount": "21008.336485286656638",
"deposits": [
{
"amount": "10000",
@@ -5824,7 +5836,7 @@
"tranche_end": "2023-09-17T00:00:00.000Z",
"total_added": "5000",
"total_removed": "0",
"locked_amount": "1873.218702435312",
"locked_amount": "1869.76296930492115",
"deposits": [
{
"amount": "5000",
@@ -6882,7 +6894,7 @@
"tranche_end": "2023-06-02T00:00:00.000Z",
"total_added": "1939928.38",
"total_removed": "1709370.7872515768348",
"locked_amount": "158090.6912451388393129414",
"locked_amount": "156749.9162904687626235986",
"deposits": [
{
"amount": "1852091.69",
@@ -40754,7 +40766,7 @@
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "3732368.4671",
"total_removed": "715655.108029600523393",
"locked_amount": "267431.675840398797767447499",
"locked_amount": "265371.371543329369775774863",
"deposits": [
{
"amount": "1998.95815",
@@ -42146,8 +42158,8 @@
"tranche_start": "2022-06-05T00:00:00.000Z",
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "15870102.715470999700000001",
"total_removed": "866687.25765937723884852",
"locked_amount": "6247983.1374161640607671780970752321127332",
"total_removed": "867610.78878511272497352",
"locked_amount": "6240677.4306629368200704822080834181008381",
"deposits": [
{
"amount": "16249.93",
@@ -42696,6 +42708,11 @@
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tx": "0x2e3b57da0245aea9164e96cd7421d82a3f34df2ab34bc9a64b91e629fb5cb31c"
},
{
"amount": "923.531125735486125",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
},
{
"amount": "981.387731774910625",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44840,6 +44857,12 @@
"tranche_id": 2,
"tx": "0x2e3b57da0245aea9164e96cd7421d82a3f34df2ab34bc9a64b91e629fb5cb31c"
},
{
"amount": "923.531125735486125",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tranche_id": 2,
"tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
},
{
"amount": "981.387731774910625",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -46348,8 +46371,8 @@
}
],
"total_tokens": "259998.8875",
"withdrawn_tokens": "156789.08944273708375",
"remaining_tokens": "103209.79805726291625"
"withdrawn_tokens": "157712.620568472569875",
"remaining_tokens": "102286.266931527430125"
},
{
"address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -48725,7 +48748,7 @@
"tranche_end": "2023-05-05T00:00:00.000Z",
"total_added": "14597706.0446472999",
"total_removed": "6168897.174282186485373182",
"locked_amount": "46652.9124232901388230326056764886",
"locked_amount": "39908.33059608817917720398993360406",
"deposits": [
{
"amount": "129284.449",
@@ -58824,7 +58847,7 @@
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "472355.6199999996",
"total_removed": "44078.8527972103416",
"locked_amount": "42376.077741542987921938344901044",
"locked_amount": "42049.610748470926039581595332312",
"deposits": [
{
"amount": "3000",
@@ -85,7 +85,7 @@ describe('fills', { tags: '@regression' }, () => {
cy.wrap($role)
.invoke('text')
.then((text) => {
const roles = ['Maker', 'Taker'];
const roles = ['Maker', 'Taker', '-'];
expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
});
});
+10
View File
@@ -152,6 +152,16 @@ const fills = (id?: string): FillFieldsFragment[] => [
id: id || 'buyer-id',
},
}),
fillFieldsFragment({
id: '4',
aggressor: Schema.Side.SIDE_UNSPECIFIED,
market: {
id: 'market-2',
},
buyer: {
id: id || 'buyer-id',
},
}),
];
export const fillsEventSubscription = (